diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-25 15:55:30 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-25 15:55:30 +0200 |
| commit | 2687e533a696eca032241d3bf5662310c4acf110 (patch) | |
| tree | 0c797f22b01dd20c424e57db20100eaa6cd30879 /OpenKeychain/src/main/res/values-v21 | |
| parent | 1dafd1b629102180d7e6cb7bb31d1959f1ff6665 (diff) | |
| parent | a8b80b3ff43f9df9583e3e8bb514f84443bab60a (diff) | |
| download | open-keychain-2687e533a696eca032241d3bf5662310c4acf110.tar.gz open-keychain-2687e533a696eca032241d3bf5662310c4acf110.tar.bz2 open-keychain-2687e533a696eca032241d3bf5662310c4acf110.zip | |
Merge branch 'thialfihar-feature/add-theme-setting'
Diffstat (limited to 'OpenKeychain/src/main/res/values-v21')
| -rw-r--r-- | OpenKeychain/src/main/res/values-v21/themes.xml | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/values-v21/themes.xml b/OpenKeychain/src/main/res/values-v21/themes.xml index b47026e5b..dab38f97a 100644 --- a/OpenKeychain/src/main/res/values-v21/themes.xml +++ b/OpenKeychain/src/main/res/values-v21/themes.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <style name="KeychainTheme" parent="KeychainTheme.Base"> + <style name="LightTheme" parent="LightBaseTheme"> <item name="android:windowTranslucentStatus">true</item> <!-- enable window content transitions --> @@ -12,4 +12,17 @@ <item name="android:windowSharedElementExitTransition">@android:transition/move</item> </style> -</resources>
\ No newline at end of file + + <style name="DarkTheme" parent="DarkBaseTheme"> + <item name="android:windowTranslucentStatus">true</item> + + <!-- enable window content transitions --> + <item name="android:windowContentTransitions">true</item> + <item name="android:windowAllowEnterTransitionOverlap">true</item> + <item name="android:windowAllowReturnTransitionOverlap">true</item> + <item name="android:windowSharedElementEnterTransition">@android:transition/move</item> + <item name="android:windowSharedElementExitTransition">@android:transition/move</item> + + </style> + +</resources> |