diff --git a/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index 2602dc77e..b1b34bc39 100644
--- a/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -73,11 +73,13 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
@Override
protected void onCreate(Bundle icicle, boolean ready) {
+ setContentView(R.layout.activity_application_preferences);
+
//noinspection ConstantConditions
this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (icicle == null) {
- initFragment(android.R.id.content, new ApplicationPreferenceFragment());
+ initFragment(R.id.fragment, new ApplicationPreferenceFragment());
}
}
@@ -89,7 +91,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
showBackupProvider();
return;
}
- Fragment fragment = getSupportFragmentManager().findFragmentById(android.R.id.content);
+ Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment);
fragment.onActivityResult(requestCode, resultCode, data);
}
@@ -262,7 +264,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
FragmentManager fragmentManager = getActivity().getSupportFragmentManager();
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
- fragmentTransaction.replace(android.R.id.content, fragment);
+ fragmentTransaction.replace(R.id.fragment, fragment);
fragmentTransaction.addToBackStack(null);
fragmentTransaction.commit();
}
diff --git a/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java b/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java
index 388e071af..0767ef385 100644
--- a/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java
@@ -30,9 +30,10 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
@Override
public void onCreate(Bundle bundle, boolean ready) {
+ setContentView(R.layout.activity_blocked_contacts);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setTitle(R.string.pref_blocked_contacts);
- initFragment(android.R.id.content, new BlockedAndShareContactsFragment(), getIntent().getExtras());
+ initFragment(R.id.fragment, new BlockedAndShareContactsFragment(), getIntent().getExtras());
}
@Override
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
index 0d55e3f95..b5e6ecdee 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
@@ -21,6 +21,7 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
{
@Override
protected void onCreate(Bundle icicle, boolean ready) {
+ setContentView(R.layout.activity_conversation_list_archive);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (isRelayingMessageContent(this)) {
getSupportActionBar().setTitle(isSharing(this) ? R.string.chat_share_with_title : R.string.forward_to);
@@ -31,7 +32,7 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
Bundle bundle = new Bundle();
bundle.putBoolean(ConversationListFragment.ARCHIVE, true);
- initFragment(android.R.id.content, new ConversationListFragment(), bundle);
+ initFragment(R.id.fragment, new ConversationListFragment(), bundle);
}
@Override
diff --git a/src/main/java/org/thoughtcrime/securesms/qr/BackupTransferActivity.java b/src/main/java/org/thoughtcrime/securesms/qr/BackupTransferActivity.java
index 428b0ab33..c42c85533 100644
--- a/src/main/java/org/thoughtcrime/securesms/qr/BackupTransferActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/qr/BackupTransferActivity.java
@@ -73,11 +73,11 @@ public class BackupTransferActivity extends BaseActionBarActivity {
switch(transferMode) {
case SENDER_SHOW_QR:
- initFragment(android.R.id.content, new BackupProviderFragment(), icicle);
+ initFragment(R.id.backup_provider_fragment, new BackupProviderFragment(), icicle);
break;
case RECEIVER_SCAN_QR:
- initFragment(android.R.id.content, new BackupReceiverFragment(), icicle);
+ initFragment(R.id.backup_provider_fragment, new BackupReceiverFragment(), icicle);
break;
}
diff --git a/src/main/res/layout/activity_application_preferences.xml b/src/main/res/layout/activity_application_preferences.xml
new file mode 100644
index 000000000..fa175dfaf
--- /dev/null
+++ b/src/main/res/layout/activity_application_preferences.xml
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file
diff --git a/src/main/res/layout/activity_blocked_contacts.xml b/src/main/res/layout/activity_blocked_contacts.xml
new file mode 100644
index 000000000..fa175dfaf
--- /dev/null
+++ b/src/main/res/layout/activity_blocked_contacts.xml
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file
diff --git a/src/main/res/layout/activity_conversation_list_archive.xml b/src/main/res/layout/activity_conversation_list_archive.xml
new file mode 100644
index 000000000..fa175dfaf
--- /dev/null
+++ b/src/main/res/layout/activity_conversation_list_archive.xml
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file