diff options
author | Jin Cao <jinyan@google.com> | 2014-08-14 00:33:47 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-12 23:14:35 +0000 |
commit | c24265d598e9d73505da725aecd54c4478d09556 (patch) | |
tree | 6a279a6d03c3356c2e96ff0a844a9ebec554c376 /res | |
parent | 236627e3e967146291bde2e438de0aa262a69407 (diff) | |
parent | 0c998d41da2dafeacd75ab4d71dc37eaf2dfc074 (diff) | |
download | android_packages_apps_UnifiedEmail-c24265d598e9d73505da725aecd54c4478d09556.tar.gz android_packages_apps_UnifiedEmail-c24265d598e9d73505da725aecd54c4478d09556.tar.bz2 android_packages_apps_UnifiedEmail-c24265d598e9d73505da725aecd54c4478d09556.zip |
Merge "Remove duplicate resources" into ub-gmail-ur14-dev
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ic_cancel_wht.png (renamed from res/drawable-hdpi/ic_attach_cancel.png) | bin | 705 -> 705 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_menu_cancel_holo_light.png | bin | 744 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_cancel_wht.png (renamed from res/drawable-mdpi/ic_attach_cancel.png) | bin | 642 -> 642 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_menu_cancel_holo_light.png | bin | 660 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_cancel_wht.png (renamed from res/drawable-xhdpi/ic_attach_cancel.png) | bin | 950 -> 950 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_menu_cancel_holo_light.png | bin | 1016 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_cancel_wht.png (renamed from res/drawable-xxhdpi/ic_attach_cancel.png) | bin | 1586 -> 1586 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_menu_cancel_holo_light.png | bin | 1592 -> 0 bytes | |||
-rw-r--r-- | res/layout/compose_attachment_tile.xml | 2 | ||||
-rw-r--r-- | res/layout/vacation_responder_custom_action_bar.xml | 2 | ||||
-rw-r--r-- | res/menu/vacation_responder_menu.xml | 2 |
11 files changed, 3 insertions, 3 deletions
diff --git a/res/drawable-hdpi/ic_attach_cancel.png b/res/drawable-hdpi/ic_cancel_wht.png Binary files differindex 1ddb836d9..1ddb836d9 100644 --- a/res/drawable-hdpi/ic_attach_cancel.png +++ b/res/drawable-hdpi/ic_cancel_wht.png diff --git a/res/drawable-hdpi/ic_menu_cancel_holo_light.png b/res/drawable-hdpi/ic_menu_cancel_holo_light.png Binary files differdeleted file mode 100644 index 3e080e855..000000000 --- a/res/drawable-hdpi/ic_menu_cancel_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_attach_cancel.png b/res/drawable-mdpi/ic_cancel_wht.png Binary files differindex 10cf3cf66..10cf3cf66 100644 --- a/res/drawable-mdpi/ic_attach_cancel.png +++ b/res/drawable-mdpi/ic_cancel_wht.png diff --git a/res/drawable-mdpi/ic_menu_cancel_holo_light.png b/res/drawable-mdpi/ic_menu_cancel_holo_light.png Binary files differdeleted file mode 100644 index 7cad8c157..000000000 --- a/res/drawable-mdpi/ic_menu_cancel_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_attach_cancel.png b/res/drawable-xhdpi/ic_cancel_wht.png Binary files differindex 315a7a612..315a7a612 100644 --- a/res/drawable-xhdpi/ic_attach_cancel.png +++ b/res/drawable-xhdpi/ic_cancel_wht.png diff --git a/res/drawable-xhdpi/ic_menu_cancel_holo_light.png b/res/drawable-xhdpi/ic_menu_cancel_holo_light.png Binary files differdeleted file mode 100644 index 4169aee26..000000000 --- a/res/drawable-xhdpi/ic_menu_cancel_holo_light.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_attach_cancel.png b/res/drawable-xxhdpi/ic_cancel_wht.png Binary files differindex 4e8e5ddc7..4e8e5ddc7 100644 --- a/res/drawable-xxhdpi/ic_attach_cancel.png +++ b/res/drawable-xxhdpi/ic_cancel_wht.png diff --git a/res/drawable-xxhdpi/ic_menu_cancel_holo_light.png b/res/drawable-xxhdpi/ic_menu_cancel_holo_light.png Binary files differdeleted file mode 100644 index cc259a78d..000000000 --- a/res/drawable-xxhdpi/ic_menu_cancel_holo_light.png +++ /dev/null diff --git a/res/layout/compose_attachment_tile.xml b/res/layout/compose_attachment_tile.xml index 14a68ce5e..f3496f83e 100644 --- a/res/layout/compose_attachment_tile.xml +++ b/res/layout/compose_attachment_tile.xml @@ -72,7 +72,7 @@ <ImageButton android:id="@+id/attachment_tile_close_button" - android:src="@drawable/ic_attach_cancel" + android:src="@drawable/ic_cancel_wht" android:layout_width="44dip" android:layout_height="44dip" android:layout_gravity="center_vertical|end|right" diff --git a/res/layout/vacation_responder_custom_action_bar.xml b/res/layout/vacation_responder_custom_action_bar.xml index 0abc196e4..f70dc90f6 100644 --- a/res/layout/vacation_responder_custom_action_bar.xml +++ b/res/layout/vacation_responder_custom_action_bar.xml @@ -28,7 +28,7 @@ style="@style/CustomActionButton"> <ImageView - android:src="@drawable/ic_menu_cancel_holo_light" + android:src="@drawable/ic_cancel_holo_light" style="@style/CustomActionButtonImage" /> <TextView android:text="@string/cancel" diff --git a/res/menu/vacation_responder_menu.xml b/res/menu/vacation_responder_menu.xml index caa30cb8f..829b4b1e1 100644 --- a/res/menu/vacation_responder_menu.xml +++ b/res/menu/vacation_responder_menu.xml @@ -18,7 +18,7 @@ <item android:id="@+id/action_cancel" android:alphabeticShortcut="c" android:title="@string/cancel" - android:icon="@drawable/ic_menu_cancel_holo_light" + android:icon="@drawable/ic_cancel_holo_light" android:showAsAction="withText|always" /> <item android:id="@+id/action_done" android:alphabeticShortcut="d" |