Themes: Expose new hard coded colors for themes

Change-Id: I944d2ad88f177228d5fedbf213265fe05313e185
Signed-off-by: Bryan Owens <djbryan3540@gmail.com>

12 files changed, 36 insertions, 19 deletions

diff --git a/res/layout/attachment_pending_item.xml b/res/layout/attachment_pending_item.xml
index 3e9bec7..2f9075a 100644
--- a/res/layout/attachment_pending_item.xml
+++ b/res/layout/attachment_pending_item.xml
@@ -26,7 +26,7 @@
         android:layout_width="@dimen/pending_attachment_size"
         android:layout_height="@dimen/pending_attachment_size"
         android:scaleType="center"
-        android:background="@android:color/white"
+        android:background="@color/pending_item_view_background_color"
         android:src="@drawable/ic_attachment_dark"
         android:importantForAccessibility="no"
         android:contentDescription="@null"/>
diff --git a/res/layout/debug_mmsconfig_item_view.xml b/res/layout/debug_mmsconfig_item_view.xml
index a825ee5..d4ce2b0 100644
--- a/res/layout/debug_mmsconfig_item_view.xml
+++ b/res/layout/debug_mmsconfig_item_view.xml
@@ -19,7 +19,7 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="56dp"
-    android:background="@android:color/background_light"
+    android:background="@color/debug_mmsconfig_item_view_background_color"
     android:gravity="center_vertical"
     android:clickable="true"
     style="@style/DebugMmsConfigItemStyle" >
diff --git a/res/layout/mediapicker_audio_chooser.xml b/res/layout/mediapicker_audio_chooser.xml
index 795d2f8..040ebe1 100644
--- a/res/layout/mediapicker_audio_chooser.xml
+++ b/res/layout/mediapicker_audio_chooser.xml
@@ -19,7 +19,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white"
+    android:background="@color/mediapicker_audio_chooser_background_color"
     android:importantForAccessibility="no" >
 
     <FrameLayout
@@ -89,7 +89,7 @@
         android:layout_height="match_parent"
         android:text="@string/enable_permission_procedure"
         android:contentDescription="@string/enable_permission_procedure_description"
-        android:background="@android:color/white"
+        android:background="@color/missing_permission_view_background_color"
         android:gravity="center"
         android:visibility="gone" />
 
diff --git a/res/layout/mediapicker_audio_list_chooser.xml b/res/layout/mediapicker_audio_list_chooser.xml
index fbab0bc..5758752 100644
--- a/res/layout/mediapicker_audio_list_chooser.xml
+++ b/res/layout/mediapicker_audio_list_chooser.xml
@@ -24,7 +24,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:padding="6dp"
-        android:background="@android:color/white" />
+        android:background="@color/audio_list_view_background_color" />
 
     <!-- This view will hide all other views if the required permission is not granted -->
     <TextView
@@ -33,7 +33,7 @@
         android:layout_height="match_parent"
         android:text="@string/enable_permission_procedure"
         android:contentDescription="@string/enable_permission_procedure_description"
-        android:background="@android:color/white"
+        android:background="@color/missing_permission_view_background_color"
         android:gravity="center"
         android:visibility="gone" />
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/mediapicker_camera_chooser.xml b/res/layout/mediapicker_camera_chooser.xml
index 27d26bd..b0b2d20 100644
--- a/res/layout/mediapicker_camera_chooser.xml
+++ b/res/layout/mediapicker_camera_chooser.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/black">
+    android:background="@color/mediapicker_camera_chooser_background_color">
 
     <FrameLayout
         android:id="@+id/mediapicker_enabled"
@@ -43,7 +43,7 @@
             android:id="@+id/camera_shutter_visual"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@android:color/white"
+            android:background="@color/camera_shutter_visual_background_color"
             android:visibility="gone" />
 
         <!-- Need a background on this view in order for the ripple effect to have a place to draw -->
@@ -75,7 +75,7 @@
                     android:id="@+id/camera_video_counter"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@android:color/white"
+                    android:textColor="@color/camera_video_counter_text_color"
                     android:textSize="18sp"
                     android:padding="16dp"
                     android:visibility="gone" />
@@ -143,7 +143,7 @@
         android:layout_height="match_parent"
         android:text="@string/enable_permission_procedure"
         android:contentDescription="@string/enable_permission_procedure_description"
-        android:background="@android:color/white"
+        android:background="@color/missing_permission_view_background_color"
         android:gravity="center"
         android:visibility="gone" />
 
diff --git a/res/layout/mediapicker_image_chooser.xml b/res/layout/mediapicker_image_chooser.xml
index b4f3c01..8b0e428 100644
--- a/res/layout/mediapicker_image_chooser.xml
+++ b/res/layout/mediapicker_image_chooser.xml
@@ -30,7 +30,7 @@
         android:stretchMode="columnWidth"
         android:gravity="center"
         android:clipToPadding="false"
-        android:background="@android:color/white" />
+        android:background="@color/gallery_grid_view_background_color" />
     <!-- This view will hide all other views if the required permission is not granted -->
     <TextView
         android:id="@+id/missing_permission_view"
