From 399106015e6d4a8d08385f9d5d360fe634e5cc56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 26 Mar 2014 18:18:00 +0100 Subject: [PATCH] Rename layouts for remote activity --- .../keychain/remote/ui/RemoteServiceActivity.java | 8 ++++---- ..._create_activity.xml => api_remote_create_account.xml} | 0 ...app_error_message.xml => api_remote_error_message.xml} | 0 ..._register_activity.xml => api_remote_register_app.xml} | 0 ...b_keys_activity.xml => api_remote_select_pub_keys.xml} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename OpenPGP-Keychain/src/main/res/layout/{api_account_create_activity.xml => api_remote_create_account.xml} (100%) rename OpenPGP-Keychain/src/main/res/layout/{api_app_error_message.xml => api_remote_error_message.xml} (100%) rename OpenPGP-Keychain/src/main/res/layout/{api_app_register_activity.xml => api_remote_register_app.xml} (100%) rename OpenPGP-Keychain/src/main/res/layout/{api_app_select_pub_keys_activity.xml => api_remote_select_pub_keys.xml} (100%) 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_remote_create_account.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_account_create_activity.xml rename to OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml b/OpenPGP-Keychain/src/main/res/layout/api_remote_error_message.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml rename to OpenPGP-Keychain/src/main/res/layout/api_remote_error_message.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_remote_register_app.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml rename to OpenPGP-Keychain/src/main/res/layout/api_remote_register_app.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_select_pub_keys_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_remote_select_pub_keys.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_app_select_pub_keys_activity.xml rename to OpenPGP-Keychain/src/main/res/layout/api_remote_select_pub_keys.xml