From f182e6103d1139badc42e907e3abd1907a128a1c Mon Sep 17 00:00:00 2001
From: Bryan Owens <djbryan3540@gmail.com>
Date: Fri, 15 Jan 2016 22:24:51 -0600
Subject: Themes: Expose hard coded colors from layouts

Change-Id: I4913f57fb44f234fd140b9c2e0fe59cba49fe702
Signed-off-by: Bryan Owens <djbryan3540@gmail.com>
---
 res/layout-land/migration_cling.xml            | 12 ++++++------
 res/layout-port/migration_cling.xml            | 12 ++++++------
 res/layout/all_apps_empty_search.xml           |  2 +-
 res/layout/all_apps_search_bar.xml             |  4 ++--
 res/layout/hidden_folder.xml                   |  4 ++--
 res/layout/longpress_cling_content.xml         |  6 +++---
 res/layout/longpress_cling_welcome_content.xml |  8 ++++----
 res/layout/overview_panel.xml                  |  8 ++++----
 res/layout/scrub_layout.xml                    |  2 +-
 res/layout/scrubber_container.xml              |  2 +-
 res/layout/user_folder.xml                     |  4 ++--
 res/values/cm_colors.xml                       | 23 +++++++++++++++++++++++
 12 files changed, 55 insertions(+), 32 deletions(-)
 create mode 100644 res/values/cm_colors.xml

diff --git a/res/layout-land/migration_cling.xml b/res/layout-land/migration_cling.xml
index 269c1aee6..82bba0d72 100644
--- a/res/layout-land/migration_cling.xml
+++ b/res/layout-land/migration_cling.xml
@@ -20,7 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     launcher:layout_ignoreInsets="true"
-    android:background="#FF009688"
+    android:background="@color/migration_cling_background_color"
     android:baselineAligned="false"
     android:gravity="center_vertical" >
 
@@ -56,7 +56,7 @@
             android:layout_height="wrap_content"
             android:paddingBottom="8dp"
             android:text="@string/first_run_cling_title"
-            android:textColor="#E1000000"
+            android:textColor="@color/first_run_cling_title_color"
             android:textSize="34sp" />
 
         <TextView
@@ -64,7 +64,7 @@
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-medium"
             android:text="@string/migration_cling_title"
-            android:textColor="#E1000000"
+            android:textColor="@color/first_run_cling_title_color"
             android:textSize="20sp" />
 
         <TextView
@@ -72,7 +72,7 @@
             android:layout_height="wrap_content"
             android:paddingBottom="24dp"
             android:text="@string/migration_cling_description"
-            android:textColor="#99000000"
+                android:textColor="@color/migration_cling_description_text_color"
             android:textSize="16sp" />
 
         <LinearLayout
@@ -87,7 +87,7 @@
                 android:layout_weight="1"
                 android:fontFamily="sans-serif-medium"
                 android:text="@string/migration_cling_copy_apps"
-                android:textColor="#FFFFFFFF"
+                android:textColor="@color/migration_cling_copy_apps_text_color"
                 android:textSize="14sp" />
 
             <Button
@@ -98,7 +98,7 @@
                 android:layout_weight="1"
                 android:fontFamily="sans-serif-medium"
                 android:text="@string/migration_cling_use_default"
-                android:textColor="#deFFFFFF"
+                android:textColor="@color/migration_cling_use_default_text_color"
                 android:textSize="14sp" />
         </LinearLayout>
     </LinearLayout>
diff --git a/res/layout-port/migration_cling.xml b/res/layout-port/migration_cling.xml
index 3f696a216..dc54bc8e5 100644
--- a/res/layout-port/migration_cling.xml
+++ b/res/layout-port/migration_cling.xml
@@ -20,7 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     launcher:layout_ignoreInsets="true"
-    android:background="#FF009688" >
+    android:background="@color/migration_cling_background_color" >
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -58,7 +58,7 @@
                 android:layout_height="wrap_content"
                 android:paddingBottom="8dp"
                 android:text="@string/first_run_cling_title"
-                android:textColor="#E1000000"
+                android:textColor="@color/first_run_cling_title_color"
                 android:textSize="34sp" />
 
             <TextView
@@ -66,7 +66,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif-medium"
                 android:text="@string/migration_cling_title"
-                android:textColor="#E1000000"
+                android:textColor="@color/first_run_cling_title_color"
                 android:textSize="20sp" />
 
             <TextView
@@ -74,7 +74,7 @@
                 android:layout_height="wrap_content"
                 android:paddingBottom="24dp"
                 android:text="@string/migration_cling_description"
-                android:textColor="#99000000"
+                android:textColor="@color/migration_cling_description_text_color"
                 android:textSize="16sp" />
 
             <LinearLayout
@@ -89,7 +89,7 @@
                     android:layout_weight="1"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/migration_cling_copy_apps"
