resolved conflicts for 12688552 to ub-launcher3-master

Browse Source

Change-Id: Iaf97c5ae486e19cd3ad320ed88346571252d878a

...

This commit is contained in:

Winson 2015-09-09 17:11:29 -07:00

parent 1c3dc4cf4d 1268855200

commit b9cc38031c

203 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

res/drawable-hdpi/cling_bg.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 1023 B

BIN

res/drawable-hdpi/ic_all_apps_bg_hand.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 27 KiB After Width:  |  Height:  |  Size: 11 KiB

BIN

res/drawable-hdpi/ic_all_apps_bg_icon_1.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.6 KiB After Width:  |  Height:  |  Size: 2.5 KiB

BIN

res/drawable-hdpi/ic_all_apps_bg_icon_2.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 KiB After Width:  |  Height:  |  Size: 2.7 KiB

BIN

res/drawable-hdpi/ic_all_apps_bg_icon_3.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.5 KiB After Width:  |  Height:  |  Size: 3.3 KiB

BIN

res/drawable-hdpi/ic_all_apps_bg_icon_4.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.0 KiB After Width:  |  Height:  |  Size: 2.6 KiB

BIN

res/drawable-hdpi/ic_allapps.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.7 KiB After Width:  |  Height:  |  Size: 2.9 KiB

BIN

res/drawable-hdpi/ic_allapps_pressed.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.8 KiB After Width:  |  Height:  |  Size: 3.2 KiB

BIN

res/drawable-hdpi/ic_arrow_back_grey.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 152 B After Width:  |  Height:  |  Size: 149 B

BIN

res/drawable-hdpi/ic_info_launcher.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 1.3 KiB

BIN

res/drawable-hdpi/ic_pageindicator_add.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 945 B After Width:  |  Height:  |  Size: 390 B

BIN

res/drawable-hdpi/ic_pageindicator_current.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 468 B

BIN

res/drawable-hdpi/ic_pageindicator_current_folder.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 610 B After Width:  |  Height:  |  Size: 210 B

BIN

res/drawable-hdpi/ic_pageindicator_default.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 895 B After Width:  |  Height:  |  Size: 390 B

BIN

res/drawable-hdpi/ic_pageindicator_default_folder.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 529 B After Width:  |  Height:  |  Size: 189 B

BIN

res/drawable-hdpi/ic_remove_launcher.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 832 B

BIN

res/drawable-hdpi/ic_search_grey.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 419 B After Width:  |  Height:  |  Size: 414 B

BIN

res/drawable-hdpi/ic_setting.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.2 KiB After Width:  |  Height:  |  Size: 1.2 KiB

BIN

res/drawable-hdpi/ic_setting_pressed.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB

BIN

res/drawable-hdpi/ic_uninstall_launcher.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 552 B

BIN

res/drawable-hdpi/ic_wallpaper.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.0 KiB After Width:  |  Height:  |  Size: 1.0 KiB

BIN

res/drawable-hdpi/ic_wallpaper_pressed.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 979 B

BIN

res/drawable-hdpi/ic_widget.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 800 B

BIN

res/drawable-hdpi/ic_widget_pressed.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 766 B

BIN

res/drawable-hdpi/ic_widget_resize_handle.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 576 B

BIN

res/drawable-hdpi/page_hover_left.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 184 B After Width:  |  Height:  |  Size: 102 B

BIN

res/drawable-hdpi/page_hover_left_active.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 183 B After Width:  |  Height:  |  Size: 102 B

BIN

res/drawable-hdpi/page_hover_right.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 174 B After Width:  |  Height:  |  Size: 100 B

BIN

res/drawable-hdpi/page_hover_right_active.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 174 B After Width:  |  Height:  |  Size: 100 B

BIN

res/drawable-hdpi/portal_ring_inner.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.3 KiB After Width:  |  Height:  |  Size: 2.3 KiB

BIN

res/drawable-hdpi/portal_ring_inner_nolip.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.0 KiB After Width:  |  Height:  |  Size: 2.2 KiB

BIN

