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/EncryptTextActivity.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/EncryptTextActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java index 958daa122..0850ead3b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java @@ -288,8 +288,6 @@ public class EncryptTextActivity extends EncryptActivity implements EncryptActiv public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.encrypt_text_activity); - // if called with an intent action, do not init drawer navigation if (ACTION_ENCRYPT_TEXT.equals(getIntent().getAction())) { // lock drawer @@ -305,6 +303,11 @@ public class EncryptTextActivity extends EncryptActivity implements EncryptActiv } @Override + protected int getLayoutResource() { + return R.layout.encrypt_text_activity; + } + + @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.encrypt_text_activity, menu); return super.onCreateOptionsMenu(menu); |