From 399106015e6d4a8d08385f9d5d360fe634e5cc56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 26 Mar 2014 18:18:00 +0100
Subject: Rename layouts for remote activity

---
 .../keychain/remote/ui/RemoteServiceActivity.java  |  8 +++---
 .../res/layout/api_account_create_activity.xml     | 21 ----------------
 .../src/main/res/layout/api_app_error_message.xml  | 16 ------------
 .../main/res/layout/api_app_register_activity.xml  | 29 ----------------------
 .../layout/api_app_select_pub_keys_activity.xml    | 21 ----------------
 .../main/res/layout/api_remote_create_account.xml  | 21 ++++++++++++++++
 .../main/res/layout/api_remote_error_message.xml   | 16 ++++++++++++
 .../main/res/layout/api_remote_register_app.xml    | 29 ++++++++++++++++++++++
 .../main/res/layout/api_remote_select_pub_keys.xml | 21 ++++++++++++++++
 9 files changed, 91 insertions(+), 91 deletions(-)
 delete mode 100644 OpenPGP-Keychain/src/main/res/layout/api_account_create_activity.xml
 delete mode 100644 OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml
 delete mode 100644 OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml
 delete mode 100644 OpenPGP-Keychain/src/main/res/layout/api_app_select_pub_keys_activity.xml
 create mode 100644 OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml
 create mode 100644 OpenPGP-Keychain/src/main/res/layout/api_remote_error_message.xml
 create mode 100644 OpenPGP-Keychain/src/main/res/layout/api_remote_register_app.xml
 create mode 100644 OpenPGP-Keychain/src/main/res/layout/api_remote_select_pub_keys.xml

(limited to 'OpenPGP-Keychain/src')

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
index ba0d4d088..a894da448 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
@@ -124,7 +124,7 @@ public class RemoteServiceActivity extends ActionBarActivity {
                     }
             );
 
-            setContentView(R.layout.api_app_register_activity);
+            setContentView(R.layout.api_remote_register_app);
 
             mAppSettingsFragment = (AppSettingsFragment) getSupportFragmentManager().findFragmentById(
                     R.id.api_app_settings_fragment);
@@ -169,7 +169,7 @@ public class RemoteServiceActivity extends ActionBarActivity {
                     }
             );
 
-            setContentView(R.layout.api_account_create_activity);
+            setContentView(R.layout.api_remote_create_account);
 
             mAccSettingsFragment = (AccountSettingsFragment) getSupportFragmentManager().findFragmentById(
                     R.id.api_account_settings_fragment);
@@ -235,7 +235,7 @@ public class RemoteServiceActivity extends ActionBarActivity {
                     }
             );
 
-            setContentView(R.layout.api_app_select_pub_keys_activity);
+            setContentView(R.layout.api_remote_select_pub_keys);
 
             // set text on view
             HtmlTextView textView = (HtmlTextView) findViewById(R.id.api_select_pub_keys_text);
@@ -277,7 +277,7 @@ public class RemoteServiceActivity extends ActionBarActivity {
                         }
                     });
 
-            setContentView(R.layout.api_app_error_message);
+            setContentView(R.layout.api_remote_error_message);
 
             // set text on view
             HtmlTextView textView = (HtmlTextView) findViewById(R.id.api_app_error_message_text);
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_account_create_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_account_create_activity.xml
deleted file mode 100644
index ead336dbb..000000000
--- a/OpenPGP-Keychain/src/main/res/layout/api_account_create_activity.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:orientation="vertical">
-
-        <fragment
-            android:id="@+id/api_account_settings_fragment"
-            android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:layout="@layout/api_app_settings_fragment" />
-
-    </LinearLayout>
-</ScrollView>
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml
deleted file mode 100644
index 48aa89d4f..000000000
--- a/OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <org.sufficientlysecure.htmltextview.HtmlTextView
-        android:id="@+id/api_app_error_message_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:paddingBottom="0dip"
-        android:text="Set in-code!"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml
deleted file mode 100644
index f85f3b8f7..000000000
--- a/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:orientation="vertical">
-
-        <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.ui.AppSettingsFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:layout="@layout/api_app_settings_fragment" />
-
-    </LinearLayout>
-</ScrollView>
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_select_pub_keys_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_select_pub_keys_activity.xml
deleted file mode 100644
index a10592607..000000000
--- a/OpenPGP-Keychain/src/main/res/layout/api_app_select_pub_keys_activity.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <org.sufficientlysecure.htmltextview.HtmlTextView
-        android:id="@+id/api_select_pub_keys_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:paddingBottom="0dip"
-        android:text="Set in-code!"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-    <FrameLayout
-        android:id="@+id/api_select_pub_keys_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml b/OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml
new file mode 100644
index 000000000..ead336dbb
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:orientation="vertical">
+
+        <fragment
+            android:id="@+id/api_account_settings_fragment"
+            android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:layout="@layout/api_app_settings_fragment" />
+
+    </LinearLayout>
+</ScrollView>
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_remote_error_message.xml b/OpenPGP-Keychain/src/main/res/layout/api_remote_error_message.xml
new file mode 100644
index 000000000..48aa89d4f
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/api_remote_error_message.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <org.sufficientlysecure.htmltextview.HtmlTextView
+        android:id="@+id/api_app_error_message_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:paddingBottom="0dip"
+        android:text="Set in-code!"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_remote_register_app.xml b/OpenPGP-Keychain/src/main/res/layout/api_remote_register_app.xml
new file mode 100644
index 000000000..f85f3b8f7
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/api_remote_register_app.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:orientation="vertical">
+
+        <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.ui.AppSettingsFragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:layout="@layout/api_app_settings_fragment" />
+
+    </LinearLayout>
+</ScrollView>
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_remote_select_pub_keys.xml b/OpenPGP-Keychain/src/main/res/layout/api_remote_select_pub_keys.xml
new file mode 100644
index 000000000..a10592607
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/layout/api_remote_select_pub_keys.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <org.sufficientlysecure.htmltextview.HtmlTextView
+        android:id="@+id/api_select_pub_keys_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:paddingBottom="0dip"
+        android:text="Set in-code!"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <FrameLayout
+        android:id="@+id/api_select_pub_keys_fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3