TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-25 22:38:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "add theme to import/export activity"

Browse Source 
This reverts commit e64c067636.
This commit is contained in:
Jake McGinty
2015-01-14 10:23:10 -10:00
parent e64c067636
commit 42da687602
48 changed files with 28 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/thoughtcrime/securesms/ImportExportActivity.java
View File

@@ -10,7 +10,6 @@ import android.support.v7.app.ActionBar;
import android.view.MenuItem;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.util.DynamicTheme;
public class ImportExportActivity extends PassphraseRequiredActionBarActivity {
@@ -19,12 +18,9 @@ public class ImportExportActivity extends PassphraseRequiredActionBarActivity {
private ViewPager viewPager;
private MasterSecret masterSecret;
private DynamicTheme dynamicTheme = new DynamicTheme();
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
dynamicTheme.onCreate(this);
setContentView(R.layout.import_export_activity);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -33,12 +29,6 @@ public class ImportExportActivity extends PassphraseRequiredActionBarActivity {
initializeTabs();
}
@Override
public void onResume() {
super.onResume();
dynamicTheme.onResume(this);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item);
@@ -116,4 +106,4 @@ public class ImportExportActivity extends PassphraseRequiredActionBarActivity {
}
}
}
}