diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 17:08:47 -0700 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 17:08:47 -0700 |
commit | 680c92febe88260b74f101838a9734b8e10a704c (patch) | |
tree | e3294c3b2b32cd3532fa9b239326b1aaaa79fc40 /res/drawable-xhdpi | |
parent | 494d2237b8d7b892902604c18098127e77372509 (diff) | |
parent | 13ef17a37e683b8ad5800e9f542b411180fbec2f (diff) | |
download | android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.tar.gz android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.tar.bz2 android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.zip |
resolved conflicts for merge of 13ef17a3 to cw-e-dev
b/22609402
Change-Id: I3753db1f922923a6b462fa75a5c0d826e0413f95
Diffstat (limited to 'res/drawable-xhdpi')
44 files changed, 0 insertions, 0 deletions
diff --git a/res/drawable-xhdpi/apps_customize_bg.png b/res/drawable-xhdpi/apps_customize_bg.png Binary files differdeleted file mode 100644 index a51cc112b..000000000 --- a/res/drawable-xhdpi/apps_customize_bg.png +++ /dev/null diff --git a/res/drawable-xhdpi/bg_appwidget_error.9.png b/res/drawable-xhdpi/bg_appwidget_error.9.png Binary files differdeleted file mode 100644 index b792cc847..000000000 --- a/res/drawable-xhdpi/bg_appwidget_error.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/home_press.9.png b/res/drawable-xhdpi/home_press.9.png Binary files differdeleted file mode 100644 index d9abfd358..000000000 --- a/res/drawable-xhdpi/home_press.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_arrow_back_grey.png b/res/drawable-xhdpi/ic_arrow_back_grey.png Binary files differnew file mode 100755 index 000000000..79b9b486c --- /dev/null +++ b/res/drawable-xhdpi/ic_arrow_back_grey.png diff --git a/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png b/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png Binary files differdeleted file mode 100644 index 81228d402..000000000 --- a/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_info_launcher.png b/res/drawable-xhdpi/ic_info_launcher.png Binary files differnew file mode 100644 index 000000000..076b59bf7 --- /dev/null +++ b/res/drawable-xhdpi/ic_info_launcher.png diff --git a/res/drawable-xhdpi/ic_launcher_clear_active_holo.png b/res/drawable-xhdpi/ic_launcher_clear_active_holo.png Binary files differdeleted file mode 100644 index 1a7e53ddb..000000000 --- a/res/drawable-xhdpi/ic_launcher_clear_active_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_launcher_clear_normal_holo.png b/res/drawable-xhdpi/ic_launcher_clear_normal_holo.png Binary files differdeleted file mode 100644 index d4965d9f8..000000000 --- a/res/drawable-xhdpi/ic_launcher_clear_normal_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_launcher_info_active_holo.png b/res/drawable-xhdpi/ic_launcher_info_active_holo.png Binary files differdeleted file mode 100644 index b8cdbc4f8..000000000 --- a/res/drawable-xhdpi/ic_launcher_info_active_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_launcher_info_normal_holo.png b/res/drawable-xhdpi/ic_launcher_info_normal_holo.png Binary files differdeleted file mode 100644 index f503fb82d..000000000 --- a/res/drawable-xhdpi/ic_launcher_info_normal_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_launcher_market_holo.png b/res/drawable-xhdpi/ic_launcher_market_holo.png Binary files differdeleted file mode 100644 index 958f0de3c..000000000 --- a/res/drawable-xhdpi/ic_launcher_market_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png Binary files differdeleted file mode 100644 index c155274bd..000000000 --- a/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png Binary files differdeleted file mode 100644 index 2ec7ad9b4..000000000 --- a/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_pageindicator_current.png b/res/drawable-xhdpi/ic_pageindicator_current.png Binary files differindex 8fa774dee..3054f2f4f 100644 --- a/res/drawable-xhdpi/ic_pageindicator_current.png +++ b/res/drawable-xhdpi/ic_pageindicator_current.png diff --git a/res/drawable-xhdpi/ic_pageindicator_current_folder.png b/res/drawable-xhdpi/ic_pageindicator_current_folder.png Binary files differnew file mode 100644 index 000000000..cd92e9f21 --- /dev/null +++ b/res/drawable-xhdpi/ic_pageindicator_current_folder.png diff --git a/res/drawable-xhdpi/ic_pageindicator_default.png b/res/drawable-xhdpi/ic_pageindicator_default.png Binary files differindex 8eb5eb08d..38538dcf0 100644 --- a/res/drawable-xhdpi/ic_pageindicator_default.png +++ b/res/drawable-xhdpi/ic_pageindicator_default.png diff --git a/res/drawable-xhdpi/ic_pageindicator_default_folder.png b/res/drawable-xhdpi/ic_pageindicator_default_folder.png Binary files differnew file mode 100644 index 000000000..e7c46e3a1 --- /dev/null +++ b/res/drawable-xhdpi/ic_pageindicator_default_folder.png diff --git a/res/drawable-xhdpi/ic_remove_launcher.png b/res/drawable-xhdpi/ic_remove_launcher.png Binary files differnew file mode 100644 index 000000000..de058893a --- /dev/null +++ b/res/drawable-xhdpi/ic_remove_launcher.png diff --git a/res/drawable-xhdpi/ic_search_grey.png b/res/drawable-xhdpi/ic_search_grey.png Binary files differnew file mode 100755 index 000000000..bd5fdf444 --- /dev/null +++ b/res/drawable-xhdpi/ic_search_grey.png diff --git a/res/drawable-xhdpi/ic_uninstall_launcher.png b/res/drawable-xhdpi/ic_uninstall_launcher.png Binary files differnew file mode 100644 index 000000000..dd50e88c6 --- /dev/null +++ b/res/drawable-xhdpi/ic_uninstall_launcher.png diff --git a/res/drawable-xhdpi/ic_widget_resize_handle.png b/res/drawable-xhdpi/ic_widget_resize_handle.png Binary files differnew file mode 100644 index 000000000..f445a1c08 --- /dev/null +++ b/res/drawable-xhdpi/ic_widget_resize_handle.png diff --git a/res/drawable-xhdpi/on_boarding_welcome.png b/res/drawable-xhdpi/on_boarding_welcome.png Binary files differdeleted file mode 100644 index 8c101e0db..000000000 --- a/res/drawable-xhdpi/on_boarding_welcome.png +++ /dev/null diff --git a/res/drawable-xhdpi/overscroll_glow_left.9.png b/res/drawable-xhdpi/overscroll_glow_left.9.png Binary files differdeleted file mode 100644 index 4f248f70b..000000000 --- a/res/drawable-xhdpi/overscroll_glow_left.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/overscroll_glow_right.9.png b/res/drawable-xhdpi/overscroll_glow_right.9.png Binary files differdeleted file mode 100644 index 818a70db8..000000000 --- a/res/drawable-xhdpi/overscroll_glow_right.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/paged_view_indicator.9.png b/res/drawable-xhdpi/paged_view_indicator.9.png Binary files differdeleted file mode 100644 index fb8a22820..000000000 --- a/res/drawable-xhdpi/paged_view_indicator.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/portal_container_holo.9.png b/res/drawable-xhdpi/portal_container_holo.9.png Binary files differdeleted file mode 100644 index cedbdc401..000000000 --- a/res/drawable-xhdpi/portal_container_holo.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/portal_ring_inner.png b/res/drawable-xhdpi/portal_ring_inner.png Binary files differnew file mode 100644 index 000000000..7b6a8a04e --- /dev/null +++ b/res/drawable-xhdpi/portal_ring_inner.png diff --git a/res/drawable-xhdpi/portal_ring_inner_holo.png b/res/drawable-xhdpi/portal_ring_inner_holo.png Binary files differdeleted file mode 100644 index f9acfa284..000000000 --- a/res/drawable-xhdpi/portal_ring_inner_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/portal_ring_inner_nolip.png b/res/drawable-xhdpi/portal_ring_inner_nolip.png Binary files differnew file mode 100644 index 000000000..4b84436ee --- /dev/null +++ b/res/drawable-xhdpi/portal_ring_inner_nolip.png diff --git a/res/drawable-xhdpi/portal_ring_inner_nolip_holo.png b/res/drawable-xhdpi/portal_ring_inner_nolip_holo.png Binary files differdeleted file mode 100644 index eb2cf5f8b..000000000 --- a/res/drawable-xhdpi/portal_ring_inner_nolip_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/portal_ring_outer.png b/res/drawable-xhdpi/portal_ring_outer.png Binary files differnew file mode 100644 index 000000000..79c188873 --- /dev/null +++ b/res/drawable-xhdpi/portal_ring_outer.png diff --git a/res/drawable-xhdpi/portal_ring_outer_holo.png b/res/drawable-xhdpi/portal_ring_outer_holo.png Binary files differdeleted file mode 100644 index f32051dcf..000000000 --- a/res/drawable-xhdpi/portal_ring_outer_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/portal_ring_rest.png b/res/drawable-xhdpi/portal_ring_rest.png Binary files differindex ff0369a26..544a74f9f 100644 --- a/res/drawable-xhdpi/portal_ring_rest.png +++ b/res/drawable-xhdpi/portal_ring_rest.png diff --git a/res/drawable-xhdpi/quantum_panel.9.png b/res/drawable-xhdpi/quantum_panel.9.png Binary files differdeleted file mode 100644 index 1797ad500..000000000 --- a/res/drawable-xhdpi/quantum_panel.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/quantum_panel_bitmap.9.png b/res/drawable-xhdpi/quantum_panel_bitmap.9.png Binary files differnew file mode 100644 index 000000000..13bdf09ec --- /dev/null +++ b/res/drawable-xhdpi/quantum_panel_bitmap.9.png diff --git a/res/drawable-xhdpi/quantum_panel_dark.9.png b/res/drawable-xhdpi/quantum_panel_dark.9.png Binary files differdeleted file mode 100644 index 4c1868b55..000000000 --- a/res/drawable-xhdpi/quantum_panel_dark.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/quantum_panel_dark_bitmap.9.png b/res/drawable-xhdpi/quantum_panel_dark_bitmap.9.png Binary files differnew file mode 100644 index 000000000..ac2e423f2 --- /dev/null +++ b/res/drawable-xhdpi/quantum_panel_dark_bitmap.9.png diff --git a/res/drawable-xhdpi/widget_resize_frame.9.png b/res/drawable-xhdpi/widget_resize_frame.9.png Binary files differnew file mode 100644 index 000000000..bf7cc6b82 --- /dev/null +++ b/res/drawable-xhdpi/widget_resize_frame.9.png diff --git a/res/drawable-xhdpi/widget_resize_frame_holo.9.png b/res/drawable-xhdpi/widget_resize_frame_holo.9.png Binary files differdeleted file mode 100644 index 76cec606d..000000000 --- a/res/drawable-xhdpi/widget_resize_frame_holo.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/widget_resize_handle_bottom.png b/res/drawable-xhdpi/widget_resize_handle_bottom.png Binary files differdeleted file mode 100644 index 19437d7dc..000000000 --- a/res/drawable-xhdpi/widget_resize_handle_bottom.png +++ /dev/null diff --git a/res/drawable-xhdpi/widget_resize_handle_left.png b/res/drawable-xhdpi/widget_resize_handle_left.png Binary files differdeleted file mode 100644 index 28c5487ec..000000000 --- a/res/drawable-xhdpi/widget_resize_handle_left.png +++ /dev/null diff --git a/res/drawable-xhdpi/widget_resize_handle_right.png b/res/drawable-xhdpi/widget_resize_handle_right.png Binary files differdeleted file mode 100644 index 4f672a602..000000000 --- a/res/drawable-xhdpi/widget_resize_handle_right.png +++ /dev/null diff --git a/res/drawable-xhdpi/widget_resize_handle_top.png b/res/drawable-xhdpi/widget_resize_handle_top.png Binary files differdeleted file mode 100644 index e866c008c..000000000 --- a/res/drawable-xhdpi/widget_resize_handle_top.png +++ /dev/null diff --git a/res/drawable-xhdpi/widget_resize_shadow.9.png b/res/drawable-xhdpi/widget_resize_shadow.9.png Binary files differnew file mode 100644 index 000000000..96dee7f01 --- /dev/null +++ b/res/drawable-xhdpi/widget_resize_shadow.9.png |