am 2e8ba1c1: am 8ff6cb60: DO NOT MERGE

Browse Source

* commit '2e8ba1c14793563701449c4ddf58b77ac3c36ea8':
  DO NOT MERGE

...

This commit is contained in:

Michael Jurka

2011-05-13 15:45:48 -07:00

committed by Android Git Automerger

parent 2168c07678 2e8ba1c147

commit 328acffd8b

143 changed files with 3 additions and 1 deletions

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

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

res/drawable-xlarge-hdpi/app_market_generic.png → res/drawable-large-hdpi/app_market_generic.png

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

res/drawable-xlarge-hdpi/divider_launcher_holo.9.png → res/drawable-large-hdpi/divider_launcher_holo.9.png

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

res/drawable-xlarge-hdpi/home_press.9.png → res/drawable-large-hdpi/home_press.9.png

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

res/drawable-xlarge-hdpi/homescreen_large_blue.9.png → res/drawable-large-hdpi/homescreen_large_blue.9.png

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

res/drawable-xlarge-hdpi/homescreen_large_blue_strong.9.png → res/drawable-large-hdpi/homescreen_large_blue_strong.9.png

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

res/drawable-xlarge-hdpi/homescreen_large_green.9.png → res/drawable-large-hdpi/homescreen_large_green.9.png

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

res/drawable-xlarge-hdpi/homescreen_large_green_strong.9.png → res/drawable-large-hdpi/homescreen_large_green_strong.9.png

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

res/drawable-xlarge-hdpi/homescreen_small_blue.9.png → res/drawable-large-hdpi/homescreen_small_blue.9.png

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

res/drawable-xlarge-hdpi/homescreen_small_blue_strong.9.png → res/drawable-large-hdpi/homescreen_small_blue_strong.9.png

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

res/drawable-xlarge-hdpi/homescreen_small_green.9.png → res/drawable-large-hdpi/homescreen_small_green.9.png

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

res/drawable-xlarge-hdpi/homescreen_small_green_strong.9.png → res/drawable-large-hdpi/homescreen_small_green_strong.9.png

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

res/drawable-xlarge-hdpi/ic_generic_search.png → res/drawable-large-hdpi/ic_generic_search.png

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

res/drawable-xlarge-hdpi/ic_home_all_apps_holo_dark.png → res/drawable-large-hdpi/ic_home_all_apps_holo_dark.png

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

res/drawable-xlarge-hdpi/ic_home_delete_holo_dark.png → res/drawable-large-hdpi/ic_home_delete_holo_dark.png

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

res/drawable-xlarge-hdpi/ic_home_delete_hover_holo_dark.png → res/drawable-large-hdpi/ic_home_delete_hover_holo_dark.png

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

res/drawable-xlarge-hdpi/ic_home_info_holo_dark.png → res/drawable-large-hdpi/ic_home_info_holo_dark.png

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

res/drawable-xlarge-hdpi/ic_no_applications.png → res/drawable-large-hdpi/ic_no_applications.png

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

res/drawable-xlarge-hdpi/ic_voice_search.png → res/drawable-large-hdpi/ic_voice_search.png

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

res/drawable-xlarge-hdpi/tab_selected_focused_holo.9.png → res/drawable-large-hdpi/tab_selected_focused_holo.9.png

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

res/drawable-xlarge-hdpi/tab_selected_holo.9.png → res/drawable-large-hdpi/tab_selected_holo.9.png

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

res/drawable-xlarge-hdpi/tab_selected_pressed_focused_holo.9.png → res/drawable-large-hdpi/tab_selected_pressed_focused_holo.9.png

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

res/drawable-xlarge-hdpi/tab_selected_pressed_holo.9.png → res/drawable-large-hdpi/tab_selected_pressed_holo.9.png

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

res/drawable-xlarge-hdpi/widget_resize_frame_holo.9.png → res/drawable-large-hdpi/widget_resize_frame_holo.9.png

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

res/drawable-xlarge-hdpi/widget_resize_handle_bottom.png → res/drawable-large-hdpi/widget_resize_handle_bottom.png

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

res/drawable-xlarge-hdpi/widget_resize_handle_left.png → res/drawable-large-hdpi/widget_resize_handle_left.png

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

res/drawable-xlarge-hdpi/widget_resize_handle_right.png → res/drawable-large-hdpi/widget_resize_handle_right.png

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

res/drawable-xlarge-hdpi/widget_resize_handle_top.png → res/drawable-large-hdpi/widget_resize_handle_top.png

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

