diff options
| -rw-r--r-- | OpenKeychain/src/main/res/layout/toolbar.xml | 5 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/styles.xml | 31 |
2 files changed, 3 insertions, 33 deletions
diff --git a/OpenKeychain/src/main/res/layout/toolbar.xml b/OpenKeychain/src/main/res/layout/toolbar.xml index d0c5e4f99..4c1ad4e54 100644 --- a/OpenKeychain/src/main/res/layout/toolbar.xml +++ b/OpenKeychain/src/main/res/layout/toolbar.xml @@ -4,6 +4,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" android:background="?attr/colorPrimaryDark" - app:theme="@style/KeychainToolbarOverflow" - app:popupTheme="@style/KeychainTheme" />
\ No newline at end of file + app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml index 11d2bfde4..3844ccb29 100644 --- a/OpenKeychain/src/main/res/values/styles.xml +++ b/OpenKeychain/src/main/res/values/styles.xml @@ -34,35 +34,4 @@ <item name="android:background">@drawable/selector_transparent_button</item> </style> - <!-- - Make Toolbar with white text and white overflow menu - http://www.murrayc.com/permalink/2014/10/28/android-changing-the-toolbars-text-color-and-overflow-icon-color/ - --> - <style name="KeychainToolbarOverflow" parent="KeychainTheme"> - <!-- android:textColorPrimary is the color of the title text - in the Toolbar, in the Theme.AppCompat theme: --> - <item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item> - - <!-- android:textColorPrimaryInverse is the color of the title - text in the Toolbar, in the Theme.AppCompat.Light theme: --> - <!-- <item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item> --> - - <!-- android:actionMenuTextColor is the color of the text of - action (menu) items in the Toolbar, at least in the - Theme.AppCompat theme. - For some reason, they already get the textColorPrimary - when running on API 21, but not on older versions of - Android, so this is only necessary to support older - Android versions.--> - <item name="actionMenuTextColor">@color/abc_primary_text_material_dark</item> - <!-- android:textColorSecondary is the color of the menu - overflow icon (three vertical dots) --> - <item name="android:textColorSecondary">@color/abc_primary_text_material_dark</item> - - <!-- This would set the toolbar's background color, - but setting this also changes the popup menu's background, - even if we define popupTheme for our <Toolbar> --> - <!-- <item name="android:background">@color/color_primary</item> --> - </style> - </resources>
\ No newline at end of file |