-                    android:textColor="#FFFFFFFF"
+                    android:textColor="@color/migration_cling_copy_apps_text_color"
                     android:textSize="14sp" />
 
                 <Button
@@ -100,7 +100,7 @@
                     android:layout_weight="1"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/migration_cling_use_default"
-                    android:textColor="#deFFFFFF"
+                    android:textColor="@color/migration_cling_use_default_text_color"
                     android:textSize="14sp" />
             </LinearLayout>
         </LinearLayout>
diff --git a/res/layout/all_apps_empty_search.xml b/res/layout/all_apps_empty_search.xml
index 5439111a2..c4e91844c 100644
--- a/res/layout/all_apps_empty_search.xml
+++ b/res/layout/all_apps_empty_search.xml
@@ -25,7 +25,7 @@
     android:paddingRight="16dp"
     android:fontFamily="sans-serif-medium"
     android:textSize="14sp"
-    android:textColor="#212121"
+    android:textColor="@color/all_apps_empty_search_text_color"
     android:alpha="0.56"
     android:focusable="false" />
 
diff --git a/res/layout/all_apps_search_bar.xml b/res/layout/all_apps_search_bar.xml
index 69a66c817..7ed1b1f21 100644
--- a/res/layout/all_apps_search_bar.xml
+++ b/res/layout/all_apps_search_bar.xml
@@ -52,8 +52,8 @@
             android:paddingLeft="8dp"
             android:scrollHorizontally="true"
             android:singleLine="true"
-            android:textColor="#4c4c4c"
-            android:textColorHint="#9c9c9c"
+            android:textColor="@color/search_box_input_text_color"
+            android:textColorHint="@color/search_box_input_hint_text_color"
             android:textSize="16sp" />
     </LinearLayout>
 
diff --git a/res/layout/hidden_folder.xml b/res/layout/hidden_folder.xml
index 529384737..a6f94d8d9 100644
--- a/res/layout/hidden_folder.xml
+++ b/res/layout/hidden_folder.xml
@@ -51,9 +51,9 @@
             android:paddingBottom="@dimen/folder_name_padding"
             android:paddingTop="@dimen/folder_name_padding"
             android:hint="@string/folder_hint_text"
-            android:textColor="@android:color/white"
+            android:textColor="@color/folder_hint_text_color"
             android:textSize="20sp"
-            android:textColorHighlight="#ffCCCCCC"
+            android:textColorHighlight="@color/folder_name_highlight_text_color"
             android:textCursorDrawable="@null"
             android:singleLine="true"
             android:background="#00000000" />
diff --git a/res/layout/longpress_cling_content.xml b/res/layout/longpress_cling_content.xml
index 47a8e9797..1cda55b2f 100644
--- a/res/layout/longpress_cling_content.xml
+++ b/res/layout/longpress_cling_content.xml
@@ -12,7 +12,7 @@
         android:paddingLeft="36dp"
         android:paddingRight="36dp"
         android:text="@string/workspace_cling_longpress_title"
-        android:textColor="#E1000000"
+        android:textColor="@color/workspace_cling_longpress_title_color"
         android:textSize="24sp" />
 
     <TextView
@@ -22,7 +22,7 @@
         android:paddingLeft="36dp"
         android:paddingRight="36dp"
         android:text="@string/workspace_cling_longpress_description"
-        android:textColor="#99000000"
+        android:textColor="@color/workspace_cling_longpress_description_color"
         android:textSize="16sp" />
 
     <Button
@@ -37,7 +37,7 @@
         android:paddingLeft="24dp"
         android:paddingRight="24dp"
         android:text="@string/workspace_cling_longpress_dismiss"
-        android:textColor="#FFFFFFFF"
+        android:textColor="@color/workspace_cling_longpress_dismiss_text_color"
         android:textSize="14sp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/longpress_cling_welcome_content.xml b/res/layout/longpress_cling_welcome_content.xml
index dd4f8d767..ede489f53 100644
--- a/res/layout/longpress_cling_welcome_content.xml
+++ b/res/layout/longpress_cling_welcome_content.xml
@@ -13,7 +13,7 @@
         android:paddingLeft="36dp"
         android:paddingRight="36dp"
         android:text="@string/first_run_cling_title"
-        android:textColor="#E1000000"
+        android:textColor="@color/first_run_cling_title_color"
         android:textSize="34sp" />
 
     <TextView
@@ -24,7 +24,7 @@
         android:paddingLeft="36dp"
         android:paddingRight="36dp"
         android:text="@string/workspace_cling_longpress_title"
-        android:textColor="#E1000000"
+        android:textColor="@color/workspace_cling_longpress_title_color"
         android:textSize="20sp" />
 
     <TextView
@@ -33,7 +33,7 @@
         android:paddingLeft="36dp"
         android:paddingRight="36dp"
         android:text="@string/workspace_cling_longpress_description"
-        android:textColor="#99000000"
+        android:textColor="@color/workspace_cling_longpress_description_color"
         android:textSize="16sp" />
 
     <Button
