diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-13 23:15:13 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-13 23:15:13 +0100 |
commit | d8ff737fc5392362707ad70fbe964ac9e299457f (patch) | |
tree | 7af64313395f2d13f2e7129a573d4ef7333fadef /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java | |
parent | 862d1f1971a16d639dec47bd60226a959efe76b0 (diff) | |
download | open-keychain-d8ff737fc5392362707ad70fbe964ac9e299457f.tar.gz open-keychain-d8ff737fc5392362707ad70fbe964ac9e299457f.tar.bz2 open-keychain-d8ff737fc5392362707ad70fbe964ac9e299457f.zip |
Use Toolbar and new BaseActivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java index cf0c3eb88..b0343a961 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java @@ -36,7 +36,7 @@ import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.ui.util.Notify.Style; import org.sufficientlysecure.keychain.ui.util.QrCodeUtils; -public class QrCodeViewActivity extends ActionBarActivity { +public class QrCodeViewActivity extends BaseActivity { private ImageView mFingerprintQrCode; @@ -56,8 +56,6 @@ public class QrCodeViewActivity extends ActionBarActivity { } ); - setContentView(R.layout.qr_code_activity); - Uri dataUri = getIntent().getData(); if (dataUri == null) { Log.e(Constants.TAG, "Data missing. Should be Uri of key!"); @@ -109,6 +107,11 @@ public class QrCodeViewActivity extends ActionBarActivity { } @Override + protected int getLayoutResource() { + return R.layout.qr_code_activity; + } + + @Override protected void onResume() { super.onResume(); |