@@ -38,7 +38,7 @@
         android:layout_height="match_parent"
         android:text="@string/enable_permission_procedure"
         android:contentDescription="@string/enable_permission_procedure_description"
-        android:background="@android:color/white"
+        android:background="@color/missing_permission_view_background_color"
         android:gravity="center"
         android:visibility="gone" />
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/permission_check_activity.xml b/res/layout/permission_check_activity.xml
index 57f665c..775cf4f 100644
--- a/res/layout/permission_check_activity.xml
+++ b/res/layout/permission_check_activity.xml
@@ -46,7 +46,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@android:color/white" />
+        android:background="@color/permission_check_activity_divider" />
     <!-- Buttons -->
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/res/layout/sms_storage_low_warning_dialog.xml b/res/layout/sms_storage_low_warning_dialog.xml
index 965cab6..5a532c8 100644
--- a/res/layout/sms_storage_low_warning_dialog.xml
+++ b/res/layout/sms_storage_low_warning_dialog.xml
@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="6dp"
-    android:background="@android:color/background_light">
+    android:background="@color/sms_storage_low_warning_dialog_background_color">
 
     <ListView android:id="@+id/free_storage_action_list"
         android:layout_width="match_parent"
diff --git a/res/layout/snack_bar.xml b/res/layout/snack_bar.xml
index 1cdabc3..8ac7772 100644
--- a/res/layout/snack_bar.xml
+++ b/res/layout/snack_bar.xml
@@ -32,7 +32,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:background="#323232" >
+        android:background="@color/snack_bar_background_color" >
 
         <FrameLayout
             android:id="@+id/snack_bar_message_wrapper"
@@ -57,7 +57,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center_vertical"
-            android:textColor="#EEFF41"
+            android:textColor="@color/snack_bar_action_text_color"
             android:textAllCaps="true" />
     </LinearLayout>
 
diff --git a/res/layout/widget_loading.xml b/res/layout/widget_loading.xml
index 8282b5d..03c0a40 100644
--- a/res/layout/widget_loading.xml
+++ b/res/layout/widget_loading.xml
@@ -26,6 +26,6 @@
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         android:gravity="center"
-        android:textColor="@android:color/black"
+        android:textColor="@color/widget_loading_text_color"
         android:textSize="12sp" />
 </FrameLayout>
\ No newline at end of file
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
index 7677e38..0342f85 100755
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -39,4 +39,21 @@
 
     <color name="outgoing_message_bg">#e4e7e8</color>
     <color name="qm_reply">#4d4d4d</color>
+
+    <color name="pending_item_view_background_color">@android:color/white</color>
+    <color name="mediapicker_audio_chooser_background_color">@android:color/white</color>
+    <color name="missing_permission_view_background_color">@android:color/white</color>
+    <color name="audio_list_view_background_color">@android:color/white</color>
+    <color name="camera_shutter_visual_background_color">@android:color/white</color>
+    <color name="gallery_grid_view_background_color">@android:color/white</color>
+    <color name="permission_check_activity_divider">@android:color/white</color>
+    <color name="debug_mmsconfig_item_view_background_color">@android:color/background_light</color>
+    <color name="mediapicker_camera_chooser_background_color">@android:color/black</color>
+    <color name="camera_video_counter_text_color">@android:color/white</color>
+    <color name="sms_storage_low_warning_dialog_background_color">@android:color/background_light</color>
+    <color name="widget_loading_text_color">@android:color/black</color>
+    <color name="snack_bar_background_color">#323232</color>
+    <color name="snack_bar_action_text_color">#EEFF41</color>
+    <color name="mic_recording_color">#ffffff</color>
+    <color name="mic_background_color">#ffffff</color>
 </resources>
diff --git a/src/com/android/messaging/ui/mediapicker/AudioRecordView.java b/src/com/android/messaging/ui/mediapicker/AudioRecordView.java
index fba493f..df3f8d3 100644
--- a/src/com/android/messaging/ui/mediapicker/AudioRecordView.java
+++ b/src/com/android/messaging/ui/mediapicker/AudioRecordView.java
@@ -228,11 +228,11 @@ public class AudioRecordView extends FrameLayout implements
         final GradientDrawable backgroundDrawable = ((GradientDrawable) getResources()
                 .getDrawable(R.drawable.audio_record_control_button_background));
         if (isRecording()) {
-            foregroundDrawable.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
+            foregroundDrawable.setColorFilter(getColor(R.color.mic_recording_color), PorterDuff.Mode.SRC_ATOP);
             backgroundDrawable.setColor(mThemeColor);
         } else {
             foregroundDrawable.setColorFilter(mThemeColor, PorterDuff.Mode.SRC_ATOP);
-            backgroundDrawable.setColor(Color.WHITE);
+            backgroundDrawable.setColor(getColor(R.color.mic_background_color));
         }
         mRecordButtonVisual.setImageDrawable(foregroundDrawable);
         mRecordButtonVisual.setBackground(backgroundDrawable);