@@ -48,7 +48,7 @@
         android:paddingLeft="24dp"
         android:paddingRight="24dp"
         android:text="@string/workspace_cling_longpress_dismiss"
-        android:textColor="#FFFFFFFF"
+        android:textColor="@color/workspace_cling_longpress_dismiss_text_color"
         android:textSize="14sp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml
index 636e36b89..fcf50c99f 100644
--- a/res/layout/overview_panel.xml
+++ b/res/layout/overview_panel.xml
@@ -88,7 +88,7 @@
                         android:gravity="center_horizontal"
                         android:text="@string/wallpaper_button_text"
                         android:textAllCaps="true"
-                        android:textColor="@android:color/white"
+                        android:textColor="@color/wallpaper_button_text_color"
                         android:textSize="12sp" />
 
                     <TextView
@@ -102,7 +102,7 @@
                         android:gravity="center_horizontal"
                         android:text="@string/widget_button_text"
                         android:textAllCaps="true"
-                        android:textColor="@android:color/white"
+                        android:textColor="@color/widget_button_text_color"
                         android:textSize="12sp" />
 
                     <TextView
@@ -116,7 +116,7 @@
                         android:gravity="center_horizontal"
                         android:text="@string/settings_button_text"
                         android:textAllCaps="true"
-                        android:textColor="@android:color/white"
+                        android:textColor="@color/settings_button_text_color"
                         android:textSize="12sp" />
 
                 </LinearLayout>
@@ -137,7 +137,7 @@
                 android:id="@+id/dark_panel"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@android:color/background_dark"
+                android:background="@color/overview_panel_background_color"
                 android:visibility="gone" />
     </FrameLayout>
 </com.android.launcher3.OverviewPanel>
\ No newline at end of file
diff --git a/res/layout/scrub_layout.xml b/res/layout/scrub_layout.xml
index 11ee381d0..987a2f2b6 100644
--- a/res/layout/scrub_layout.xml
+++ b/res/layout/scrub_layout.xml
@@ -28,7 +28,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:textColor="@android:color/white"
+        android:textColor="@color/scrubber_text_color"
         android:maxLines="1"
         android:lines="1"
         android:textSize="8sp" />
diff --git a/res/layout/scrubber_container.xml b/res/layout/scrubber_container.xml
index 4fe84755f..28224114a 100644
--- a/res/layout/scrubber_container.xml
+++ b/res/layout/scrubber_container.xml
@@ -45,7 +45,7 @@
         android:paddingTop="18dp"
         android:textSize="24sp"
         android:gravity="center_horizontal|top"
-        android:textColor="@android:color/black"
+        android:textColor="@color/scrubber_container_text_color"
         android:clickable="false"
         android:layout_marginBottom="-40dp"
         android:visibility="invisible"
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index 1a7e2d332..d948ec9ca 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -68,8 +68,8 @@
             android:paddingTop="4dp"
             android:singleLine="true"
             android:textColor="@color/workspace_icon_text_color"
-            android:textColorHighlight="#ffCCCCCC"
-            android:textColorHint="#ff808080"
+            android:textColorHighlight="@color/folder_name_highlight_text_color"
+            android:textColorHint="@color/folder_name_hint_text_color"
             android:textSize="14sp" />
 
         <include
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
new file mode 100644
index 000000000..d38e3de1c
--- /dev/null
+++ b/res/values/cm_colors.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="workspace_cling_longpress_title_color">#E1000000</color>
+    <color name="workspace_cling_longpress_description_color">#99000000</color>
+    <color name="workspace_cling_longpress_dismiss_text_color">#FFFFFFFF</color>
+    <color name="first_run_cling_title_color">#E1000000</color>
+    <color name="folder_name_highlight_text_color">#ffCCCCCC</color>
+    <color name="folder_name_hint_text_color">#ff808080</color>
+    <color name="folder_hint_text_color">@android:color/white</color>
+    <color name="all_apps_empty_search_text_color">#212121</color>
+    <color name="search_box_input_text_color">#4c4c4c</color>
+    <color name="search_box_input_hint_text_color">#9c9c9c</color>
+    <color name="migration_cling_background_color">#FF009688</color>
+    <color name="migration_cling_description_text_color">#99000000</color>
+    <color name="migration_cling_copy_apps_text_color">#FFFFFFFF</color>
+    <color name="migration_cling_use_default_text_color">#deFFFFFF</color>
+    <color name="wallpaper_button_text_color">@android:color/white</color>
+    <color name="widget_button_text_color">@android:color/white</color>
+    <color name="settings_button_text_color">@android:color/white</color>
+    <color name="overview_panel_background_color">@android:color/background_dark</color>
+    <color name="scrubber_container_text_color">@android:color/black</color>
+    <color name="scrubber_text_color">@android:color/white</color>
+</resources>
-- 
cgit v1.2.3