From 2ef691b264fcc985dfd94708c185ea6715a1972d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 18 Aug 2015 11:19:50 +0200 Subject: Fix theme problems --- .../java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java | 4 ++-- .../java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenKeychain/src/main/java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java index 6b48dbb4b..b811b218e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java @@ -79,8 +79,8 @@ public class NfcOperationActivity extends BaseNfcActivity { @Override protected void initTheme() { mThemeChanger = new ThemeChanger(this); - mThemeChanger.setThemes(R.style.Theme_Keychain_Light_Dialog_SecurityToken, - R.style.Theme_Keychain_Dark_Dialog_SecurityToken); + mThemeChanger.setThemes(R.style.Theme_Keychain_Light_Dialog, + R.style.Theme_Keychain_Dark_Dialog); mThemeChanger.changeTheme(); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java index 75a0d1ea5..375483d89 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java @@ -40,9 +40,9 @@ public class ThemeChanger { // hack to get holo design (which is not automatically applied due to activity's // Theme.NoDisplay) if (Constants.Pref.Theme.DARK.equals(preferences.getTheme())) { - return new ContextThemeWrapper(context, R.style.Theme_AppCompat_Dialog); + return new ContextThemeWrapper(context, R.style.Theme_Keychain_Dark); } else { - return new ContextThemeWrapper(context, R.style.Theme_AppCompat_Light_Dialog); + return new ContextThemeWrapper(context, R.style.Theme_Keychain_Light); } } -- cgit v1.2.3