diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-20 16:17:36 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-08-21 10:03:15 -0700 |
commit | dd306188a6e8b4d00b8ef0ab402589c92802f04b (patch) | |
tree | 7d5919b5215f52632af6dbb2511ea06645694fd0 | |
parent | 93adff28ed9b6bf06eba97c1266b3fb911eca6a0 (diff) | |
download | android_packages_apps_Trebuchet-dd306188a6e8b4d00b8ef0ab402589c92802f04b.tar.gz android_packages_apps_Trebuchet-dd306188a6e8b4d00b8ef0ab402589c92802f04b.tar.bz2 android_packages_apps_Trebuchet-dd306188a6e8b4d00b8ef0ab402589c92802f04b.zip |
Updating theme to use the light theme by default, instead of wallpaper theme
> This allows us to use all the goodness of material theme
> Cursor in folder edit text is no longer 1px wide
Change-Id: I705f5472ff71969ae45747dd127a8ba5253df44d
-rw-r--r-- | WallpaperPicker/res/values-v19/styles.xml | 2 | ||||
-rw-r--r-- | WallpaperPicker/res/values-v21/styles.xml | 7 | ||||
-rw-r--r-- | WallpaperPicker/res/values/colors.xml | 2 | ||||
-rw-r--r-- | WallpaperPicker/res/values/styles.xml | 8 | ||||
-rw-r--r-- | res/layout/all_apps_search_market.xml | 2 | ||||
-rw-r--r-- | res/layout/overview_panel.xml | 3 | ||||
-rw-r--r-- | res/layout/user_folder.xml | 1 |
7 files changed, 21 insertions, 4 deletions
diff --git a/WallpaperPicker/res/values-v19/styles.xml b/WallpaperPicker/res/values-v19/styles.xml index 136cf012c..15fb0ea2a 100644 --- a/WallpaperPicker/res/values-v19/styles.xml +++ b/WallpaperPicker/res/values-v19/styles.xml @@ -25,7 +25,7 @@ <item name="android:windowTranslucentNavigation">true</item> </style> - <style name="Theme" parent="@android:style/Theme.DeviceDefault.Wallpaper.NoTitleBar"> + <style name="Theme" parent="@style/BaseWallpaperTheme"> <item name="android:windowTranslucentStatus">true</item> <item name="android:windowTranslucentNavigation">true</item> </style> diff --git a/WallpaperPicker/res/values-v21/styles.xml b/WallpaperPicker/res/values-v21/styles.xml index 582ab8fed..70220edb9 100644 --- a/WallpaperPicker/res/values-v21/styles.xml +++ b/WallpaperPicker/res/values-v21/styles.xml @@ -33,4 +33,11 @@ <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item> </style> + <style name="Theme" parent="@style/BaseWallpaperTheme"> + <item name="android:windowTranslucentStatus">true</item> + <item name="android:windowTranslucentNavigation">true</item> + <item name="android:colorControlActivated">@color/launcher_accent_color</item> + <item name="android:colorAccent">@color/launcher_accent_color</item> + <item name="android:colorPrimary">@color/launcher_accent_color</item> + </style> </resources>
\ No newline at end of file diff --git a/WallpaperPicker/res/values/colors.xml b/WallpaperPicker/res/values/colors.xml index adae7cff6..6ba32f06d 100644 --- a/WallpaperPicker/res/values/colors.xml +++ b/WallpaperPicker/res/values/colors.xml @@ -19,4 +19,6 @@ --> <resources> <color name="wallpaper_picker_translucent_gray">#66000000</color> + + <color name="launcher_accent_color">#ff009688</color> </resources> diff --git a/WallpaperPicker/res/values/styles.xml b/WallpaperPicker/res/values/styles.xml index 74aeab903..d1c945a32 100644 --- a/WallpaperPicker/res/values/styles.xml +++ b/WallpaperPicker/res/values/styles.xml @@ -35,9 +35,15 @@ <item name="android:background">#88000000</item> </style> - <style name="Theme" parent="@android:style/Theme.DeviceDefault.Wallpaper.NoTitleBar"> + <style name="BaseWallpaperTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar"> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowShowWallpaper">true</item> + <item name="android:windowNoTitle">true</item> </style> + <style name="Theme" parent="@style/BaseWallpaperTheme"></style> + <style name="ActionBarSetWallpaperStyle" parent="@android:style/Widget.DeviceDefault.ActionButton"> <item name="android:textColor">#ffffffff</item> <item name="android:background">?android:attr/selectableItemBackground</item> diff --git a/res/layout/all_apps_search_market.xml b/res/layout/all_apps_search_market.xml index 1282069c8..1ed508890 100644 --- a/res/layout/all_apps_search_market.xml +++ b/res/layout/all_apps_search_market.xml @@ -23,7 +23,7 @@ android:paddingRight="16dp" android:fontFamily="sans-serif-medium" android:textSize="14sp" - android:textColor="#009688" + android:textColor="@color/launcher_accent_color" android:textAllCaps="true" android:focusable="false" android:background="@drawable/all_apps_search_market_bg" /> diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml index 4b7423eba..1f02dce3c 100644 --- a/res/layout/overview_panel.xml +++ b/res/layout/overview_panel.xml @@ -32,6 +32,7 @@ android:gravity="center_horizontal" android:text="@string/wallpaper_button_text" android:textAllCaps="true" + android:textColor="@android:color/white" android:textSize="12sp" /> <TextView @@ -45,6 +46,7 @@ android:gravity="center_horizontal" android:text="@string/widget_button_text" android:textAllCaps="true" + android:textColor="@android:color/white" android:textSize="12sp" /> <TextView @@ -58,6 +60,7 @@ android:gravity="center_horizontal" android:text="@string/settings_button_text" android:textAllCaps="true" + android:textColor="@android:color/white" android:textSize="12sp" /> </LinearLayout>
\ No newline at end of file diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index 275840def..252ebf01e 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -70,7 +70,6 @@ android:textColor="#ff777777" android:textColorHighlight="#ffCCCCCC" android:textColorHint="#ff808080" - android:textCursorDrawable="@null" android:textSize="14sp" /> <include |