aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java8
-rw-r--r--OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml (renamed from OpenPGP-Keychain/src/main/res/layout/api_account_create_activity.xml)0
-rw-r--r--OpenPGP-Keychain/src/main/res/layout/api_remote_error_message.xml (renamed from OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml)0
-rw-r--r--OpenPGP-Keychain/src/main/res/layout/api_remote_register_app.xml (renamed from OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml)0
-rw-r--r--OpenPGP-Keychain/src/main/res/layout/api_remote_select_pub_keys.xml (renamed from OpenPGP-Keychain/src/main/res/layout/api_app_select_pub_keys_activity.xml)0
5 files changed, 4 insertions, 4 deletions
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
index ead336dbb..ead336dbb 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_account_create_activity.xml
+++ b/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
index 48aa89d4f..48aa89d4f 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml
+++ b/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
index f85f3b8f7..f85f3b8f7 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml
+++ b/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
index a10592607..a10592607 100644
--- 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