diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-21 17:01:26 -0700 |
---|---|---|
committer | Ed Heyl <edheyl@google.com> | 2015-07-22 11:31:04 -0700 |
commit | e612775922ec9f8cc4e5cb976bc62b3312a3de0e (patch) | |
tree | 96beaf07307486f6491f022da63ebe381765d1a8 /res/drawable-xxhdpi | |
parent | a83129f0bc778fd1ccd799bd8cfa40270f632e1d (diff) | |
download | android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.gz android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.bz2 android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.zip |
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
b/22609402
Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
Diffstat (limited to 'res/drawable-xxhdpi')
48 files changed, 0 insertions, 0 deletions
diff --git a/res/drawable-xxhdpi/apps_customize_bg.png b/res/drawable-xxhdpi/apps_customize_bg.png Binary files differdeleted file mode 100644 index a51cc112b..000000000 --- a/res/drawable-xxhdpi/apps_customize_bg.png +++ /dev/null diff --git a/res/drawable-xxhdpi/arrow_dashed.png b/res/drawable-xxhdpi/arrow_dashed.png Binary files differdeleted file mode 100644 index b64f4d0fe..000000000 --- a/res/drawable-xxhdpi/arrow_dashed.png +++ /dev/null diff --git a/res/drawable-xxhdpi/default_widget_preview_holo.9.png b/res/drawable-xxhdpi/default_widget_preview_holo.9.png Binary files differdeleted file mode 100644 index 0f62097a8..000000000 --- a/res/drawable-xxhdpi/default_widget_preview_holo.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/hotseat_bg_panel.9.png b/res/drawable-xxhdpi/hotseat_bg_panel.9.png Binary files differdeleted file mode 100644 index 40fc076ff..000000000 --- a/res/drawable-xxhdpi/hotseat_bg_panel.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/hotseat_scrubber_holo.9.png b/res/drawable-xxhdpi/hotseat_scrubber_holo.9.png Binary files differdeleted file mode 100644 index 8a77536be..000000000 --- a/res/drawable-xxhdpi/hotseat_scrubber_holo.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/hotseat_track_holo.9.png b/res/drawable-xxhdpi/hotseat_track_holo.9.png Binary files differdeleted file mode 100644 index dd2216fb7..000000000 --- a/res/drawable-xxhdpi/hotseat_track_holo.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_arrow_back_grey.png b/res/drawable-xxhdpi/ic_arrow_back_grey.png Binary files differnew file mode 100755 index 000000000..8e42e091d --- /dev/null +++ b/res/drawable-xxhdpi/ic_arrow_back_grey.png diff --git a/res/drawable-xxhdpi/ic_home_all_apps_holo_dark.png b/res/drawable-xxhdpi/ic_home_all_apps_holo_dark.png Binary files differdeleted file mode 100644 index 0b8e88c16..000000000 --- a/res/drawable-xxhdpi/ic_home_all_apps_holo_dark.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_home_google_logo_normal_holo.png b/res/drawable-xxhdpi/ic_home_google_logo_normal_holo.png Binary files differdeleted file mode 100644 index a47b2ba99..000000000 --- a/res/drawable-xxhdpi/ic_home_google_logo_normal_holo.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_home_google_logo_pressed_holo.png b/res/drawable-xxhdpi/ic_home_google_logo_pressed_holo.png Binary files differdeleted file mode 100644 index 75625d120..000000000 --- a/res/drawable-xxhdpi/ic_home_google_logo_pressed_holo.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_home_search_pressed_holo.png b/res/drawable-xxhdpi/ic_home_search_pressed_holo.png Binary files differdeleted file mode 100644 index 800d99430..000000000 --- a/res/drawable-xxhdpi/ic_home_search_pressed_holo.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_home_voice_search_pressed_holo.png b/res/drawable-xxhdpi/ic_home_voice_search_pressed_holo.png Binary files differdeleted file mode 100644 index 27a589782..000000000 --- a/res/drawable-xxhdpi/ic_home_voice_search_pressed_holo.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_info_launcher.png b/res/drawable-xxhdpi/ic_info_launcher.png Binary files differnew file mode 100644 index 000000000..386d09147 --- /dev/null +++ b/res/drawable-xxhdpi/ic_info_launcher.png diff --git a/res/drawable-xxhdpi/ic_launcher_clear_active_holo.png b/res/drawable-xxhdpi/ic_launcher_clear_active_holo.png Binary files differdeleted file mode 100644 index 95cf84115..000000000 --- a/res/drawable-xxhdpi/ic_launcher_clear_active_holo.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_launcher_clear_normal_holo.png b/res/drawable-xxhdpi/ic_launcher_clear_normal_holo.png Binary files differdeleted file mode 100644 index b0f5a2702..000000000 --- a/res/drawable-xxhdpi/ic_launcher_clear_normal_holo.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_launcher_info_active_holo.png b/res/drawable-xxhdpi/ic_launcher_info_active_holo.png Binary files differdeleted file mode 100644 index 57f332a94..000000000 --- a/res/drawable-xxhdpi/ic_launcher_info_active_holo.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_launcher_info_normal_holo.png b/res/drawable-xxhdpi/ic_launcher_info_normal_holo.png Binary files differdeleted file mode 100644 index 94f0955d6..000000000 --- a/res/drawable-xxhdpi/ic_launcher_info_normal_holo.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-xxhdpi/ic_launcher_trashcan_active_holo.png Binary files differdeleted file mode 100644 index 3bb098c2b..000000000 --- a/res/drawable-xxhdpi/ic_launcher_trashcan_active_holo.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-xxhdpi/ic_launcher_trashcan_normal_holo.png Binary files differdeleted file mode 100644 index 550cc5bb8..000000000 --- a/res/drawable-xxhdpi/ic_launcher_trashcan_normal_holo.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_pageindicator_current.png b/res/drawable-xxhdpi/ic_pageindicator_current.png Binary files differindex 22b290e69..5941c8e4f 100644 --- a/res/drawable-xxhdpi/ic_pageindicator_current.png +++ b/res/drawable-xxhdpi/ic_pageindicator_current.png diff --git a/res/drawable-xxhdpi/ic_pageindicator_current_folder.png b/res/drawable-xxhdpi/ic_pageindicator_current_folder.png Binary files differnew file mode 100644 index 000000000..602b89a40 --- /dev/null +++ b/res/drawable-xxhdpi/ic_pageindicator_current_folder.png diff --git a/res/drawable-xxhdpi/ic_pageindicator_default.png b/res/drawable-xxhdpi/ic_pageindicator_default.png Binary files differindex e608cae30..3fa9e5fd7 100644 --- a/res/drawable-xxhdpi/ic_pageindicator_default.png +++ b/res/drawable-xxhdpi/ic_pageindicator_default.png diff --git a/res/drawable-xxhdpi/ic_pageindicator_default_folder.png b/res/drawable-xxhdpi/ic_pageindicator_default_folder.png Binary files differnew file mode 100644 index 000000000..bbcd7f91e --- /dev/null +++ b/res/drawable-xxhdpi/ic_pageindicator_default_folder.png diff --git a/res/drawable-xxhdpi/ic_qs_remote_display.png b/res/drawable-xxhdpi/ic_qs_remote_display.png Binary files differdeleted file mode 100644 index 25ea9fab2..000000000 --- a/res/drawable-xxhdpi/ic_qs_remote_display.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_qs_remote_display_connected.png b/res/drawable-xxhdpi/ic_qs_remote_display_connected.png Binary files differdeleted file mode 100644 index 33a8d2d5a..000000000 --- a/res/drawable-xxhdpi/ic_qs_remote_display_connected.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_remove_launcher.png b/res/drawable-xxhdpi/ic_remove_launcher.png Binary files differnew file mode 100644 index 000000000..7c28bb0bb --- /dev/null +++ b/res/drawable-xxhdpi/ic_remove_launcher.png diff --git a/res/drawable-xxhdpi/ic_search_grey.png b/res/drawable-xxhdpi/ic_search_grey.png Binary files differnew file mode 100755 index 000000000..1d5c91361 --- /dev/null +++ b/res/drawable-xxhdpi/ic_search_grey.png diff --git a/res/drawable-xxhdpi/ic_uninstall_launcher.png b/res/drawable-xxhdpi/ic_uninstall_launcher.png Binary files differnew file mode 100644 index 000000000..872e82933 --- /dev/null +++ b/res/drawable-xxhdpi/ic_uninstall_launcher.png diff --git a/res/drawable-xxhdpi/ic_widget_resize_handle.png b/res/drawable-xxhdpi/ic_widget_resize_handle.png Binary files differnew file mode 100644 index 000000000..144cac996 --- /dev/null +++ b/res/drawable-xxhdpi/ic_widget_resize_handle.png diff --git a/res/drawable-xxhdpi/overscroll_glow_left.9.png b/res/drawable-xxhdpi/overscroll_glow_left.9.png Binary files differdeleted file mode 100644 index 1a895cdc8..000000000 --- a/res/drawable-xxhdpi/overscroll_glow_left.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/overscroll_glow_right.9.png b/res/drawable-xxhdpi/overscroll_glow_right.9.png Binary files differdeleted file mode 100644 index 576676145..000000000 --- a/res/drawable-xxhdpi/overscroll_glow_right.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/portal_container_holo.9.png b/res/drawable-xxhdpi/portal_container_holo.9.png Binary files differdeleted file mode 100644 index 599a076d8..000000000 --- a/res/drawable-xxhdpi/portal_container_holo.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/portal_ring_inner.png b/res/drawable-xxhdpi/portal_ring_inner.png Binary files differnew file mode 100644 index 000000000..d088a172d --- /dev/null +++ b/res/drawable-xxhdpi/portal_ring_inner.png diff --git a/res/drawable-xxhdpi/portal_ring_inner_holo.png b/res/drawable-xxhdpi/portal_ring_inner_holo.png Binary files differdeleted file mode 100644 index 8cd6a5930..000000000 --- a/res/drawable-xxhdpi/portal_ring_inner_holo.png +++ /dev/null diff --git a/res/drawable-xxhdpi/portal_ring_inner_nolip_holo.png b/res/drawable-xxhdpi/portal_ring_inner_nolip.png Binary files differindex 0fad65629..0fad65629 100644 --- a/res/drawable-xxhdpi/portal_ring_inner_nolip_holo.png +++ b/res/drawable-xxhdpi/portal_ring_inner_nolip.png diff --git a/res/drawable-xxhdpi/portal_ring_outer.png b/res/drawable-xxhdpi/portal_ring_outer.png Binary files differnew file mode 100644 index 000000000..45ac0406c --- /dev/null +++ b/res/drawable-xxhdpi/portal_ring_outer.png diff --git a/res/drawable-xxhdpi/portal_ring_outer_holo.png b/res/drawable-xxhdpi/portal_ring_outer_holo.png Binary files differdeleted file mode 100644 index 0aee4f027..000000000 --- a/res/drawable-xxhdpi/portal_ring_outer_holo.png +++ /dev/null diff --git a/res/drawable-xxhdpi/quantum_panel.9.png b/res/drawable-xxhdpi/quantum_panel.9.png Binary files differdeleted file mode 100644 index d7ba87416..000000000 --- a/res/drawable-xxhdpi/quantum_panel.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/quantum_panel_bitmap.9.png b/res/drawable-xxhdpi/quantum_panel_bitmap.9.png Binary files differnew file mode 100644 index 000000000..b44269ea9 --- /dev/null +++ b/res/drawable-xxhdpi/quantum_panel_bitmap.9.png diff --git a/res/drawable-xxhdpi/quantum_panel_dark.9.png b/res/drawable-xxhdpi/quantum_panel_dark.9.png Binary files differdeleted file mode 100644 index 17ba0f116..000000000 --- a/res/drawable-xxhdpi/quantum_panel_dark.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/quantum_panel_dark_bitmap.9.png b/res/drawable-xxhdpi/quantum_panel_dark_bitmap.9.png Binary files differnew file mode 100644 index 000000000..7979cf747 --- /dev/null +++ b/res/drawable-xxhdpi/quantum_panel_dark_bitmap.9.png diff --git a/res/drawable-xxhdpi/widget_resize_frame.9.png b/res/drawable-xxhdpi/widget_resize_frame.9.png Binary files differnew file mode 100644 index 000000000..7e189d442 --- /dev/null +++ b/res/drawable-xxhdpi/widget_resize_frame.9.png diff --git a/res/drawable-xxhdpi/widget_resize_frame_holo.9.png b/res/drawable-xxhdpi/widget_resize_frame_holo.9.png Binary files differdeleted file mode 100644 index 1681387a1..000000000 --- a/res/drawable-xxhdpi/widget_resize_frame_holo.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/widget_resize_handle_bottom.png b/res/drawable-xxhdpi/widget_resize_handle_bottom.png Binary files differdeleted file mode 100644 index d549fcd91..000000000 --- a/res/drawable-xxhdpi/widget_resize_handle_bottom.png +++ /dev/null diff --git a/res/drawable-xxhdpi/widget_resize_handle_left.png b/res/drawable-xxhdpi/widget_resize_handle_left.png Binary files differdeleted file mode 100644 index dd56dad15..000000000 --- a/res/drawable-xxhdpi/widget_resize_handle_left.png +++ /dev/null diff --git a/res/drawable-xxhdpi/widget_resize_handle_right.png b/res/drawable-xxhdpi/widget_resize_handle_right.png Binary files differdeleted file mode 100644 index 296a1c166..000000000 --- a/res/drawable-xxhdpi/widget_resize_handle_right.png +++ /dev/null diff --git a/res/drawable-xxhdpi/widget_resize_handle_top.png b/res/drawable-xxhdpi/widget_resize_handle_top.png Binary files differdeleted file mode 100644 index e86270ad1..000000000 --- a/res/drawable-xxhdpi/widget_resize_handle_top.png +++ /dev/null diff --git a/res/drawable-xxhdpi/widget_resize_shadow.9.png b/res/drawable-xxhdpi/widget_resize_shadow.9.png Binary files differnew file mode 100644 index 000000000..41c448bbb --- /dev/null +++ b/res/drawable-xxhdpi/widget_resize_shadow.9.png |