diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/main_activity.xml | 17 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 7 |
2 files changed, 13 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/res/layout/main_activity.xml b/OpenKeychain/src/main/res/layout/main_activity.xml index 4a07053ea..45df0df71 100644 --- a/OpenKeychain/src/main/res/layout/main_activity.xml +++ b/OpenKeychain/src/main/res/layout/main_activity.xml @@ -1,19 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" + android:layout_width="match_parent" android:layout_height="match_parent"> <android.support.v7.widget.Toolbar - android:id="@+id/activity_main_toolbar" + android:id="@+id/toolbar" android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" + android:layout_height="wrap_content" android:elevation="4dp" - android:background="?attr/colorPrimary"/> + android:background="?attr/colorPrimary" + android:minHeight="?attr/actionBarSize" + app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:popupTheme="@style/ThemeOverlay.AppCompat.Light" + tools:ignore="UnusedAttribute" /> <FrameLayout android:id="@+id/main_fragment_container" android:layout_gravity="center" android:layout_height="match_parent" - android:layout_width="match_parent"/> + android:layout_width="match_parent" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 96d09151d..6ac09c5d7 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -8,17 +8,12 @@ <item name="colorPrimaryDark">@color/primary_dark</item> <item name="colorAccent">@color/accent</item> + <!-- remove actionbar and title, we use toolbar! --> <item name="windowNoTitle">true</item> - <!-- remove actionbar, we use toolbar! --> <item name="windowActionBar">false</item> <!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 --> <item name="windowActionModeOverlay">true</item> <item name="searchViewStyle">@style/MySearchViewStyle</item> - - <!-- dark action bar... --> - <item name="theme">@style/ThemeOverlay.AppCompat.Dark</item> - <!-- ...but light popup menu (white background) --> - <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item> </style> <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html --> |