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/NfcActivity.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/NfcActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java index d0e40a9b8..53b17654c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java @@ -38,7 +38,7 @@ import java.util.Locale; * For the full specs, see http://g10code.com/docs/openpgp-card-2.0.pdf */ @TargetApi(Build.VERSION_CODES.GINGERBREAD_MR1) -public class NfcActivity extends ActionBarActivity { +public class NfcActivity extends BaseActivity { // actions public static final String ACTION_SIGN_HASH = "sign_hash"; @@ -82,8 +82,6 @@ public class NfcActivity extends ActionBarActivity { getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - setContentView(R.layout.nfc_activity); - Intent intent = getIntent(); Bundle data = intent.getExtras(); String action = intent.getAction(); @@ -123,6 +121,11 @@ public class NfcActivity extends ActionBarActivity { } } + @Override + protected int getLayoutResource() { + return R.layout.nfc_activity; + } + /** * Called when the system is about to start resuming a previous activity, * disables NFC Foreground Dispatch |