summaryrefslogtreecommitdiffstats
path: root/res/drawable
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2016-08-29 15:41:02 -0700
committerd34d <clark@cyngn.com>2016-08-31 09:44:52 -0700
commit550e88b1e62228124f22b2d70ce3bf45fe9a1314 (patch)
tree91efd4126034e8b91c463da8bd02a00cf7ff9751 /res/drawable
parentbcd90a38b28f7c57bce8057d855e4c276aab2776 (diff)
downloadpackages_apps_ThemeChooser-550e88b1e62228124f22b2d70ce3bf45fe9a1314.tar.gz
packages_apps_ThemeChooser-550e88b1e62228124f22b2d70ce3bf45fe9a1314.tar.bz2
packages_apps_ThemeChooser-550e88b1e62228124f22b2d70ce3bf45fe9a1314.zip
Fall cleaning
* Change package name to org.cyanogenmod.theme.chooser2 to avoid theme collisions with old OSS chooser * Change parent theme to Theme.Material.Light * Change minSdkVersion to 21 since we are going material * Add selectors for bottom action buttons (app themer, shop themes) * Add selector, using app themer color, for app themer list view * Add selector for actions in theme cards * Bring back OSS app icon * Reduce log spam in ThemedTypefaceHelper * Localize "new" tag using a TextView instead of an image * Other random stuff Change-Id: I73ef0b9c9370284e29ee00add87273cf54c83e0e
Diffstat (limited to 'res/drawable')
-rw-r--r--res/drawable/bottom_action_item_background.xml30
-rw-r--r--res/drawable/per_app_theme_list_item_background.xml (renamed from res/drawable/shop_themes_bg.xml)16
-rw-r--r--res/drawable/theme_card_action_item_background.xml26
3 files changed, 62 insertions, 10 deletions
diff --git a/res/drawable/bottom_action_item_background.xml b/res/drawable/bottom_action_item_background.xml
new file mode 100644
index 0000000..4689ee1
--- /dev/null
+++ b/res/drawable/bottom_action_item_background.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/bottom_action_selected_background_color">
+ <item android:id="@android:id/mask">
+ <shape android:shape="rectangle">
+ <corners android:radius="4dp"/>
+ <padding android:top="4dp"
+ android:bottom="4dp"
+ android:left="4dp"
+ android:right="4dp"/>
+ <solid android:color="@color/bottom_action_background_mask_color"/>
+ </shape>
+ </item>
+</ripple>
diff --git a/res/drawable/shop_themes_bg.xml b/res/drawable/per_app_theme_list_item_background.xml
index f0384e9..edd4a1d 100644
--- a/res/drawable/shop_themes_bg.xml
+++ b/res/drawable/per_app_theme_list_item_background.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (C) 2016 Cyanogen, Inc.
Copyright (C) 2016 The CyanogenMod Project
Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +15,9 @@
limitations under the License.
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:state_focused="true"
- android:drawable="@drawable/bg_button_shopthemes_focused"/>
- <item android:state_pressed="true"
- android:drawable="@drawable/bg_button_shopthemes_pressed"/>
- <item android:drawable="@drawable/bg_button_shopthemes_normal"/>
-
-</selector> \ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/per_app_theme_list_item_bg_color">
+ <item android:id="@android:id/mask">
+ <color android:color="@color/per_app_theme_list_item_bg_mask_color" />
+ </item>
+</ripple>
diff --git a/res/drawable/theme_card_action_item_background.xml b/res/drawable/theme_card_action_item_background.xml
new file mode 100644
index 0000000..dc575df
--- /dev/null
+++ b/res/drawable/theme_card_action_item_background.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/theme_card_action_item_background_color">
+ <item android:id="@android:id/mask">
+ <shape android:shape="rectangle">
+ <corners android:radius="2dp"/>
+ <solid android:color="@color/theme_card_action_item_background_mask_color"/>
+ </shape>
+ </item>
+</ripple>