From e612775922ec9f8cc4e5cb976bc62b3312a3de0e Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Tue, 21 Jul 2015 17:01:26 -0700 Subject: resolved conflicts for merge of 13ef17a3 to mnc-dr-dev b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b --- res/drawable-mdpi/apps_customize_bg.png | Bin 69 -> 0 bytes res/drawable-mdpi/bg_appwidget_error.9.png | Bin 794 -> 0 bytes res/drawable-mdpi/home_press.9.png | Bin 129 -> 0 bytes res/drawable-mdpi/ic_arrow_back_grey.png | Bin 0 -> 151 bytes res/drawable-mdpi/ic_home_all_apps_holo_dark.png | Bin 889 -> 0 bytes res/drawable-mdpi/ic_info_launcher.png | Bin 0 -> 1603 bytes res/drawable-mdpi/ic_launcher_clear_active_holo.png | Bin 949 -> 0 bytes res/drawable-mdpi/ic_launcher_clear_normal_holo.png | Bin 802 -> 0 bytes res/drawable-mdpi/ic_launcher_info_active_holo.png | Bin 2736 -> 0 bytes res/drawable-mdpi/ic_launcher_info_normal_holo.png | Bin 1518 -> 0 bytes res/drawable-mdpi/ic_launcher_market_holo.png | Bin 1124 -> 0 bytes .../ic_launcher_trashcan_active_holo.png | Bin 1783 -> 0 bytes .../ic_launcher_trashcan_normal_holo.png | Bin 1109 -> 0 bytes res/drawable-mdpi/ic_pageindicator_current.png | Bin 704 -> 704 bytes res/drawable-mdpi/ic_pageindicator_current_folder.png | Bin 0 -> 484 bytes res/drawable-mdpi/ic_pageindicator_default.png | Bin 694 -> 694 bytes res/drawable-mdpi/ic_pageindicator_default_folder.png | Bin 0 -> 482 bytes res/drawable-mdpi/ic_remove_launcher.png | Bin 0 -> 1087 bytes res/drawable-mdpi/ic_search_grey.png | Bin 0 -> 497 bytes res/drawable-mdpi/ic_setting_icn.png | Bin 1718 -> 0 bytes res/drawable-mdpi/ic_uninstall_launcher.png | Bin 0 -> 932 bytes res/drawable-mdpi/ic_widget_resize_handle.png | Bin 0 -> 896 bytes res/drawable-mdpi/on_boarding_welcome.png | Bin 15325 -> 0 bytes res/drawable-mdpi/overscroll_glow_left.9.png | Bin 552 -> 0 bytes res/drawable-mdpi/overscroll_glow_right.9.png | Bin 525 -> 0 bytes res/drawable-mdpi/paged_view_indicator.9.png | Bin 264 -> 0 bytes res/drawable-mdpi/portal_container_holo.9.png | Bin 843 -> 0 bytes res/drawable-mdpi/portal_ring_inner.png | Bin 0 -> 2641 bytes res/drawable-mdpi/portal_ring_inner_holo.png | Bin 2779 -> 0 bytes res/drawable-mdpi/portal_ring_inner_nolip.png | Bin 0 -> 2545 bytes res/drawable-mdpi/portal_ring_inner_nolip_holo.png | Bin 2632 -> 0 bytes res/drawable-mdpi/portal_ring_outer.png | Bin 0 -> 4704 bytes res/drawable-mdpi/portal_ring_outer_holo.png | Bin 4798 -> 0 bytes res/drawable-mdpi/portal_ring_rest.png | Bin 1633 -> 1675 bytes res/drawable-mdpi/quantum_panel.9.png | Bin 476 -> 0 bytes res/drawable-mdpi/quantum_panel_bitmap.9.png | Bin 0 -> 436 bytes res/drawable-mdpi/quantum_panel_dark.9.png | Bin 449 -> 0 bytes res/drawable-mdpi/quantum_panel_dark_bitmap.9.png | Bin 0 -> 445 bytes res/drawable-mdpi/widget_resize_frame.9.png | Bin 0 -> 304 bytes res/drawable-mdpi/widget_resize_frame_holo.9.png | Bin 619 -> 0 bytes res/drawable-mdpi/widget_resize_handle_bottom.png | Bin 745 -> 0 bytes res/drawable-mdpi/widget_resize_handle_left.png | Bin 762 -> 0 bytes res/drawable-mdpi/widget_resize_handle_right.png | Bin 772 -> 0 bytes res/drawable-mdpi/widget_resize_handle_top.png | Bin 750 -> 0 bytes res/drawable-mdpi/widget_resize_shadow.9.png | Bin 0 -> 367 bytes 45 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 res/drawable-mdpi/apps_customize_bg.png delete mode 100644 res/drawable-mdpi/bg_appwidget_error.9.png delete mode 100644 res/drawable-mdpi/home_press.9.png create mode 100755 res/drawable-mdpi/ic_arrow_back_grey.png delete mode 100644 res/drawable-mdpi/ic_home_all_apps_holo_dark.png create mode 100644 res/drawable-mdpi/ic_info_launcher.png delete mode 100644 res/drawable-mdpi/ic_launcher_clear_active_holo.png delete mode 100644 res/drawable-mdpi/ic_launcher_clear_normal_holo.png delete mode 100644 res/drawable-mdpi/ic_launcher_info_active_holo.png delete mode 100644 res/drawable-mdpi/ic_launcher_info_normal_holo.png delete mode 100644 res/drawable-mdpi/ic_launcher_market_holo.png delete mode 100644 res/drawable-mdpi/ic_launcher_trashcan_active_holo.png delete mode 100644 res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png create mode 100644 res/drawable-mdpi/ic_pageindicator_current_folder.png create mode 100644 res/drawable-mdpi/ic_pageindicator_default_folder.png create mode 100644 res/drawable-mdpi/ic_remove_launcher.png create mode 100755 res/drawable-mdpi/ic_search_grey.png delete mode 100644 res/drawable-mdpi/ic_setting_icn.png create mode 100644 res/drawable-mdpi/ic_uninstall_launcher.png create mode 100644 res/drawable-mdpi/ic_widget_resize_handle.png delete mode 100644 res/drawable-mdpi/on_boarding_welcome.png delete mode 100644 res/drawable-mdpi/overscroll_glow_left.9.png delete mode 100644 res/drawable-mdpi/overscroll_glow_right.9.png delete mode 100644 res/drawable-mdpi/paged_view_indicator.9.png delete mode 100644 res/drawable-mdpi/portal_container_holo.9.png create mode 100644 res/drawable-mdpi/portal_ring_inner.png delete mode 100644 res/drawable-mdpi/portal_ring_inner_holo.png create mode 100644 res/drawable-mdpi/portal_ring_inner_nolip.png delete mode 100644 res/drawable-mdpi/portal_ring_inner_nolip_holo.png create mode 100644 res/drawable-mdpi/portal_ring_outer.png delete mode 100644 res/drawable-mdpi/portal_ring_outer_holo.png delete mode 100644 res/drawable-mdpi/quantum_panel.9.png create mode 100644 res/drawable-mdpi/quantum_panel_bitmap.9.png delete mode 100644 res/drawable-mdpi/quantum_panel_dark.9.png create mode 100644 res/drawable-mdpi/quantum_panel_dark_bitmap.9.png create mode 100644 res/drawable-mdpi/widget_resize_frame.9.png delete mode 100644 res/drawable-mdpi/widget_resize_frame_holo.9.png delete mode 100644 res/drawable-mdpi/widget_resize_handle_bottom.png delete mode 100644 res/drawable-mdpi/widget_resize_handle_left.png delete mode 100644 res/drawable-mdpi/widget_resize_handle_right.png delete mode 100644 res/drawable-mdpi/widget_resize_handle_top.png create mode 100644 res/drawable-mdpi/widget_resize_shadow.9.png (limited to 'res/drawable-mdpi') diff --git a/res/drawable-mdpi/apps_customize_bg.png b/res/drawable-mdpi/apps_customize_bg.png deleted file mode 100644 index 284746796..000000000 Binary files a/res/drawable-mdpi/apps_customize_bg.png and /dev/null differ diff --git a/res/drawable-mdpi/bg_appwidget_error.9.png b/res/drawable-mdpi/bg_appwidget_error.9.png deleted file mode 100644 index 493c0d454..000000000 Binary files a/res/drawable-mdpi/bg_appwidget_error.9.png and /dev/null differ diff --git a/res/drawable-mdpi/home_press.9.png b/res/drawable-mdpi/home_press.9.png deleted file mode 100644 index 679a1f626..000000000 Binary files a/res/drawable-mdpi/home_press.9.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_arrow_back_grey.png b/res/drawable-mdpi/ic_arrow_back_grey.png new file mode 100755 index 000000000..11996efe3 Binary files /dev/null and b/res/drawable-mdpi/ic_arrow_back_grey.png differ diff --git a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png b/res/drawable-mdpi/ic_home_all_apps_holo_dark.png deleted file mode 100644 index 84fa5947d..000000000 Binary files a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_info_launcher.png b/res/drawable-mdpi/ic_info_launcher.png new file mode 100644 index 000000000..c72d0c2a9 Binary files /dev/null and b/res/drawable-mdpi/ic_info_launcher.png differ diff --git a/res/drawable-mdpi/ic_launcher_clear_active_holo.png b/res/drawable-mdpi/ic_launcher_clear_active_holo.png deleted file mode 100644 index 2683beaa3..000000000 Binary files a/res/drawable-mdpi/ic_launcher_clear_active_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher_clear_normal_holo.png b/res/drawable-mdpi/ic_launcher_clear_normal_holo.png deleted file mode 100644 index 219f3e5cf..000000000 Binary files a/res/drawable-mdpi/ic_launcher_clear_normal_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher_info_active_holo.png b/res/drawable-mdpi/ic_launcher_info_active_holo.png deleted file mode 100644 index f84b4a6ba..000000000 Binary files a/res/drawable-mdpi/ic_launcher_info_active_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher_info_normal_holo.png b/res/drawable-mdpi/ic_launcher_info_normal_holo.png deleted file mode 100644 index eac578f5c..000000000 Binary files a/res/drawable-mdpi/ic_launcher_info_normal_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher_market_holo.png b/res/drawable-mdpi/ic_launcher_market_holo.png deleted file mode 100644 index cacb37484..000000000 Binary files a/res/drawable-mdpi/ic_launcher_market_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png deleted file mode 100644 index 0350e558d..000000000 Binary files a/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png deleted file mode 100644 index 799b62f8b..000000000 Binary files a/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_pageindicator_current.png b/res/drawable-mdpi/ic_pageindicator_current.png index b41e1bb67..ca889c4d1 100644 Binary files a/res/drawable-mdpi/ic_pageindicator_current.png and b/res/drawable-mdpi/ic_pageindicator_current.png differ diff --git a/res/drawable-mdpi/ic_pageindicator_current_folder.png b/res/drawable-mdpi/ic_pageindicator_current_folder.png new file mode 100644 index 000000000..5bbba9140 Binary files /dev/null and b/res/drawable-mdpi/ic_pageindicator_current_folder.png differ diff --git a/res/drawable-mdpi/ic_pageindicator_default.png b/res/drawable-mdpi/ic_pageindicator_default.png index e36c25cf1..34493b155 100644 Binary files a/res/drawable-mdpi/ic_pageindicator_default.png and b/res/drawable-mdpi/ic_pageindicator_default.png differ diff --git a/res/drawable-mdpi/ic_pageindicator_default_folder.png b/res/drawable-mdpi/ic_pageindicator_default_folder.png new file mode 100644 index 000000000..0a987a4d0 Binary files /dev/null and b/res/drawable-mdpi/ic_pageindicator_default_folder.png differ diff --git a/res/drawable-mdpi/ic_remove_launcher.png b/res/drawable-mdpi/ic_remove_launcher.png new file mode 100644 index 000000000..4a2c3197e Binary files /dev/null and b/res/drawable-mdpi/ic_remove_launcher.png differ diff --git a/res/drawable-mdpi/ic_search_grey.png b/res/drawable-mdpi/ic_search_grey.png new file mode 100755 index 000000000..e83891c11 Binary files /dev/null and b/res/drawable-mdpi/ic_search_grey.png differ diff --git a/res/drawable-mdpi/ic_setting_icn.png b/res/drawable-mdpi/ic_setting_icn.png deleted file mode 100644 index 5c32c54da..000000000 Binary files a/res/drawable-mdpi/ic_setting_icn.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_uninstall_launcher.png b/res/drawable-mdpi/ic_uninstall_launcher.png new file mode 100644 index 000000000..af456690c Binary files /dev/null and b/res/drawable-mdpi/ic_uninstall_launcher.png differ diff --git a/res/drawable-mdpi/ic_widget_resize_handle.png b/res/drawable-mdpi/ic_widget_resize_handle.png new file mode 100644 index 000000000..c3b287ff0 Binary files /dev/null and b/res/drawable-mdpi/ic_widget_resize_handle.png differ diff --git a/res/drawable-mdpi/on_boarding_welcome.png b/res/drawable-mdpi/on_boarding_welcome.png deleted file mode 100644 index 1d12e8362..000000000 Binary files a/res/drawable-mdpi/on_boarding_welcome.png and /dev/null differ diff --git a/res/drawable-mdpi/overscroll_glow_left.9.png b/res/drawable-mdpi/overscroll_glow_left.9.png deleted file mode 100644 index b79cdcdc2..000000000 Binary files a/res/drawable-mdpi/overscroll_glow_left.9.png and /dev/null differ diff --git a/res/drawable-mdpi/overscroll_glow_right.9.png b/res/drawable-mdpi/overscroll_glow_right.9.png deleted file mode 100644 index 1321303e1..000000000 Binary files a/res/drawable-mdpi/overscroll_glow_right.9.png and /dev/null differ diff --git a/res/drawable-mdpi/paged_view_indicator.9.png b/res/drawable-mdpi/paged_view_indicator.9.png deleted file mode 100644 index 647b60f37..000000000 Binary files a/res/drawable-mdpi/paged_view_indicator.9.png and /dev/null differ diff --git a/res/drawable-mdpi/portal_container_holo.9.png b/res/drawable-mdpi/portal_container_holo.9.png deleted file mode 100644 index 1e4afae76..000000000 Binary files a/res/drawable-mdpi/portal_container_holo.9.png and /dev/null differ diff --git a/res/drawable-mdpi/portal_ring_inner.png b/res/drawable-mdpi/portal_ring_inner.png new file mode 100644 index 000000000..99aaa60a9 Binary files /dev/null and b/res/drawable-mdpi/portal_ring_inner.png differ diff --git a/res/drawable-mdpi/portal_ring_inner_holo.png b/res/drawable-mdpi/portal_ring_inner_holo.png deleted file mode 100644 index 72e0af8f8..000000000 Binary files a/res/drawable-mdpi/portal_ring_inner_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/portal_ring_inner_nolip.png b/res/drawable-mdpi/portal_ring_inner_nolip.png new file mode 100644 index 000000000..f981778f5 Binary files /dev/null and b/res/drawable-mdpi/portal_ring_inner_nolip.png differ diff --git a/res/drawable-mdpi/portal_ring_inner_nolip_holo.png b/res/drawable-mdpi/portal_ring_inner_nolip_holo.png deleted file mode 100644 index 483f0ebec..000000000 Binary files a/res/drawable-mdpi/portal_ring_inner_nolip_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/portal_ring_outer.png b/res/drawable-mdpi/portal_ring_outer.png new file mode 100644 index 000000000..c98f64b76 Binary files /dev/null and b/res/drawable-mdpi/portal_ring_outer.png differ diff --git a/res/drawable-mdpi/portal_ring_outer_holo.png b/res/drawable-mdpi/portal_ring_outer_holo.png deleted file mode 100644 index e9b35f3f3..000000000 Binary files a/res/drawable-mdpi/portal_ring_outer_holo.png and /dev/null differ diff --git a/res/drawable-mdpi/portal_ring_rest.png b/res/drawable-mdpi/portal_ring_rest.png index d0a976e55..5c33b424d 100644 Binary files a/res/drawable-mdpi/portal_ring_rest.png and b/res/drawable-mdpi/portal_ring_rest.png differ diff --git a/res/drawable-mdpi/quantum_panel.9.png b/res/drawable-mdpi/quantum_panel.9.png deleted file mode 100644 index c5a6eb735..000000000 Binary files a/res/drawable-mdpi/quantum_panel.9.png and /dev/null differ diff --git a/res/drawable-mdpi/quantum_panel_bitmap.9.png b/res/drawable-mdpi/quantum_panel_bitmap.9.png new file mode 100644 index 000000000..86be568fd Binary files /dev/null and b/res/drawable-mdpi/quantum_panel_bitmap.9.png differ diff --git a/res/drawable-mdpi/quantum_panel_dark.9.png b/res/drawable-mdpi/quantum_panel_dark.9.png deleted file mode 100644 index 7728a7268..000000000 Binary files a/res/drawable-mdpi/quantum_panel_dark.9.png and /dev/null differ diff --git a/res/drawable-mdpi/quantum_panel_dark_bitmap.9.png b/res/drawable-mdpi/quantum_panel_dark_bitmap.9.png new file mode 100644 index 000000000..70429b9fc Binary files /dev/null and b/res/drawable-mdpi/quantum_panel_dark_bitmap.9.png differ diff --git a/res/drawable-mdpi/widget_resize_frame.9.png b/res/drawable-mdpi/widget_resize_frame.9.png new file mode 100644 index 000000000..856cec619 Binary files /dev/null and b/res/drawable-mdpi/widget_resize_frame.9.png differ diff --git a/res/drawable-mdpi/widget_resize_frame_holo.9.png b/res/drawable-mdpi/widget_resize_frame_holo.9.png deleted file mode 100644 index 028bd6248..000000000 Binary files a/res/drawable-mdpi/widget_resize_frame_holo.9.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_resize_handle_bottom.png b/res/drawable-mdpi/widget_resize_handle_bottom.png deleted file mode 100644 index c838bf405..000000000 Binary files a/res/drawable-mdpi/widget_resize_handle_bottom.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_resize_handle_left.png b/res/drawable-mdpi/widget_resize_handle_left.png deleted file mode 100644 index ff0b0d357..000000000 Binary files a/res/drawable-mdpi/widget_resize_handle_left.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_resize_handle_right.png b/res/drawable-mdpi/widget_resize_handle_right.png deleted file mode 100644 index fc4808e3a..000000000 Binary files a/res/drawable-mdpi/widget_resize_handle_right.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_resize_handle_top.png b/res/drawable-mdpi/widget_resize_handle_top.png deleted file mode 100644 index 3b1df0170..000000000 Binary files a/res/drawable-mdpi/widget_resize_handle_top.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_resize_shadow.9.png b/res/drawable-mdpi/widget_resize_shadow.9.png new file mode 100644 index 000000000..02522f344 Binary files /dev/null and b/res/drawable-mdpi/widget_resize_shadow.9.png differ -- cgit v1.2.3