diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-13 21:55:53 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-13 21:55:53 +0100 |
commit | 2e3545949ba9ab48ed21cb2198c9f0d2b8691ba2 (patch) | |
tree | 9fa1d871ca0197d244be974132e0141a64b799ac /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java | |
parent | 2f0eb3fbd644291272829c15165193e0edb0906f (diff) | |
download | open-keychain-2e3545949ba9ab48ed21cb2198c9f0d2b8691ba2.tar.gz open-keychain-2e3545949ba9ab48ed21cb2198c9f0d2b8691ba2.tar.bz2 open-keychain-2e3545949ba9ab48ed21cb2198c9f0d2b8691ba2.zip |
Start working on Material Design
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 | 7 |
1 files changed, 5 insertions, 2 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 054d85323..d0e66156c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java @@ -309,8 +309,6 @@ public class EncryptFilesActivity extends EncryptActivity implements EncryptActi public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.encrypt_files_activity); - // if called with an intent action, do not init drawer navigation if (ACTION_ENCRYPT_DATA.equals(getIntent().getAction())) { // lock drawer @@ -328,6 +326,11 @@ public class EncryptFilesActivity extends EncryptActivity implements EncryptActi } @Override + protected int getLayoutResource() { + return R.layout.encrypt_files_activity; + } + + @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.encrypt_file_activity, menu); menu.findItem(R.id.check_use_armor).setChecked(mUseArmor); |