res/drawable-xlarge-mdpi/app_market_generic.png → res/drawable-large-mdpi/app_market_generic.png

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

res/drawable-xlarge-mdpi/divider_launcher_holo.9.png → res/drawable-large-mdpi/divider_launcher_holo.9.png

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

res/drawable-xlarge-mdpi/home_press.9.png → res/drawable-large-mdpi/home_press.9.png

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

res/drawable-xlarge-mdpi/homescreen_large_blue.9.png → res/drawable-large-mdpi/homescreen_large_blue.9.png

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

res/drawable-xlarge-mdpi/homescreen_large_green.9.png → res/drawable-large-mdpi/homescreen_large_green.9.png

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

res/drawable-xlarge-mdpi/homescreen_large_green_strong.9.png → res/drawable-large-mdpi/homescreen_large_green_strong.9.png

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

res/drawable-xlarge-mdpi/homescreen_small_blue.9.png → res/drawable-large-mdpi/homescreen_small_blue.9.png

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

res/drawable-xlarge-mdpi/homescreen_small_blue_strong.9.png → res/drawable-large-mdpi/homescreen_small_blue_strong.9.png

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

res/drawable-xlarge-mdpi/homescreen_small_green.9.png → res/drawable-large-mdpi/homescreen_small_green.9.png

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

res/drawable-xlarge-mdpi/homescreen_small_green_strong.9.png → res/drawable-large-mdpi/homescreen_small_green_strong.9.png

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

res/drawable-xlarge-mdpi/ic_generic_search.png → res/drawable-large-mdpi/ic_generic_search.png

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

res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png → res/drawable-large-mdpi/ic_home_add_holo_dark.png

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

res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png → res/drawable-large-mdpi/ic_home_all_apps_holo_dark.png

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

res/drawable-xlarge-mdpi/ic_home_delete_holo_dark.png → res/drawable-large-mdpi/ic_home_delete_holo_dark.png

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

res/drawable-xlarge-mdpi/ic_home_delete_hover_holo_dark.png → res/drawable-large-mdpi/ic_home_delete_hover_holo_dark.png

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

res/drawable-xlarge-mdpi/ic_home_info_holo_dark.png → res/drawable-large-mdpi/ic_home_info_holo_dark.png

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

res/drawable-xlarge-mdpi/ic_no_applications.png → res/drawable-large-mdpi/ic_no_applications.png

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

res/drawable-xlarge-mdpi/ic_voice_search.png → res/drawable-large-mdpi/ic_voice_search.png

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

res/drawable-xlarge-mdpi/tab_selected_focused_holo.9.png → res/drawable-large-mdpi/tab_selected_focused_holo.9.png

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

res/drawable-xlarge-mdpi/tab_selected_holo.9.png → res/drawable-large-mdpi/tab_selected_holo.9.png

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

res/drawable-xlarge-mdpi/tab_selected_pressed_focused_holo.9.png → res/drawable-large-mdpi/tab_selected_pressed_focused_holo.9.png

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

res/drawable-xlarge-mdpi/tab_selected_pressed_holo.9.png → res/drawable-large-mdpi/tab_selected_pressed_holo.9.png

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

res/drawable-xlarge-mdpi/widget_resize_frame_holo.9.png → res/drawable-large-mdpi/widget_resize_frame_holo.9.png

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

res/drawable-xlarge-mdpi/widget_resize_handle_bottom.png → res/drawable-large-mdpi/widget_resize_handle_bottom.png

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

res/drawable-xlarge-mdpi/widget_resize_handle_left.png → res/drawable-large-mdpi/widget_resize_handle_left.png

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

res/drawable-xlarge-mdpi/widget_resize_handle_right.png → res/drawable-large-mdpi/widget_resize_handle_right.png

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

res/drawable-xlarge-mdpi/widget_resize_handle_top.png → res/drawable-large-mdpi/widget_resize_handle_top.png

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

res/drawable-xlarge-nodpi/all_apps_bg_gradient.9.png → res/drawable-large-nodpi/all_apps_bg_gradient.9.png

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

res/drawable-xlarge-nodpi/bluecrystal.jpg → res/drawable-large-nodpi/bluecrystal.jpg

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

res/drawable-xlarge-nodpi/bluecrystal_small.jpg → res/drawable-large-nodpi/bluecrystal_small.jpg

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

res/drawable-xlarge-nodpi/bluelinebots.jpg → res/drawable-large-nodpi/bluelinebots.jpg

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

res/drawable-xlarge-nodpi/bluelinebots_small.jpg → res/drawable-large-nodpi/bluelinebots_small.jpg

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