res/drawable-hdpi/portal_ring_outer.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.7 KiB After Width:  |  Height:  |  Size: 5.8 KiB

BIN

res/drawable-hdpi/portal_ring_rest.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 1.5 KiB

BIN

res/drawable-hdpi/quantum_panel_bitmap.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 608 B After Width:  |  Height:  |  Size: 397 B

BIN

res/drawable-hdpi/quantum_panel_dark_bitmap.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 629 B After Width:  |  Height:  |  Size: 501 B

BIN

res/drawable-hdpi/screenpanel.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 218 B After Width:  |  Height:  |  Size: 132 B

BIN

res/drawable-hdpi/screenpanel_hover.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 218 B After Width:  |  Height:  |  Size: 133 B

BIN

res/drawable-hdpi/virtual_preload.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.0 KiB After Width:  |  Height:  |  Size: 2.3 KiB

BIN

res/drawable-hdpi/virtual_preload_folder.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 1.2 KiB

BIN

res/drawable-hdpi/widget_resize_frame.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 405 B After Width:  |  Height:  |  Size: 187 B

BIN

res/drawable-hdpi/widget_resize_shadow.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 527 B After Width:  |  Height:  |  Size: 256 B

BIN

res/drawable-hdpi/widget_tile.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 545 B After Width:  |  Height:  |  Size: 135 B

BIN

res/drawable-hdpi/workspace_bg.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 226 B After Width:  |  Height:  |  Size: 159 B

BIN

res/drawable-land-hdpi/workspace_bg.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 222 B After Width:  |  Height:  |  Size: 153 B

BIN

res/drawable-land-mdpi/workspace_bg.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 201 B After Width:  |  Height:  |  Size: 140 B

BIN

res/drawable-land-xhdpi/workspace_bg.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 235 B After Width:  |  Height:  |  Size: 162 B

BIN

res/drawable-land-xxhdpi/workspace_bg.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 166 B

BIN

res/drawable-mdpi/cling_bg.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 987 B After Width:  |  Height:  |  Size: 750 B

BIN

res/drawable-mdpi/ic_all_apps_bg_hand.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 6.8 KiB

BIN

res/drawable-mdpi/ic_all_apps_bg_icon_1.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 1.5 KiB

BIN

res/drawable-mdpi/ic_all_apps_bg_icon_2.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.5 KiB After Width:  |  Height:  |  Size: 1.9 KiB

BIN

res/drawable-mdpi/ic_all_apps_bg_icon_3.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 2.3 KiB

BIN

res/drawable-mdpi/ic_all_apps_bg_icon_4.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.6 KiB After Width:  |  Height:  |  Size: 1.9 KiB

BIN

res/drawable-mdpi/ic_allapps.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 1.5 KiB

BIN

res/drawable-mdpi/ic_allapps_pressed.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 KiB After Width:  |  Height:  |  Size: 2.0 KiB

BIN

res/drawable-mdpi/ic_arrow_back_grey.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 117 B After Width:  |  Height:  |  Size: 116 B

BIN

res/drawable-mdpi/ic_info_launcher.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 689 B

BIN

res/drawable-mdpi/ic_pageindicator_add.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 669 B After Width:  |  Height:  |  Size: 236 B

BIN

res/drawable-mdpi/ic_pageindicator_current.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 704 B After Width:  |  Height:  |  Size: 277 B

BIN

res/drawable-mdpi/ic_pageindicator_current_folder.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 484 B After Width:  |  Height:  |  Size: 160 B

BIN

res/drawable-mdpi/ic_pageindicator_default.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 694 B After Width:  |  Height:  |  Size: 254 B

BIN

res/drawable-mdpi/ic_pageindicator_default_folder.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 482 B After Width:  |  Height:  |  Size: 148 B

BIN

res/drawable-mdpi/ic_remove_launcher.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 473 B

BIN

res/drawable-mdpi/ic_setting.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 849 B

BIN

res/drawable-mdpi/ic_setting_pressed.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 838 B

BIN

res/drawable-mdpi/ic_uninstall_launcher.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 932 B After Width:  |  Height:  |  Size: 378 B

BIN

