diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-09-09 08:38:24 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-09-09 08:38:24 -0700 |
| commit | a3e6a41d34715b45d50c5a47d9f431140857d30d (patch) | |
| tree | fd108b1d83e2f8237e96019c2db11b6fda831567 /app/src/main/res/layout | |
| parent | 53a8678ddf44cbcbfe7e411ee434a244ffb80689 (diff) | |
| download | dsub-a3e6a41d34715b45d50c5a47d9f431140857d30d.tar.gz dsub-a3e6a41d34715b45d50c5a47d9f431140857d30d.tar.bz2 dsub-a3e6a41d34715b45d50c5a47d9f431140857d30d.zip | |
Make colored action bar/status bar optional
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/abstract_fragment_activity.xml | 8 | ||||
| -rw-r--r-- | app/src/main/res/layout/drawer_header.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/settings_activity.xml | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/app/src/main/res/layout/abstract_fragment_activity.xml b/app/src/main/res/layout/abstract_fragment_activity.xml index 04e6ec81..d41b0115 100644 --- a/app/src/main/res/layout/abstract_fragment_activity.xml +++ b/app/src/main/res/layout/abstract_fragment_activity.xml @@ -18,9 +18,9 @@ android:id="@+id/main_toolbar" android:layout_height="?attr/actionBarSize" android:layout_width="match_parent" - android:background="?attr/colorPrimary" + android:background="?attr/actionbarBackgroundColor" android:elevation="4dp" - android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + android:theme="?attr/actionbarThemeStyle" app:popupTheme="?attr/actionbarPopupStyle"/> <include layout="@layout/abstract_fragment_container"/> @@ -36,7 +36,7 @@ android:id="@+id/slide_up_swipe_target" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/colorPrimary"> + android:background="?attr/actionbarBackgroundColor"> <android.support.v7.widget.Toolbar android:id="@+id/now_playing_toolbar" @@ -44,7 +44,7 @@ android:layout_width="match_parent" android:elevation="4dp" android:visibility="gone" - app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:theme="?attr/actionbarThemeStyle" app:popupTheme="?attr/actionbarPopupStyle"/> <LinearLayout diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml index 91fad9fe..86222f43 100644 --- a/app/src/main/res/layout/drawer_header.xml +++ b/app/src/main/res/layout/drawer_header.xml @@ -25,14 +25,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" - style="?attr/actionbarTitleStyle"/> + style="?attr/drawerTitleStyle"/> <TextView android:id="@+id/header_user_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" - style="?attr/actionbarSubtitleStyle"/> + style="?attr/drawerSubtitleStyle"/> </LinearLayout> <View diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml index c77528b2..3baa30d4 100644 --- a/app/src/main/res/layout/settings_activity.xml +++ b/app/src/main/res/layout/settings_activity.xml @@ -8,10 +8,10 @@ android:id="@+id/main_toolbar" android:layout_height="?attr/actionBarSize" android:layout_width="match_parent" - android:background="?attr/colorPrimary" + android:background="?attr/actionbarBackgroundColor" android:elevation="4dp" - app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" - app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/> + app:theme="?attr/actionbarThemeStyle" + app:popupTheme="?attr/actionbarPopupStyle"/> <FrameLayout android:id="@+id/fragment_container" |