diff options
| author | James Lemieux <jplemieux@google.com> | 2014-08-18 18:05:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-16 03:56:00 +0000 |
| commit | 47da4ce65aebb78dde6c3ce273e95b547360bec2 (patch) | |
| tree | ff0897160ff894a7d7ec0763ed7dca7d46f9c5ee /res/layout | |
| parent | 1b7a74b590c952132883f5176f20d82d92f2e3f7 (diff) | |
| parent | cace3194e9b7b0e2b6554bda2fa8b2f98da04175 (diff) | |
| download | android_packages_apps_UnifiedEmail-47da4ce65aebb78dde6c3ce273e95b547360bec2.tar.gz android_packages_apps_UnifiedEmail-47da4ce65aebb78dde6c3ce273e95b547360bec2.tar.bz2 android_packages_apps_UnifiedEmail-47da4ce65aebb78dde6c3ce273e95b547360bec2.zip | |
Merge "Implement inset dividers in Thread List" into ub-gmail-ur14-dev
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/conversation_long_press_to_select_tip_view.xml | 2 | ||||
| -rw-r--r-- | res/layout/conversation_outbox_tip_view.xml | 2 | ||||
| -rw-r--r-- | res/layout/conversation_photo_teaser_view.xml | 2 | ||||
| -rw-r--r-- | res/layout/conversation_sync_disabled_tip_view.xml | 2 | ||||
| -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 |
7 files changed, 8 insertions, 8 deletions
diff --git a/res/layout/conversation_long_press_to_select_tip_view.xml b/res/layout/conversation_long_press_to_select_tip_view.xml index 4ee8fc603..59b17ff12 100644 --- a/res/layout/conversation_long_press_to_select_tip_view.xml +++ b/res/layout/conversation_long_press_to_select_tip_view.xml @@ -10,7 +10,7 @@ android:id="@+id/swipeable_content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/conversation_read_selector" + android:background="@drawable/conversation_item_background_selector" android:orientation="horizontal" > <TextView diff --git a/res/layout/conversation_outbox_tip_view.xml b/res/layout/conversation_outbox_tip_view.xml index 8e66409f6..6277c300f 100644 --- a/res/layout/conversation_outbox_tip_view.xml +++ b/res/layout/conversation_outbox_tip_view.xml @@ -10,7 +10,7 @@ android:id="@+id/swipeable_content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/conversation_read_selector" + android:background="@drawable/conversation_item_background_selector" android:orientation="horizontal" > <TextView diff --git a/res/layout/conversation_photo_teaser_view.xml b/res/layout/conversation_photo_teaser_view.xml index 0a38aba87..6aac4d8a4 100644 --- a/res/layout/conversation_photo_teaser_view.xml +++ b/res/layout/conversation_photo_teaser_view.xml @@ -10,7 +10,7 @@ android:id="@+id/swipeable_content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/conversation_read_selector" + android:background="@drawable/conversation_item_background_selector" android:orientation="horizontal" > <ImageView diff --git a/res/layout/conversation_sync_disabled_tip_view.xml b/res/layout/conversation_sync_disabled_tip_view.xml index 02de42cce..1ed63a739 100644 --- a/res/layout/conversation_sync_disabled_tip_view.xml +++ b/res/layout/conversation_sync_disabled_tip_view.xml @@ -10,7 +10,7 @@ android:id="@+id/swipeable_content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/conversation_read_selector" + android:background="@drawable/conversation_item_background_selector" android:orientation="horizontal" > <LinearLayout diff --git a/res/layout/nested_folder_teaser_view.xml b/res/layout/nested_folder_teaser_view.xml index c85ed0a05..9e71f61c0 100644 --- a/res/layout/nested_folder_teaser_view.xml +++ b/res/layout/nested_folder_teaser_view.xml @@ -24,7 +24,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="@drawable/conversation_unread_selector" + android:background="@drawable/conversation_item_background_selector" android:orientation="vertical" > <LinearLayout diff --git a/res/layout/widget_conversation_list_item.xml b/res/layout/widget_conversation_list_item.xml index 8d6cbb239..92ebe50bf 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/widget_conversation_unread_selector" /> + android:background="@drawable/conversation_item_background_selector" /> <ImageView android:id="@+id/widget_read_background" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/widget_conversation_read_selector" /> + android:background="@drawable/conversation_item_background_selector" /> <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 c0f03e384..0d116a2f7 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_read_selector"> + android:background="@drawable/conversation_item_background_selector"> <TextView android:id="@+id/loading_text" android:layout_height="match_parent" |