res/drawable-xlarge-nodpi/bots.jpg → res/drawable-large-nodpi/bots.jpg

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

res/drawable-xlarge-nodpi/bots_small.jpg → res/drawable-large-nodpi/bots_small.jpg

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

res/drawable-xlarge-nodpi/bucky.jpg → res/drawable-large-nodpi/bucky.jpg

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

res/drawable-xlarge-nodpi/bucky_small.jpg → res/drawable-large-nodpi/bucky_small.jpg

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

res/drawable-xlarge-nodpi/city.jpg → res/drawable-large-nodpi/city.jpg

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

res/drawable-xlarge-nodpi/city_small.jpg → res/drawable-large-nodpi/city_small.jpg

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

res/drawable-xlarge-nodpi/customize_bg_gradient.png → res/drawable-large-nodpi/customize_bg_gradient.png

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

res/drawable-xlarge-nodpi/flowerbot.jpg → res/drawable-large-nodpi/flowerbot.jpg

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

res/drawable-xlarge-nodpi/flowerbot_small.jpg → res/drawable-large-nodpi/flowerbot_small.jpg

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

res/drawable-xlarge-nodpi/glowy_hex.jpg → res/drawable-large-nodpi/glowy_hex.jpg

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

res/drawable-xlarge-nodpi/glowy_hex_small.jpg → res/drawable-large-nodpi/glowy_hex_small.jpg

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

res/drawable-xlarge-nodpi/lotus.jpg → res/drawable-large-nodpi/lotus.jpg

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

res/drawable-xlarge-nodpi/lotus_small.jpg → res/drawable-large-nodpi/lotus_small.jpg

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

res/drawable-xlarge-nodpi/village.jpg → res/drawable-large-nodpi/village.jpg

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

res/drawable-xlarge-nodpi/village_small.jpg → res/drawable-large-nodpi/village_small.jpg

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

res/drawable-xlarge/button_bg.xml → res/drawable-large/button_bg.xml

res/drawable-xlarge/delete_zone_selector.xml → res/drawable-large/delete_zone_selector.xml

res/layout-xlarge-land/application.xml → res/layout-large-land/application.xml

res/layout-xlarge-land/workspace_screen.xml → res/layout-large-land/workspace_screen.xml

res/layout-xlarge-port/application.xml → res/layout-large-port/application.xml

res/layout-xlarge-port/tab_widget_indicator.xml → res/layout-large-port/tab_widget_indicator.xml

res/layout-xlarge-port/workspace_screen.xml → res/layout-large-port/workspace_screen.xml

res/layout-xlarge/all_apps_no_items_placeholder.xml → res/layout-large/all_apps_no_items_placeholder.xml

res/layout-xlarge/all_apps_paged_view_application.xml → res/layout-large/all_apps_paged_view_application.xml

res/layout-xlarge/all_apps_tabbed.xml → res/layout-large/all_apps_tabbed.xml

res/layout-xlarge/button_bar.xml → res/layout-large/button_bar.xml

res/layout-xlarge/customization_drawer.xml → res/layout-large/customization_drawer.xml

res/layout-xlarge/customize_paged_view_item.xml → res/layout-large/customize_paged_view_item.xml

res/layout-xlarge/customize_paged_view_wallpaper.xml → res/layout-large/customize_paged_view_wallpaper.xml

res/layout-xlarge/customize_paged_view_widget.xml → res/layout-large/customize_paged_view_widget.xml

res/layout-xlarge/external_widget_drop_list_item.xml → res/layout-large/external_widget_drop_list_item.xml

res/layout-xlarge/launcher.xml → res/layout-large/launcher.xml

res/layout-xlarge/tab_widget_indicator.xml → res/layout-large/tab_widget_indicator.xml

res/layout-xlarge/wallpaper_chooser.xml → res/layout-large/wallpaper_chooser.xml

res/layout-xlarge/wallpaper_chooser_base.xml → res/layout-large/wallpaper_chooser_base.xml

res/layout-xlarge/wallpaper_item.xml → res/layout-large/wallpaper_item.xml

res/values-ar-xlarge/strings.xml → res/values-ar-large/strings.xml

res/values-bg-xlarge/strings.xml → res/values-bg-large/strings.xml

res/values-ca-xlarge/strings.xml → res/values-ca-large/strings.xml

res/values-cs-xlarge/strings.xml → res/values-cs-large/strings.xml

res/values-da-xlarge/strings.xml → res/values-da-large/strings.xml

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