Merge branch 'master' of github.com:open-keychain/open-keychain

2015-08-27 16:34:17 +02:00
parent e7991e8dc8 3f4150e4ef
commit 5acdef6551
26 changed files with 54 additions and 20 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java
@@ -569,6 +569,8 @@ public class SettingsActivity extends AppCompatPreferenceActivity {

            initializeExperimentalEnableLinkedIdentities(
                    (SwitchPreference) findPreference(Constants.Pref.EXPERIMENTAL_ENABLE_LINKED_IDENTITIES));
+
+            initializeTheme((ListPreference) findPreference(Constants.Pref.THEME));
        }
    }