From c9549befb250826912d153d40c459fc495aa7fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 6 Sep 2013 09:44:56 +0200
Subject: Put logic into fragment for reuse

---
 .../res/layout/api_app_register_activity.xml       | 43 ++++------------------
 OpenPGP-Keychain/res/values/strings.xml            |  2 +-
 2 files changed, 9 insertions(+), 36 deletions(-)

(limited to 'OpenPGP-Keychain/res')

diff --git a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
index da7bb16ce..40b8f54d1 100644
--- a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
@@ -6,6 +6,14 @@
     android:orientation="vertical"
     android:padding="8dp" >
 
+    <TextView
+        android:id="@+id/api_register_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="3dip"
+        android:text="@string/api_register_text"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
     <fragment
         android:id="@+id/api_app_settings_fragment"
         android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsFragment"
@@ -13,39 +21,4 @@
         android:layout_height="wrap_content"
         tools:layout="@layout/api_app_settings_fragment" />
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="3dip" >
-
-        <TextView
-            android:id="@+id/api_register_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="TODO: use string"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingBottom="3dip" >
-
-            <Button
-                android:id="@+id/api_register_disallow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/api_register_disallow" />
-
-            <Button
-                android:id="@+id/api_register_allow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/api_register_allow" />
-        </LinearLayout>
-    </LinearLayout>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index 4165e9057..7503170a5 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -369,7 +369,7 @@
     <string name="api_settings_save">Save</string>
     <string name="api_settings_cancel">Cancel</string>
     <string name="api_settings_revoke">Revoke access</string>
-    <string name="api_register_text">%1$s (%2$s) requests access to OpenPGP Keychain\'s API.\n\nAllow permanent access?</string>
+    <string name="api_register_text">The following application requests access to OpenPGP Keychain\'s API.\n\nAllow permanent access?</string>
     <string name="api_register_allow">Allow access</string>
     <string name="api_register_disallow">Disallow access</string>
 
-- 
cgit v1.2.3