am 350ed8a7: am 79e0d0a0: Merge "Update conv item background" into ub-gmail-ur14-dev
* commit '350ed8a7b7a25923ac4df75f0da8e55a865c2394':
Update conv item background
diff --git a/res/drawable-v21/conversation_item_background.xml b/res/drawable-v21/conversation_item_background.xml
index 444528c..513a896 100644
--- a/res/drawable-v21/conversation_item_background.xml
+++ b/res/drawable-v21/conversation_item_background.xml
@@ -15,10 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_activated="true"
- android:drawable="@color/conversation_item_blue_background" />
- <item android:state_checked="true"
- android:drawable="@color/conversation_item_blue_background" />
- <item android:drawable="@drawable/conversation_item_background_ripple" />
-</selector>
\ No newline at end of file
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/conversation_item_grey_ripple_color">
+ <item>
+ <selector>
+ <item android:state_checked="true"
+ android:drawable="@color/conversation_item_grey_background_color" />
+ <item android:state_activated="true"
+ android:drawable="@color/conversation_item_blue_background_color" />
+ <item android:drawable="@android:color/white" />
+ </selector>
+ </item>
+</ripple>
\ No newline at end of file
diff --git a/res/drawable-v21/conversation_item_background_ripple.xml b/res/drawable-v21/conversation_item_background_ripple.xml
deleted file mode 100644
index f474b14..0000000
--- a/res/drawable-v21/conversation_item_background_ripple.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014 Google Inc.
- Licensed to The Android Open Source 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/conversation_item_blue_background">
-
- <item android:drawable="@android:color/white" />
-
-</ripple>
\ No newline at end of file
diff --git a/res/drawable/conversation_item_background.xml b/res/drawable/conversation_item_background.xml
index 57b6e94..c5cfe4a 100644
--- a/res/drawable/conversation_item_background.xml
+++ b/res/drawable/conversation_item_background.xml
@@ -17,10 +17,10 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
- android:drawable="@color/conversation_item_blue_background" />
+ android:drawable="@color/conversation_item_grey_pressed_color" />
<item android:state_checked="true"
- android:drawable="@color/conversation_item_blue_background" />
+ android:drawable="@color/conversation_item_grey_background_color" />
<item android:state_activated="true"
- android:drawable="@color/conversation_item_blue_background" />
+ android:drawable="@color/conversation_item_blue_background_color" />
<item android:drawable="@android:color/white" />
</selector>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index d2b0d59..05a0157 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -173,6 +173,9 @@
<color name="snack_bar_background_color">#323232</color>
<color name="snack_bar_action_text_color">#f4b400</color>
- <color name="conversation_item_blue_background">#ccf2f7</color>
<color name="conversation_list_background_color">@android:color/transparent</color>
+ <color name="conversation_item_blue_background_color">#e3edfe</color>
+ <color name="conversation_item_grey_background_color">#ececec</color>
+ <color name="conversation_item_grey_pressed_color">#d9d9d9</color>
+ <color name="conversation_item_grey_ripple_color">#20444444</color>
</resources>