res/drawable-mdpi/ic_wallpaper.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 782 B

BIN

res/drawable-mdpi/ic_wallpaper_pressed.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 772 B

BIN

res/drawable-mdpi/ic_widget.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 605 B

BIN

res/drawable-mdpi/ic_widget_pressed.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 624 B

BIN

res/drawable-mdpi/ic_widget_resize_handle.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 896 B After Width:  |  Height:  |  Size: 358 B

BIN

res/drawable-mdpi/page_hover_left.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 172 B After Width:  |  Height:  |  Size: 99 B

BIN

res/drawable-mdpi/page_hover_left_active.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 169 B After Width:  |  Height:  |  Size: 99 B

BIN

res/drawable-mdpi/page_hover_right.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 162 B After Width:  |  Height:  |  Size: 97 B

BIN

res/drawable-mdpi/page_hover_right_active.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 162 B After Width:  |  Height:  |  Size: 98 B

BIN

res/drawable-mdpi/portal_ring_inner.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.6 KiB After Width:  |  Height:  |  Size: 1.4 KiB

BIN

res/drawable-mdpi/portal_ring_inner_nolip.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.5 KiB After Width:  |  Height:  |  Size: 1.3 KiB

BIN

res/drawable-mdpi/portal_ring_outer.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 3.1 KiB

BIN

res/drawable-mdpi/portal_ring_rest.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 871 B

BIN

res/drawable-mdpi/quantum_panel_bitmap.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 436 B After Width:  |  Height:  |  Size: 286 B

BIN

res/drawable-mdpi/quantum_panel_dark_bitmap.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 445 B After Width:  |  Height:  |  Size: 333 B

BIN

res/drawable-mdpi/screenpanel.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 222 B After Width:  |  Height:  |  Size: 131 B

BIN

res/drawable-mdpi/screenpanel_hover.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 220 B After Width:  |  Height:  |  Size: 131 B

BIN

res/drawable-mdpi/virtual_preload.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 1.6 KiB

BIN

res/drawable-mdpi/virtual_preload_folder.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 847 B

BIN

res/drawable-mdpi/widget_resize_frame.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 304 B After Width:  |  Height:  |  Size: 156 B

BIN

res/drawable-mdpi/widget_resize_shadow.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 367 B After Width:  |  Height:  |  Size: 206 B

BIN

res/drawable-mdpi/widget_tile.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 405 B After Width:  |  Height:  |  Size: 110 B

BIN

res/drawable-mdpi/workspace_bg.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 213 B After Width:  |  Height:  |  Size: 155 B

BIN

res/drawable-nodpi/ic_migration.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 203 KiB After Width:  |  Height:  |  Size: 72 KiB

BIN

res/drawable-sw720dp-hdpi/workspace_bg.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 226 B After Width:  |  Height:  |  Size: 159 B

BIN

res/drawable-sw720dp-mdpi/workspace_bg.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 213 B After Width:  |  Height:  |  Size: 155 B

BIN

res/drawable-sw720dp-xhdpi/workspace_bg.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 255 B After Width:  |  Height:  |  Size: 180 B

BIN

res/drawable-sw720dp-xxhdpi/workspace_bg.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 174 B

BIN

res/drawable-xhdpi/cling_bg.9.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 1.4 KiB

BIN

res/drawable-xhdpi/ic_all_apps_bg_hand.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 39 KiB After Width:  |  Height:  |  Size: 16 KiB

BIN

res/drawable-xhdpi/ic_all_apps_bg_icon_1.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.0 KiB After Width:  |  Height:  |  Size: 3.5 KiB

BIN

res/drawable-xhdpi/ic_all_apps_bg_icon_2.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.4 KiB After Width:  |  Height:  |  Size: 3.4 KiB

BIN

res/drawable-xhdpi/ic_all_apps_bg_icon_3.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 8.0 KiB After Width:  |  Height:  |  Size: 4.4 KiB

BIN

res/drawable-xhdpi/ic_all_apps_bg_icon_4.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.5 KiB After Width:  |  Height:  |  Size: 3.2 KiB

Some files were not shown because too many files have changed in this diff Show More