diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-25 19:38:13 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-25 19:38:13 +0100 |
| commit | 57fa702cbf28368994810c33dcc9afeebf60932d (patch) | |
| tree | 2ad65ffdcf84efc394a5b6d928934ed9d4ee79da /OpenKeychain/src/main/res/values-v21 | |
| parent | 27263edda5ffba4241e54e2f64f35eb1058663e7 (diff) | |
| download | open-keychain-57fa702cbf28368994810c33dcc9afeebf60932d.tar.gz open-keychain-57fa702cbf28368994810c33dcc9afeebf60932d.tar.bz2 open-keychain-57fa702cbf28368994810c33dcc9afeebf60932d.zip | |
Design fixes for header, QR Code shared element transitions
Diffstat (limited to 'OpenKeychain/src/main/res/values-v21')
| -rw-r--r-- | OpenKeychain/src/main/res/values-v21/dimens.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values-v21/themes.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values-v21/dimens.xml b/OpenKeychain/src/main/res/values-v21/dimens.xml index eee21b52e..7e07ae0f9 100644 --- a/OpenKeychain/src/main/res/values-v21/dimens.xml +++ b/OpenKeychain/src/main/res/values-v21/dimens.xml @@ -7,5 +7,5 @@ <dimen name="statusbar_height">24dp</dimen> <!-- 120dp + statusbar_height --> <dimen name="big_toolbar">141dp</dimen> - <dimen name="huge_toolbar">233dp</dimen> + <dimen name="huge_toolbar">243dp</dimen> </resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values-v21/themes.xml b/OpenKeychain/src/main/res/values-v21/themes.xml index 93d534873..b47026e5b 100644 --- a/OpenKeychain/src/main/res/values-v21/themes.xml +++ b/OpenKeychain/src/main/res/values-v21/themes.xml @@ -4,10 +4,12 @@ <style name="KeychainTheme" parent="KeychainTheme.Base"> <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>
\ No newline at end of file |