diff options
| -rw-r--r-- | res/drawable-v21/conversation_item_background.xml | 24 | ||||
| -rw-r--r-- | res/drawable-v21/conversation_item_background_ripple.xml | 21 | ||||
| -rw-r--r-- | res/drawable/conversation_item_background.xml (renamed from res/drawable/conversation_item_background_selector.xml) | 0 | ||||
| -rw-r--r-- | res/layout/nested_folder_teaser_view.xml | 2 | ||||
| -rw-r--r-- | res/layout/widget_conversation_list_item.xml | 4 | ||||
| -rw-r--r-- | res/layout/widget_loading.xml | 2 | ||||
| -rw-r--r-- | res/values/colors.xml | 2 | ||||
| -rw-r--r-- | src/com/android/mail/browse/ConversationItemView.java | 2 | ||||
| -rw-r--r-- | src/com/android/mail/browse/ConversationListFooterView.java | 2 |
9 files changed, 52 insertions, 7 deletions
diff --git a/res/drawable-v21/conversation_item_background.xml b/res/drawable-v21/conversation_item_background.xml new file mode 100644 index 000000000..444528ccc --- /dev/null +++ b/res/drawable-v21/conversation_item_background.xml @@ -0,0 +1,24 @@ +<?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. +--> +<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 diff --git a/res/drawable-v21/conversation_item_background_ripple.xml b/res/drawable-v21/conversation_item_background_ripple.xml new file mode 100644 index 000000000..2b336f9f9 --- /dev/null +++ b/res/drawable-v21/conversation_item_background_ripple.xml @@ -0,0 +1,21 @@ +<?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_selector.xml b/res/drawable/conversation_item_background.xml index 57b6e942d..57b6e942d 100644 --- a/res/drawable/conversation_item_background_selector.xml +++ b/res/drawable/conversation_item_background.xml diff --git a/res/layout/nested_folder_teaser_view.xml b/res/layout/nested_folder_teaser_view.xml index a471aeb57..3c95de54f 100644 --- a/res/layout/nested_folder_teaser_view.xml +++ b/res/layout/nested_folder_teaser_view.xml @@ -20,7 +20,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/conversation_item_background_selector" + android:background="@drawable/conversation_item_background" android:orientation="vertical"> <LinearLayout diff --git a/res/layout/widget_conversation_list_item.xml b/res/layout/widget_conversation_list_item.xml index 5e81b108e..ea2c405ad 100644 --- a/res/layout/widget_conversation_list_item.xml +++ b/res/layout/widget_conversation_list_item.xml @@ -29,12 +29,12 @@ android:id="@+id/widget_unread_background" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/conversation_item_background_selector" /> + android:background="@drawable/conversation_item_background" /> <ImageView android:id="@+id/widget_read_background" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/conversation_item_background_selector" /> + android:background="@drawable/conversation_item_background" /> <LinearLayout android:id="@+id/content" android:layout_width="match_parent" diff --git a/res/layout/widget_loading.xml b/res/layout/widget_loading.xml index 0d116a2f7..b3cde7b5e 100644 --- a/res/layout/widget_loading.xml +++ b/res/layout/widget_loading.xml @@ -20,7 +20,7 @@ android:id="@+id/widget_loading" android:layout_width="match_parent" android:layout_height="64sp" - android:background="@drawable/conversation_item_background_selector"> + android:background="@drawable/conversation_item_background"> <TextView android:id="@+id/loading_text" android:layout_height="match_parent" diff --git a/res/values/colors.xml b/res/values/colors.xml index c4b5c0964..0b9a8a793 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -179,5 +179,5 @@ <color name="snack_bar_background_color">#323232</color> <color name="snack_bar_action_text_color">#f4b400</color> - <color name="conversation_item_blue_background">#e5f8fb</color> + <color name="conversation_item_blue_background">#ccf2f7</color> </resources> diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java index 430622974..3aa93c54c 100644 --- a/src/com/android/mail/browse/ConversationItemView.java +++ b/src/com/android/mail/browse/ConversationItemView.java @@ -1512,7 +1512,7 @@ public class ConversationItemView extends View if (mBackgroundOverrideResId > 0) { background = mBackgroundOverrideResId; } else { - background = R.drawable.conversation_item_background_selector; + background = R.drawable.conversation_item_background; } setBackgroundResource(background); } diff --git a/src/com/android/mail/browse/ConversationListFooterView.java b/src/com/android/mail/browse/ConversationListFooterView.java index 53ec81c3d..1113a2417 100644 --- a/src/com/android/mail/browse/ConversationListFooterView.java +++ b/src/com/android/mail/browse/ConversationListFooterView.java @@ -200,7 +200,7 @@ public final class ConversationListFooterView extends LinearLayout implements Vi private Drawable getNormalBackground() { if (sNormalBackground == null) { - sNormalBackground = getBackground(R.drawable.conversation_item_background_selector); + sNormalBackground = getBackground(R.drawable.conversation_item_background); } return sNormalBackground; } |