diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-26 15:24:42 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-26 15:24:42 +0100 |
commit | e049895b9f8f5f9996ac678acf6810768e859695 (patch) | |
tree | 518bdd8e883ac550b70e1c78472836d6d8c43ae6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java | |
parent | e4e2d647c8cd8bf2d1e318c85d41173caf18adf4 (diff) | |
download | open-keychain-e049895b9f8f5f9996ac678acf6810768e859695.tar.gz open-keychain-e049895b9f8f5f9996ac678acf6810768e859695.tar.bz2 open-keychain-e049895b9f8f5f9996ac678acf6810768e859695.zip |
Material Design Drawer
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java index b1da1f2c5..6a5eaa26c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java @@ -312,10 +312,10 @@ public class EncryptFilesActivity extends EncryptActivity implements EncryptActi // if called with an intent action, do not init drawer navigation if (ACTION_ENCRYPT_DATA.equals(getIntent().getAction())) { // lock drawer - deactivateDrawerNavigation(); +// deactivateDrawerNavigation(); // TODO: back button to key? } else { - activateDrawerNavigation(savedInstanceState); +// activateDrawerNavigation(savedInstanceState); } // Handle intent actions @@ -325,10 +325,10 @@ public class EncryptFilesActivity extends EncryptActivity implements EncryptActi mUseArmor = Preferences.getPreferences(this).getDefaultAsciiArmor(); } - @Override - protected void initLayout() { - setContentView(R.layout.encrypt_files_activity); - } +// @Override +// protected void initLayout() { +// setContentView(R.layout.encrypt_files_activity); +// } @Override public boolean onCreateOptionsMenu(Menu menu) { |