diff options
-rw-r--r-- | res/drawable-large-hdpi/app_market_generic.png (renamed from res/drawable-xlarge-hdpi/app_market_generic.png) | bin | 924 -> 924 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/divider_launcher_holo.9.png (renamed from res/drawable-xlarge-hdpi/divider_launcher_holo.9.png) | bin | 199 -> 199 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/homescreen_large_blue.9.png (renamed from res/drawable-xlarge-hdpi/homescreen_large_blue.9.png) | bin | 895 -> 895 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/homescreen_large_blue_strong.9.png (renamed from res/drawable-xlarge-hdpi/homescreen_large_blue_strong.9.png) | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/homescreen_large_green.9.png (renamed from res/drawable-xlarge-hdpi/homescreen_large_green.9.png) | bin | 877 -> 877 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/homescreen_large_green_strong.9.png (renamed from res/drawable-xlarge-hdpi/homescreen_large_green_strong.9.png) | bin | 2036 -> 2036 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/homescreen_small_blue.9.png (renamed from res/drawable-xlarge-hdpi/homescreen_small_blue.9.png) | bin | 4578 -> 4578 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/homescreen_small_blue_strong.9.png (renamed from res/drawable-xlarge-hdpi/homescreen_small_blue_strong.9.png) | bin | 3075 -> 3075 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/homescreen_small_green.9.png (renamed from res/drawable-xlarge-hdpi/homescreen_small_green.9.png) | bin | 2578 -> 2578 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/homescreen_small_green_strong.9.png (renamed from res/drawable-xlarge-hdpi/homescreen_small_green_strong.9.png) | bin | 3263 -> 3263 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/ic_generic_search.png (renamed from res/drawable-xlarge-hdpi/ic_generic_search.png) | bin | 6099 -> 6099 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/ic_home_all_apps_holo_dark.png (renamed from res/drawable-xlarge-hdpi/ic_home_all_apps_holo_dark.png) | bin | 1676 -> 1676 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/ic_home_info_holo_dark.png (renamed from res/drawable-xlarge-hdpi/ic_home_info_holo_dark.png) | bin | 5984 -> 5984 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/ic_no_applications.png (renamed from res/drawable-xlarge-hdpi/ic_no_applications.png) | bin | 7774 -> 7774 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/ic_voice_search.png (renamed from res/drawable-xlarge-hdpi/ic_voice_search.png) | bin | 4969 -> 4969 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/tab_selected_focused_holo.9.png (renamed from res/drawable-xlarge-hdpi/tab_selected_focused_holo.9.png) | bin | 218 -> 218 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/tab_selected_holo.9.png (renamed from res/drawable-xlarge-hdpi/tab_selected_holo.9.png) | bin | 159 -> 159 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/tab_selected_pressed_focused_holo.9.png (renamed from res/drawable-xlarge-hdpi/tab_selected_pressed_focused_holo.9.png) | bin | 522 -> 522 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/tab_selected_pressed_holo.9.png (renamed from res/drawable-xlarge-hdpi/tab_selected_pressed_holo.9.png) | bin | 271 -> 271 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/widget_resize_frame_holo.9.png (renamed from res/drawable-xlarge-hdpi/widget_resize_frame_holo.9.png) | bin | 3433 -> 3433 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/widget_resize_handle_bottom.png (renamed from res/drawable-xlarge-hdpi/widget_resize_handle_bottom.png) | bin | 783 -> 783 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/widget_resize_handle_left.png (renamed from res/drawable-xlarge-hdpi/widget_resize_handle_left.png) | bin | 796 -> 796 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/widget_resize_handle_right.png (renamed from res/drawable-xlarge-hdpi/widget_resize_handle_right.png) | bin | 798 -> 798 bytes | |||
-rw-r--r-- | res/drawable-large-hdpi/widget_resize_handle_top.png (renamed from res/drawable-xlarge-hdpi/widget_resize_handle_top.png) | bin | 783 -> 783 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/app_market_generic.png (renamed from res/drawable-xlarge-mdpi/app_market_generic.png) | bin | 3441 -> 3441 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/divider_launcher_holo.9.png (renamed from res/drawable-xlarge-mdpi/divider_launcher_holo.9.png) | bin | 1078 -> 1078 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/homescreen_large_blue.9.png (renamed from res/drawable-xlarge-mdpi/homescreen_large_blue.9.png) | bin | 647 -> 647 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/homescreen_large_green.9.png (renamed from res/drawable-xlarge-mdpi/homescreen_large_green.9.png) | bin | 645 -> 645 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/homescreen_large_green_strong.9.png (renamed from res/drawable-xlarge-mdpi/homescreen_large_green_strong.9.png) | bin | 1639 -> 1639 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/homescreen_small_blue.9.png (renamed from res/drawable-xlarge-mdpi/homescreen_small_blue.9.png) | bin | 3600 -> 3600 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/homescreen_small_blue_strong.9.png (renamed from res/drawable-xlarge-mdpi/homescreen_small_blue_strong.9.png) | bin | 2446 -> 2446 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/homescreen_small_green.9.png (renamed from res/drawable-xlarge-mdpi/homescreen_small_green.9.png) | bin | 1881 -> 1881 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/homescreen_small_green_strong.9.png (renamed from res/drawable-xlarge-mdpi/homescreen_small_green_strong.9.png) | bin | 2591 -> 2591 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/ic_generic_search.png (renamed from res/drawable-xlarge-mdpi/ic_generic_search.png) | bin | 4885 -> 4885 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/ic_home_add_holo_dark.png (renamed from res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png) | bin | 1919 -> 1919 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/ic_home_all_apps_holo_dark.png (renamed from res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png) | bin | 2478 -> 2478 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/ic_no_applications.png (renamed from res/drawable-xlarge-mdpi/ic_no_applications.png) | bin | 3190 -> 3190 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/ic_voice_search.png (renamed from res/drawable-xlarge-mdpi/ic_voice_search.png) | bin | 4171 -> 4171 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/tab_selected_focused_holo.9.png (renamed from res/drawable-xlarge-mdpi/tab_selected_focused_holo.9.png) | bin | 199 -> 199 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/tab_selected_holo.9.png (renamed from res/drawable-xlarge-mdpi/tab_selected_holo.9.png) | bin | 140 -> 140 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/tab_selected_pressed_focused_holo.9.png (renamed from res/drawable-xlarge-mdpi/tab_selected_pressed_focused_holo.9.png) | bin | 439 -> 439 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/tab_selected_pressed_holo.9.png (renamed from res/drawable-xlarge-mdpi/tab_selected_pressed_holo.9.png) | bin | 229 -> 229 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/widget_resize_frame_holo.9.png (renamed from res/drawable-xlarge-mdpi/widget_resize_frame_holo.9.png) | bin | 1834 -> 1834 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/widget_resize_handle_bottom.png (renamed from res/drawable-xlarge-mdpi/widget_resize_handle_bottom.png) | bin | 602 -> 602 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/widget_resize_handle_left.png (renamed from res/drawable-xlarge-mdpi/widget_resize_handle_left.png) | bin | 608 -> 608 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/widget_resize_handle_right.png (renamed from res/drawable-xlarge-mdpi/widget_resize_handle_right.png) | bin | 610 -> 610 bytes | |||
-rw-r--r-- | res/drawable-large-mdpi/widget_resize_handle_top.png (renamed from res/drawable-xlarge-mdpi/widget_resize_handle_top.png) | bin | 602 -> 602 bytes | |||
-rw-r--r-- | res/drawable-large-nodpi/all_apps_bg_gradient.9.png (renamed from res/drawable-xlarge-nodpi/all_apps_bg_gradient.9.png) | bin | 2946 -> 2946 bytes | |||
-rwxr-xr-x | res/drawable-large-nodpi/bluecrystal.jpg (renamed from res/drawable-xlarge-nodpi/bluecrystal.jpg) | bin | 224364 -> 224364 bytes | |||
-rwxr-xr-x | res/drawable-large-nodpi/bluecrystal_small.jpg (renamed from res/drawable-xlarge-nodpi/bluecrystal_small.jpg) | bin | 19166 -> 19166 bytes | |||
-rw-r--r-- | res/drawable-large-nodpi/bluelinebots.jpg (renamed from res/drawable-xlarge-nodpi/bluelinebots.jpg) | bin | 333447 -> 333447 bytes | |||
-rwxr-xr-x | res/drawable-large-nodpi/bluelinebots_small.jpg (renamed from res/drawable-xlarge-nodpi/bluelinebots_small.jpg) | bin | 6609 -> 6609 bytes | |||
-rwxr-xr-x | res/drawable-large-nodpi/bots.jpg (renamed from res/drawable-xlarge-nodpi/bots.jpg) | bin | 178190 -> 178190 bytes | |||
-rwxr-xr-x | res/drawable-large-nodpi/bots_small.jpg (renamed from res/drawable-xlarge-nodpi/bots_small.jpg) | bin | 9572 -> 9572 bytes | |||
-rwxr-xr-x | res/drawable-large-nodpi/bucky.jpg (renamed from res/drawable-xlarge-nodpi/bucky.jpg) | bin | 210049 -> 210049 bytes | |||
-rwxr-xr-x | res/drawable-large-nodpi/bucky_small.jpg (renamed from res/drawable-xlarge-nodpi/bucky_small.jpg) | bin | 10183 -> 10183 bytes | |||
-rw-r--r-- | res/drawable-large-nodpi/city.jpg (renamed from res/drawable-xlarge-nodpi/city.jpg) | bin | 518510 -> 518510 bytes | |||
-rw-r--r-- | res/drawable-large-nodpi/city_small.jpg (renamed from res/drawable-xlarge-nodpi/city_small.jpg) | bin | 6645 -> 6645 bytes | |||
-rw-r--r-- | res/drawable-large-nodpi/customize_bg_gradient.png (renamed from res/drawable-xlarge-nodpi/customize_bg_gradient.png) | bin | 33124 -> 33124 bytes | |||
-rw-r--r-- | res/drawable-large-nodpi/flowerbot.jpg (renamed from res/drawable-xlarge-nodpi/flowerbot.jpg) | bin | 67855 -> 67855 bytes | |||
-rw-r--r-- | res/drawable-large-nodpi/flowerbot_small.jpg (renamed from res/drawable-xlarge-nodpi/flowerbot_small.jpg) | bin | 17513 -> 17513 bytes | |||
-rw-r--r-- | res/drawable-large-nodpi/glowy_hex.jpg (renamed from res/drawable-xlarge-nodpi/glowy_hex.jpg) | bin | 382047 -> 382047 bytes | |||
-rw-r--r-- | res/drawable-large-nodpi/glowy_hex_small.jpg (renamed from res/drawable-xlarge-nodpi/glowy_hex_small.jpg) | bin | 6835 -> 6835 bytes | |||
-rw-r--r-- | res/drawable-large-nodpi/lotus.jpg (renamed from res/drawable-xlarge-nodpi/lotus.jpg) | bin | 570293 -> 570293 bytes | |||
-rw-r--r-- | res/drawable-large-nodpi/lotus_small.jpg (renamed from res/drawable-xlarge-nodpi/lotus_small.jpg) | bin | 41101 -> 41101 bytes | |||
-rw-r--r-- | res/drawable-large-nodpi/village.jpg (renamed from res/drawable-xlarge-nodpi/village.jpg) | bin | 802293 -> 802293 bytes | |||
-rw-r--r-- | res/drawable-large-nodpi/village_small.jpg (renamed from res/drawable-xlarge-nodpi/village_small.jpg) | bin | 13840 -> 13840 bytes | |||
-rw-r--r-- | res/drawable-large/delete_zone_selector.xml (renamed from res/drawable-xlarge/delete_zone_selector.xml) | 0 | ||||
-rw-r--r-- | res/layout-large-land/application.xml (renamed from res/layout-xlarge-land/application.xml) | 0 | ||||
-rw-r--r-- | res/layout-large-land/workspace_screen.xml (renamed from res/layout-xlarge-land/workspace_screen.xml) | 0 | ||||
-rw-r--r-- | res/layout-large-port/application.xml (renamed from res/layout-xlarge-port/application.xml) | 0 | ||||
-rw-r--r-- | res/layout-large-port/workspace_screen.xml (renamed from res/layout-xlarge-port/workspace_screen.xml) | 0 | ||||
-rw-r--r-- | res/layout-large/all_apps_no_items_placeholder.xml (renamed from res/layout-xlarge/all_apps_no_items_placeholder.xml) | 0 | ||||
-rw-r--r-- | res/layout-large/all_apps_paged_view_application.xml (renamed from res/layout-xlarge/all_apps_paged_view_application.xml) | 0 | ||||
-rw-r--r-- | res/layout-large/all_apps_tabbed.xml (renamed from res/layout-xlarge/all_apps_tabbed.xml) | 0 | ||||
-rw-r--r-- | res/layout-large/button_bar.xml (renamed from res/layout-xlarge/button_bar.xml) | 0 | ||||
-rw-r--r-- | res/layout-large/customization_drawer.xml (renamed from res/layout-xlarge/customization_drawer.xml) | 0 | ||||
-rw-r--r-- | res/layout-large/customize_paged_view_item.xml (renamed from res/layout-xlarge/customize_paged_view_item.xml) | 0 | ||||
-rw-r--r-- | res/layout-large/customize_paged_view_wallpaper.xml (renamed from res/layout-xlarge/customize_paged_view_wallpaper.xml) | 0 | ||||
-rw-r--r-- | res/layout-large/customize_paged_view_widget.xml (renamed from res/layout-xlarge/customize_paged_view_widget.xml) | 0 | ||||
-rw-r--r-- | res/layout-large/external_widget_drop_list_item.xml (renamed from res/layout-xlarge/external_widget_drop_list_item.xml) | 0 | ||||
-rw-r--r-- | res/layout-large/launcher.xml (renamed from res/layout-xlarge/launcher.xml) | 0 | ||||
-rw-r--r-- | res/layout-large/tab_widget_indicator.xml (renamed from res/layout-xlarge/tab_widget_indicator.xml) | 0 | ||||
-rw-r--r-- | res/layout-large/wallpaper_chooser.xml (renamed from res/layout-xlarge/wallpaper_chooser.xml) | 0 | ||||
-rw-r--r-- | res/layout-large/wallpaper_chooser_base.xml (renamed from res/layout-xlarge/wallpaper_chooser_base.xml) | 0 | ||||
-rw-r--r-- | res/layout-large/wallpaper_item.xml (renamed from res/layout-xlarge/wallpaper_item.xml) | 0 | ||||
-rw-r--r-- | res/values-ar-large/strings.xml (renamed from res/values-ar-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-bg-large/strings.xml (renamed from res/values-bg-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-ca-large/strings.xml (renamed from res/values-ca-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-cs-large/strings.xml (renamed from res/values-cs-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-da-large/strings.xml (renamed from res/values-da-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-de-large/strings.xml (renamed from res/values-de-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-el-large/strings.xml (renamed from res/values-el-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-en-rGB-large/strings.xml (renamed from res/values-en-rGB-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-es-large/strings.xml (renamed from res/values-es-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-es-rUS-large/strings.xml (renamed from res/values-es-rUS-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-fa-large/strings.xml (renamed from res/values-fa-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-fi-large/strings.xml (renamed from res/values-fi-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-fr-large/strings.xml (renamed from res/values-fr-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-hr-large/strings.xml (renamed from res/values-hr-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-hu-large/strings.xml (renamed from res/values-hu-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-in-large/strings.xml (renamed from res/values-in-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-it-large/strings.xml (renamed from res/values-it-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-iw-large/strings.xml (renamed from res/values-iw-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-ja-large/strings.xml (renamed from res/values-ja-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-ko-large/strings.xml (renamed from res/values-ko-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-large-land/dimens.xml (renamed from res/values-xlarge-land/dimens.xml) | 0 | ||||
-rw-r--r-- | res/values-large-port/dimens.xml (renamed from res/values-xlarge-port/dimens.xml) | 0 | ||||
-rw-r--r-- | res/values-large/config.xml (renamed from res/values-xlarge/config.xml) | 0 | ||||
-rw-r--r-- | res/values-large/dimens.xml (renamed from res/values-xlarge/dimens.xml) | 0 | ||||
-rw-r--r-- | res/values-large/strings.xml (renamed from res/values-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-large/styles.xml (renamed from res/values-xlarge/styles.xml) | 0 | ||||
-rw-r--r-- | res/values-large/wallpapers.xml (renamed from res/values-xlarge/wallpapers.xml) | 0 | ||||
-rw-r--r-- | res/values-lt-large/strings.xml (renamed from res/values-lt-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-lv-large/strings.xml (renamed from res/values-lv-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-nb-large/strings.xml (renamed from res/values-nb-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-nl-large/strings.xml (renamed from res/values-nl-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-pl-large/strings.xml (renamed from res/values-pl-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-pt-large/strings.xml (renamed from res/values-pt-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-pt-rPT-large/strings.xml (renamed from res/values-pt-rPT-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-ro-large/strings.xml (renamed from res/values-ro-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-ru-large/strings.xml (renamed from res/values-ru-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-sk-large/strings.xml (renamed from res/values-sk-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-sl-large/strings.xml (renamed from res/values-sl-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-sr-large/strings.xml (renamed from res/values-sr-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-sv-large/strings.xml (renamed from res/values-sv-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-th-large/strings.xml (renamed from res/values-th-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-tl-large/strings.xml (renamed from res/values-tl-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-tr-large/strings.xml (renamed from res/values-tr-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-uk-large/strings.xml (renamed from res/values-uk-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-vi-large/strings.xml (renamed from res/values-vi-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-zh-rCN-large/strings.xml (renamed from res/values-zh-rCN-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | res/values-zh-rTW-large/strings.xml (renamed from res/values-zh-rTW-xlarge/strings.xml) | 0 | ||||
-rw-r--r-- | src/com/android/launcher2/ApplicationInfoDropTarget.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher2/CellLayout.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher2/DeleteZone.java | 16 | ||||
-rw-r--r-- | src/com/android/launcher2/FocusHelper.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher2/IconCache.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher2/IconDropTarget.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 40 | ||||
-rw-r--r-- | src/com/android/launcher2/LauncherApplication.java | 12 | ||||
-rw-r--r-- | src/com/android/launcher2/PagedViewCellLayout.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher2/PagedViewExtendedLayout.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher2/PagedViewWidget.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher2/Utilities.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 16 |
147 files changed, 60 insertions, 58 deletions
diff --git a/res/drawable-xlarge-hdpi/app_market_generic.png b/res/drawable-large-hdpi/app_market_generic.png Binary files differindex 2a2381f3c..2a2381f3c 100644 --- a/res/drawable-xlarge-hdpi/app_market_generic.png +++ b/res/drawable-large-hdpi/app_market_generic.png diff --git a/res/drawable-xlarge-hdpi/divider_launcher_holo.9.png b/res/drawable-large-hdpi/divider_launcher_holo.9.png Binary files differindex 0a1bd2a26..0a1bd2a26 100644 --- a/res/drawable-xlarge-hdpi/divider_launcher_holo.9.png +++ b/res/drawable-large-hdpi/divider_launcher_holo.9.png diff --git a/res/drawable-xlarge-hdpi/homescreen_large_blue.9.png b/res/drawable-large-hdpi/homescreen_large_blue.9.png Binary files differindex 6ce3d29fb..6ce3d29fb 100644 --- a/res/drawable-xlarge-hdpi/homescreen_large_blue.9.png +++ b/res/drawable-large-hdpi/homescreen_large_blue.9.png diff --git a/res/drawable-xlarge-hdpi/homescreen_large_blue_strong.9.png b/res/drawable-large-hdpi/homescreen_large_blue_strong.9.png Binary files differindex 811014826..811014826 100644 --- a/res/drawable-xlarge-hdpi/homescreen_large_blue_strong.9.png +++ b/res/drawable-large-hdpi/homescreen_large_blue_strong.9.png diff --git a/res/drawable-xlarge-hdpi/homescreen_large_green.9.png b/res/drawable-large-hdpi/homescreen_large_green.9.png Binary files differindex 4a6546ee4..4a6546ee4 100644 --- a/res/drawable-xlarge-hdpi/homescreen_large_green.9.png +++ b/res/drawable-large-hdpi/homescreen_large_green.9.png diff --git a/res/drawable-xlarge-hdpi/homescreen_large_green_strong.9.png b/res/drawable-large-hdpi/homescreen_large_green_strong.9.png Binary files differindex 5ba9ebe79..5ba9ebe79 100644 --- a/res/drawable-xlarge-hdpi/homescreen_large_green_strong.9.png +++ b/res/drawable-large-hdpi/homescreen_large_green_strong.9.png diff --git a/res/drawable-xlarge-hdpi/homescreen_small_blue.9.png b/res/drawable-large-hdpi/homescreen_small_blue.9.png Binary files differindex db93b3ccd..db93b3ccd 100644 --- a/res/drawable-xlarge-hdpi/homescreen_small_blue.9.png +++ b/res/drawable-large-hdpi/homescreen_small_blue.9.png diff --git a/res/drawable-xlarge-hdpi/homescreen_small_blue_strong.9.png b/res/drawable-large-hdpi/homescreen_small_blue_strong.9.png Binary files differindex 32bd857d3..32bd857d3 100644 --- a/res/drawable-xlarge-hdpi/homescreen_small_blue_strong.9.png +++ b/res/drawable-large-hdpi/homescreen_small_blue_strong.9.png diff --git a/res/drawable-xlarge-hdpi/homescreen_small_green.9.png b/res/drawable-large-hdpi/homescreen_small_green.9.png Binary files differindex 00baae948..00baae948 100644 --- a/res/drawable-xlarge-hdpi/homescreen_small_green.9.png +++ b/res/drawable-large-hdpi/homescreen_small_green.9.png diff --git a/res/drawable-xlarge-hdpi/homescreen_small_green_strong.9.png b/res/drawable-large-hdpi/homescreen_small_green_strong.9.png Binary files differindex e1e64c57a..e1e64c57a 100644 --- a/res/drawable-xlarge-hdpi/homescreen_small_green_strong.9.png +++ b/res/drawable-large-hdpi/homescreen_small_green_strong.9.png diff --git a/res/drawable-xlarge-hdpi/ic_generic_search.png b/res/drawable-large-hdpi/ic_generic_search.png Binary files differindex 67bac5cc8..67bac5cc8 100644 --- a/res/drawable-xlarge-hdpi/ic_generic_search.png +++ b/res/drawable-large-hdpi/ic_generic_search.png diff --git a/res/drawable-xlarge-hdpi/ic_home_all_apps_holo_dark.png b/res/drawable-large-hdpi/ic_home_all_apps_holo_dark.png Binary files differindex 3c7930f10..3c7930f10 100644 --- a/res/drawable-xlarge-hdpi/ic_home_all_apps_holo_dark.png +++ b/res/drawable-large-hdpi/ic_home_all_apps_holo_dark.png diff --git a/res/drawable-xlarge-hdpi/ic_home_info_holo_dark.png b/res/drawable-large-hdpi/ic_home_info_holo_dark.png Binary files differindex 02df4e1cf..02df4e1cf 100644 --- a/res/drawable-xlarge-hdpi/ic_home_info_holo_dark.png +++ b/res/drawable-large-hdpi/ic_home_info_holo_dark.png diff --git a/res/drawable-xlarge-hdpi/ic_no_applications.png b/res/drawable-large-hdpi/ic_no_applications.png Binary files differindex 933d0911b..933d0911b 100644 --- a/res/drawable-xlarge-hdpi/ic_no_applications.png +++ b/res/drawable-large-hdpi/ic_no_applications.png diff --git a/res/drawable-xlarge-hdpi/ic_voice_search.png b/res/drawable-large-hdpi/ic_voice_search.png Binary files differindex 5d2f341ea..5d2f341ea 100644 --- a/res/drawable-xlarge-hdpi/ic_voice_search.png +++ b/res/drawable-large-hdpi/ic_voice_search.png diff --git a/res/drawable-xlarge-hdpi/tab_selected_focused_holo.9.png b/res/drawable-large-hdpi/tab_selected_focused_holo.9.png Binary files differindex 1ba35d554..1ba35d554 100644 --- a/res/drawable-xlarge-hdpi/tab_selected_focused_holo.9.png +++ b/res/drawable-large-hdpi/tab_selected_focused_holo.9.png diff --git a/res/drawable-xlarge-hdpi/tab_selected_holo.9.png b/res/drawable-large-hdpi/tab_selected_holo.9.png Binary files differindex ef913cc8e..ef913cc8e 100644 --- a/res/drawable-xlarge-hdpi/tab_selected_holo.9.png +++ b/res/drawable-large-hdpi/tab_selected_holo.9.png diff --git a/res/drawable-xlarge-hdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-large-hdpi/tab_selected_pressed_focused_holo.9.png Binary files differindex d7e968806..d7e968806 100644 --- a/res/drawable-xlarge-hdpi/tab_selected_pressed_focused_holo.9.png +++ b/res/drawable-large-hdpi/tab_selected_pressed_focused_holo.9.png diff --git a/res/drawable-xlarge-hdpi/tab_selected_pressed_holo.9.png b/res/drawable-large-hdpi/tab_selected_pressed_holo.9.png Binary files differindex b8b1fcfe2..b8b1fcfe2 100644 --- a/res/drawable-xlarge-hdpi/tab_selected_pressed_holo.9.png +++ b/res/drawable-large-hdpi/tab_selected_pressed_holo.9.png diff --git a/res/drawable-xlarge-hdpi/widget_resize_frame_holo.9.png b/res/drawable-large-hdpi/widget_resize_frame_holo.9.png Binary files differindex 7d16d7dea..7d16d7dea 100644 --- a/res/drawable-xlarge-hdpi/widget_resize_frame_holo.9.png +++ b/res/drawable-large-hdpi/widget_resize_frame_holo.9.png diff --git a/res/drawable-xlarge-hdpi/widget_resize_handle_bottom.png b/res/drawable-large-hdpi/widget_resize_handle_bottom.png Binary files differindex 045c15e2c..045c15e2c 100644 --- a/res/drawable-xlarge-hdpi/widget_resize_handle_bottom.png +++ b/res/drawable-large-hdpi/widget_resize_handle_bottom.png diff --git a/res/drawable-xlarge-hdpi/widget_resize_handle_left.png b/res/drawable-large-hdpi/widget_resize_handle_left.png Binary files differindex f0fc4d65d..f0fc4d65d 100644 --- a/res/drawable-xlarge-hdpi/widget_resize_handle_left.png +++ b/res/drawable-large-hdpi/widget_resize_handle_left.png diff --git a/res/drawable-xlarge-hdpi/widget_resize_handle_right.png b/res/drawable-large-hdpi/widget_resize_handle_right.png Binary files differindex 9c1f36602..9c1f36602 100644 --- a/res/drawable-xlarge-hdpi/widget_resize_handle_right.png +++ b/res/drawable-large-hdpi/widget_resize_handle_right.png diff --git a/res/drawable-xlarge-hdpi/widget_resize_handle_top.png b/res/drawable-large-hdpi/widget_resize_handle_top.png Binary files differindex f7839ed9a..f7839ed9a 100644 --- a/res/drawable-xlarge-hdpi/widget_resize_handle_top.png +++ b/res/drawable-large-hdpi/widget_resize_handle_top.png diff --git a/res/drawable-xlarge-mdpi/app_market_generic.png b/res/drawable-large-mdpi/app_market_generic.png Binary files differindex 6eb549703..6eb549703 100644 --- a/res/drawable-xlarge-mdpi/app_market_generic.png +++ b/res/drawable-large-mdpi/app_market_generic.png diff --git a/res/drawable-xlarge-mdpi/divider_launcher_holo.9.png b/res/drawable-large-mdpi/divider_launcher_holo.9.png Binary files differindex 6d101f4ce..6d101f4ce 100644 --- a/res/drawable-xlarge-mdpi/divider_launcher_holo.9.png +++ b/res/drawable-large-mdpi/divider_launcher_holo.9.png diff --git a/res/drawable-xlarge-mdpi/homescreen_large_blue.9.png b/res/drawable-large-mdpi/homescreen_large_blue.9.png Binary files differindex 5e7e61f27..5e7e61f27 100644 --- a/res/drawable-xlarge-mdpi/homescreen_large_blue.9.png +++ b/res/drawable-large-mdpi/homescreen_large_blue.9.png diff --git a/res/drawable-xlarge-mdpi/homescreen_large_green.9.png b/res/drawable-large-mdpi/homescreen_large_green.9.png Binary files differindex 2f83bac7d..2f83bac7d 100644 --- a/res/drawable-xlarge-mdpi/homescreen_large_green.9.png +++ b/res/drawable-large-mdpi/homescreen_large_green.9.png diff --git a/res/drawable-xlarge-mdpi/homescreen_large_green_strong.9.png b/res/drawable-large-mdpi/homescreen_large_green_strong.9.png Binary files differindex 1e145029b..1e145029b 100644 --- a/res/drawable-xlarge-mdpi/homescreen_large_green_strong.9.png +++ b/res/drawable-large-mdpi/homescreen_large_green_strong.9.png diff --git a/res/drawable-xlarge-mdpi/homescreen_small_blue.9.png b/res/drawable-large-mdpi/homescreen_small_blue.9.png Binary files differindex 28bc33b18..28bc33b18 100644 --- a/res/drawable-xlarge-mdpi/homescreen_small_blue.9.png +++ b/res/drawable-large-mdpi/homescreen_small_blue.9.png diff --git a/res/drawable-xlarge-mdpi/homescreen_small_blue_strong.9.png b/res/drawable-large-mdpi/homescreen_small_blue_strong.9.png Binary files differindex f286de9fe..f286de9fe 100644 --- a/res/drawable-xlarge-mdpi/homescreen_small_blue_strong.9.png +++ b/res/drawable-large-mdpi/homescreen_small_blue_strong.9.png diff --git a/res/drawable-xlarge-mdpi/homescreen_small_green.9.png b/res/drawable-large-mdpi/homescreen_small_green.9.png Binary files differindex 58698ea8d..58698ea8d 100644 --- a/res/drawable-xlarge-mdpi/homescreen_small_green.9.png +++ b/res/drawable-large-mdpi/homescreen_small_green.9.png diff --git a/res/drawable-xlarge-mdpi/homescreen_small_green_strong.9.png b/res/drawable-large-mdpi/homescreen_small_green_strong.9.png Binary files differindex 977308579..977308579 100644 --- a/res/drawable-xlarge-mdpi/homescreen_small_green_strong.9.png +++ b/res/drawable-large-mdpi/homescreen_small_green_strong.9.png diff --git a/res/drawable-xlarge-mdpi/ic_generic_search.png b/res/drawable-large-mdpi/ic_generic_search.png Binary files differindex e3fd5a266..e3fd5a266 100644 --- a/res/drawable-xlarge-mdpi/ic_generic_search.png +++ b/res/drawable-large-mdpi/ic_generic_search.png diff --git a/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png b/res/drawable-large-mdpi/ic_home_add_holo_dark.png Binary files differindex 7f0458998..7f0458998 100644 --- a/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png +++ b/res/drawable-large-mdpi/ic_home_add_holo_dark.png diff --git a/res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png b/res/drawable-large-mdpi/ic_home_all_apps_holo_dark.png Binary files differindex 04749e6f4..04749e6f4 100644 --- a/res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png +++ b/res/drawable-large-mdpi/ic_home_all_apps_holo_dark.png diff --git a/res/drawable-xlarge-mdpi/ic_no_applications.png b/res/drawable-large-mdpi/ic_no_applications.png Binary files differindex a4f695aca..a4f695aca 100644 --- a/res/drawable-xlarge-mdpi/ic_no_applications.png +++ b/res/drawable-large-mdpi/ic_no_applications.png diff --git a/res/drawable-xlarge-mdpi/ic_voice_search.png b/res/drawable-large-mdpi/ic_voice_search.png Binary files differindex 3c52e2ad8..3c52e2ad8 100644 --- a/res/drawable-xlarge-mdpi/ic_voice_search.png +++ b/res/drawable-large-mdpi/ic_voice_search.png diff --git a/res/drawable-xlarge-mdpi/tab_selected_focused_holo.9.png b/res/drawable-large-mdpi/tab_selected_focused_holo.9.png Binary files differindex 782ae35bd..782ae35bd 100644 --- a/res/drawable-xlarge-mdpi/tab_selected_focused_holo.9.png +++ b/res/drawable-large-mdpi/tab_selected_focused_holo.9.png diff --git a/res/drawable-xlarge-mdpi/tab_selected_holo.9.png b/res/drawable-large-mdpi/tab_selected_holo.9.png Binary files differindex 255d0726a..255d0726a 100644 --- a/res/drawable-xlarge-mdpi/tab_selected_holo.9.png +++ b/res/drawable-large-mdpi/tab_selected_holo.9.png diff --git a/res/drawable-xlarge-mdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-large-mdpi/tab_selected_pressed_focused_holo.9.png Binary files differindex 10152bb28..10152bb28 100644 --- a/res/drawable-xlarge-mdpi/tab_selected_pressed_focused_holo.9.png +++ b/res/drawable-large-mdpi/tab_selected_pressed_focused_holo.9.png diff --git a/res/drawable-xlarge-mdpi/tab_selected_pressed_holo.9.png b/res/drawable-large-mdpi/tab_selected_pressed_holo.9.png Binary files differindex 822ed51f4..822ed51f4 100644 --- a/res/drawable-xlarge-mdpi/tab_selected_pressed_holo.9.png +++ b/res/drawable-large-mdpi/tab_selected_pressed_holo.9.png diff --git a/res/drawable-xlarge-mdpi/widget_resize_frame_holo.9.png b/res/drawable-large-mdpi/widget_resize_frame_holo.9.png Binary files differindex e2e1396a1..e2e1396a1 100644 --- a/res/drawable-xlarge-mdpi/widget_resize_frame_holo.9.png +++ b/res/drawable-large-mdpi/widget_resize_frame_holo.9.png diff --git a/res/drawable-xlarge-mdpi/widget_resize_handle_bottom.png b/res/drawable-large-mdpi/widget_resize_handle_bottom.png Binary files differindex 99ac1b209..99ac1b209 100644 --- a/res/drawable-xlarge-mdpi/widget_resize_handle_bottom.png +++ b/res/drawable-large-mdpi/widget_resize_handle_bottom.png diff --git a/res/drawable-xlarge-mdpi/widget_resize_handle_left.png b/res/drawable-large-mdpi/widget_resize_handle_left.png Binary files differindex d031ddda1..d031ddda1 100644 --- a/res/drawable-xlarge-mdpi/widget_resize_handle_left.png +++ b/res/drawable-large-mdpi/widget_resize_handle_left.png diff --git a/res/drawable-xlarge-mdpi/widget_resize_handle_right.png b/res/drawable-large-mdpi/widget_resize_handle_right.png Binary files differindex f1b689ca4..f1b689ca4 100644 --- a/res/drawable-xlarge-mdpi/widget_resize_handle_right.png +++ b/res/drawable-large-mdpi/widget_resize_handle_right.png diff --git a/res/drawable-xlarge-mdpi/widget_resize_handle_top.png b/res/drawable-large-mdpi/widget_resize_handle_top.png Binary files differindex 40bef020c..40bef020c 100644 --- a/res/drawable-xlarge-mdpi/widget_resize_handle_top.png +++ b/res/drawable-large-mdpi/widget_resize_handle_top.png diff --git a/res/drawable-xlarge-nodpi/all_apps_bg_gradient.9.png b/res/drawable-large-nodpi/all_apps_bg_gradient.9.png Binary files differindex 3f4b5b58c..3f4b5b58c 100644 --- a/res/drawable-xlarge-nodpi/all_apps_bg_gradient.9.png +++ b/res/drawable-large-nodpi/all_apps_bg_gradient.9.png diff --git a/res/drawable-xlarge-nodpi/bluecrystal.jpg b/res/drawable-large-nodpi/bluecrystal.jpg Binary files differindex 2fa072bfe..2fa072bfe 100755 --- a/res/drawable-xlarge-nodpi/bluecrystal.jpg +++ b/res/drawable-large-nodpi/bluecrystal.jpg diff --git a/res/drawable-xlarge-nodpi/bluecrystal_small.jpg b/res/drawable-large-nodpi/bluecrystal_small.jpg Binary files differindex 810474337..810474337 100755 --- a/res/drawable-xlarge-nodpi/bluecrystal_small.jpg +++ b/res/drawable-large-nodpi/bluecrystal_small.jpg diff --git a/res/drawable-xlarge-nodpi/bluelinebots.jpg b/res/drawable-large-nodpi/bluelinebots.jpg Binary files differindex c8d32a7af..c8d32a7af 100644 --- a/res/drawable-xlarge-nodpi/bluelinebots.jpg +++ b/res/drawable-large-nodpi/bluelinebots.jpg diff --git a/res/drawable-xlarge-nodpi/bluelinebots_small.jpg b/res/drawable-large-nodpi/bluelinebots_small.jpg Binary files differindex 4de80f132..4de80f132 100755 --- a/res/drawable-xlarge-nodpi/bluelinebots_small.jpg +++ b/res/drawable-large-nodpi/bluelinebots_small.jpg diff --git a/res/drawable-xlarge-nodpi/bots.jpg b/res/drawable-large-nodpi/bots.jpg Binary files differindex 922acbb62..922acbb62 100755 --- a/res/drawable-xlarge-nodpi/bots.jpg +++ b/res/drawable-large-nodpi/bots.jpg diff --git a/res/drawable-xlarge-nodpi/bots_small.jpg b/res/drawable-large-nodpi/bots_small.jpg Binary files differindex 488989765..488989765 100755 --- a/res/drawable-xlarge-nodpi/bots_small.jpg +++ b/res/drawable-large-nodpi/bots_small.jpg diff --git a/res/drawable-xlarge-nodpi/bucky.jpg b/res/drawable-large-nodpi/bucky.jpg Binary files differindex c5a5b3e97..c5a5b3e97 100755 --- a/res/drawable-xlarge-nodpi/bucky.jpg +++ b/res/drawable-large-nodpi/bucky.jpg diff --git a/res/drawable-xlarge-nodpi/bucky_small.jpg b/res/drawable-large-nodpi/bucky_small.jpg Binary files differindex 87b4dc9e0..87b4dc9e0 100755 --- a/res/drawable-xlarge-nodpi/bucky_small.jpg +++ b/res/drawable-large-nodpi/bucky_small.jpg diff --git a/res/drawable-xlarge-nodpi/city.jpg b/res/drawable-large-nodpi/city.jpg Binary files differindex 72beb6b3c..72beb6b3c 100644 --- a/res/drawable-xlarge-nodpi/city.jpg +++ b/res/drawable-large-nodpi/city.jpg diff --git a/res/drawable-xlarge-nodpi/city_small.jpg b/res/drawable-large-nodpi/city_small.jpg Binary files differindex e267750cc..e267750cc 100644 --- a/res/drawable-xlarge-nodpi/city_small.jpg +++ b/res/drawable-large-nodpi/city_small.jpg diff --git a/res/drawable-xlarge-nodpi/customize_bg_gradient.png b/res/drawable-large-nodpi/customize_bg_gradient.png Binary files differindex 89df7a93a..89df7a93a 100644 --- a/res/drawable-xlarge-nodpi/customize_bg_gradient.png +++ b/res/drawable-large-nodpi/customize_bg_gradient.png diff --git a/res/drawable-xlarge-nodpi/flowerbot.jpg b/res/drawable-large-nodpi/flowerbot.jpg Binary files differindex 7adb3d2b5..7adb3d2b5 100644 --- a/res/drawable-xlarge-nodpi/flowerbot.jpg +++ b/res/drawable-large-nodpi/flowerbot.jpg diff --git a/res/drawable-xlarge-nodpi/flowerbot_small.jpg b/res/drawable-large-nodpi/flowerbot_small.jpg Binary files differindex 54778b99b..54778b99b 100644 --- a/res/drawable-xlarge-nodpi/flowerbot_small.jpg +++ b/res/drawable-large-nodpi/flowerbot_small.jpg diff --git a/res/drawable-xlarge-nodpi/glowy_hex.jpg b/res/drawable-large-nodpi/glowy_hex.jpg Binary files differindex 7d7cdbbd5..7d7cdbbd5 100644 --- a/res/drawable-xlarge-nodpi/glowy_hex.jpg +++ b/res/drawable-large-nodpi/glowy_hex.jpg diff --git a/res/drawable-xlarge-nodpi/glowy_hex_small.jpg b/res/drawable-large-nodpi/glowy_hex_small.jpg Binary files differindex bde365dcb..bde365dcb 100644 --- a/res/drawable-xlarge-nodpi/glowy_hex_small.jpg +++ b/res/drawable-large-nodpi/glowy_hex_small.jpg diff --git a/res/drawable-xlarge-nodpi/lotus.jpg b/res/drawable-large-nodpi/lotus.jpg Binary files differindex 1933c2028..1933c2028 100644 --- a/res/drawable-xlarge-nodpi/lotus.jpg +++ b/res/drawable-large-nodpi/lotus.jpg diff --git a/res/drawable-xlarge-nodpi/lotus_small.jpg b/res/drawable-large-nodpi/lotus_small.jpg Binary files differindex 6b515efb4..6b515efb4 100644 --- a/res/drawable-xlarge-nodpi/lotus_small.jpg +++ b/res/drawable-large-nodpi/lotus_small.jpg diff --git a/res/drawable-xlarge-nodpi/village.jpg b/res/drawable-large-nodpi/village.jpg Binary files differindex 480a07c75..480a07c75 100644 --- a/res/drawable-xlarge-nodpi/village.jpg +++ b/res/drawable-large-nodpi/village.jpg diff --git a/res/drawable-xlarge-nodpi/village_small.jpg b/res/drawable-large-nodpi/village_small.jpg Binary files differindex 865990416..865990416 100644 --- a/res/drawable-xlarge-nodpi/village_small.jpg +++ b/res/drawable-large-nodpi/village_small.jpg diff --git a/res/drawable-xlarge/delete_zone_selector.xml b/res/drawable-large/delete_zone_selector.xml index e2b37f4dc..e2b37f4dc 100644 --- a/res/drawable-xlarge/delete_zone_selector.xml +++ b/res/drawable-large/delete_zone_selector.xml diff --git a/res/layout-xlarge-land/application.xml b/res/layout-large-land/application.xml index 9393f7e40..9393f7e40 100644 --- a/res/layout-xlarge-land/application.xml +++ b/res/layout-large-land/application.xml diff --git a/res/layout-xlarge-land/workspace_screen.xml b/res/layout-large-land/workspace_screen.xml index e983b7920..e983b7920 100644 --- a/res/layout-xlarge-land/workspace_screen.xml +++ b/res/layout-large-land/workspace_screen.xml diff --git a/res/layout-xlarge-port/application.xml b/res/layout-large-port/application.xml index af7a8a4df..af7a8a4df 100644 --- a/res/layout-xlarge-port/application.xml +++ b/res/layout-large-port/application.xml diff --git a/res/layout-xlarge-port/workspace_screen.xml b/res/layout-large-port/workspace_screen.xml index 406441d00..406441d00 100644 --- a/res/layout-xlarge-port/workspace_screen.xml +++ b/res/layout-large-port/workspace_screen.xml diff --git a/res/layout-xlarge/all_apps_no_items_placeholder.xml b/res/layout-large/all_apps_no_items_placeholder.xml index b766df1b8..b766df1b8 100644 --- a/res/layout-xlarge/all_apps_no_items_placeholder.xml +++ b/res/layout-large/all_apps_no_items_placeholder.xml diff --git a/res/layout-xlarge/all_apps_paged_view_application.xml b/res/layout-large/all_apps_paged_view_application.xml index 16e5d82b7..16e5d82b7 100644 --- a/res/layout-xlarge/all_apps_paged_view_application.xml +++ b/res/layout-large/all_apps_paged_view_application.xml diff --git a/res/layout-xlarge/all_apps_tabbed.xml b/res/layout-large/all_apps_tabbed.xml index b00b3c325..b00b3c325 100644 --- a/res/layout-xlarge/all_apps_tabbed.xml +++ b/res/layout-large/all_apps_tabbed.xml diff --git a/res/layout-xlarge/button_bar.xml b/res/layout-large/button_bar.xml index 62115f786..62115f786 100644 --- a/res/layout-xlarge/button_bar.xml +++ b/res/layout-large/button_bar.xml diff --git a/res/layout-xlarge/customization_drawer.xml b/res/layout-large/customization_drawer.xml index d8db066b0..d8db066b0 100644 --- a/res/layout-xlarge/customization_drawer.xml +++ b/res/layout-large/customization_drawer.xml diff --git a/res/layout-xlarge/customize_paged_view_item.xml b/res/layout-large/customize_paged_view_item.xml index 80d678e84..80d678e84 100644 --- a/res/layout-xlarge/customize_paged_view_item.xml +++ b/res/layout-large/customize_paged_view_item.xml diff --git a/res/layout-xlarge/customize_paged_view_wallpaper.xml b/res/layout-large/customize_paged_view_wallpaper.xml index d6284c26f..d6284c26f 100644 --- a/res/layout-xlarge/customize_paged_view_wallpaper.xml +++ b/res/layout-large/customize_paged_view_wallpaper.xml diff --git a/res/layout-xlarge/customize_paged_view_widget.xml b/res/layout-large/customize_paged_view_widget.xml index 35791f5d5..35791f5d5 100644 --- a/res/layout-xlarge/customize_paged_view_widget.xml +++ b/res/layout-large/customize_paged_view_widget.xml diff --git a/res/layout-xlarge/external_widget_drop_list_item.xml b/res/layout-large/external_widget_drop_list_item.xml index 84f40eddf..84f40eddf 100644 --- a/res/layout-xlarge/external_widget_drop_list_item.xml +++ b/res/layout-large/external_widget_drop_list_item.xml diff --git a/res/layout-xlarge/launcher.xml b/res/layout-large/launcher.xml index 6c6fecf82..6c6fecf82 100644 --- a/res/layout-xlarge/launcher.xml +++ b/res/layout-large/launcher.xml diff --git a/res/layout-xlarge/tab_widget_indicator.xml b/res/layout-large/tab_widget_indicator.xml index c09c8534c..c09c8534c 100644 --- a/res/layout-xlarge/tab_widget_indicator.xml +++ b/res/layout-large/tab_widget_indicator.xml diff --git a/res/layout-xlarge/wallpaper_chooser.xml b/res/layout-large/wallpaper_chooser.xml index b48dbd9ad..b48dbd9ad 100644 --- a/res/layout-xlarge/wallpaper_chooser.xml +++ b/res/layout-large/wallpaper_chooser.xml diff --git a/res/layout-xlarge/wallpaper_chooser_base.xml b/res/layout-large/wallpaper_chooser_base.xml index ba5ac5304..ba5ac5304 100644 --- a/res/layout-xlarge/wallpaper_chooser_base.xml +++ b/res/layout-large/wallpaper_chooser_base.xml diff --git a/res/layout-xlarge/wallpaper_item.xml b/res/layout-large/wallpaper_item.xml index 9a596cb8d..9a596cb8d 100644 --- a/res/layout-xlarge/wallpaper_item.xml +++ b/res/layout-large/wallpaper_item.xml diff --git a/res/values-ar-xlarge/strings.xml b/res/values-ar-large/strings.xml index 2182311f9..2182311f9 100644 --- a/res/values-ar-xlarge/strings.xml +++ b/res/values-ar-large/strings.xml diff --git a/res/values-bg-xlarge/strings.xml b/res/values-bg-large/strings.xml index 5ca1b4623..5ca1b4623 100644 --- a/res/values-bg-xlarge/strings.xml +++ b/res/values-bg-large/strings.xml diff --git a/res/values-ca-xlarge/strings.xml b/res/values-ca-large/strings.xml index b92811bb6..b92811bb6 100644 --- a/res/values-ca-xlarge/strings.xml +++ b/res/values-ca-large/strings.xml diff --git a/res/values-cs-xlarge/strings.xml b/res/values-cs-large/strings.xml index d3e5aa85a..d3e5aa85a 100644 --- a/res/values-cs-xlarge/strings.xml +++ b/res/values-cs-large/strings.xml diff --git a/res/values-da-xlarge/strings.xml b/res/values-da-large/strings.xml index 76ee7b08e..76ee7b08e 100644 --- a/res/values-da-xlarge/strings.xml +++ b/res/values-da-large/strings.xml diff --git a/res/values-de-xlarge/strings.xml b/res/values-de-large/strings.xml index 86e268425..86e268425 100644 --- a/res/values-de-xlarge/strings.xml +++ b/res/values-de-large/strings.xml diff --git a/res/values-el-xlarge/strings.xml b/res/values-el-large/strings.xml index 66cbfde9e..66cbfde9e 100644 --- a/res/values-el-xlarge/strings.xml +++ b/res/values-el-large/strings.xml diff --git a/res/values-en-rGB-xlarge/strings.xml b/res/values-en-rGB-large/strings.xml index 60042b2d4..60042b2d4 100644 --- a/res/values-en-rGB-xlarge/strings.xml +++ b/res/values-en-rGB-large/strings.xml diff --git a/res/values-es-xlarge/strings.xml b/res/values-es-large/strings.xml index f43f72a6a..f43f72a6a 100644 --- a/res/values-es-xlarge/strings.xml +++ b/res/values-es-large/strings.xml diff --git a/res/values-es-rUS-xlarge/strings.xml b/res/values-es-rUS-large/strings.xml index 349e3ebe3..349e3ebe3 100644 --- a/res/values-es-rUS-xlarge/strings.xml +++ b/res/values-es-rUS-large/strings.xml diff --git a/res/values-fa-xlarge/strings.xml b/res/values-fa-large/strings.xml index 159cc4f4a..159cc4f4a 100644 --- a/res/values-fa-xlarge/strings.xml +++ b/res/values-fa-large/strings.xml diff --git a/res/values-fi-xlarge/strings.xml b/res/values-fi-large/strings.xml index 7559e1697..7559e1697 100644 --- a/res/values-fi-xlarge/strings.xml +++ b/res/values-fi-large/strings.xml diff --git a/res/values-fr-xlarge/strings.xml b/res/values-fr-large/strings.xml index 5c0aa4bcc..5c0aa4bcc 100644 --- a/res/values-fr-xlarge/strings.xml +++ b/res/values-fr-large/strings.xml diff --git a/res/values-hr-xlarge/strings.xml b/res/values-hr-large/strings.xml index c7911029e..c7911029e 100644 --- a/res/values-hr-xlarge/strings.xml +++ b/res/values-hr-large/strings.xml diff --git a/res/values-hu-xlarge/strings.xml b/res/values-hu-large/strings.xml index 800581e67..800581e67 100644 --- a/res/values-hu-xlarge/strings.xml +++ b/res/values-hu-large/strings.xml diff --git a/res/values-in-xlarge/strings.xml b/res/values-in-large/strings.xml index 706235303..706235303 100644 --- a/res/values-in-xlarge/strings.xml +++ b/res/values-in-large/strings.xml diff --git a/res/values-it-xlarge/strings.xml b/res/values-it-large/strings.xml index e667b75cb..e667b75cb 100644 --- a/res/values-it-xlarge/strings.xml +++ b/res/values-it-large/strings.xml diff --git a/res/values-iw-xlarge/strings.xml b/res/values-iw-large/strings.xml index 72e6b0f1b..72e6b0f1b 100644 --- a/res/values-iw-xlarge/strings.xml +++ b/res/values-iw-large/strings.xml diff --git a/res/values-ja-xlarge/strings.xml b/res/values-ja-large/strings.xml index 332053222..332053222 100644 --- a/res/values-ja-xlarge/strings.xml +++ b/res/values-ja-large/strings.xml diff --git a/res/values-ko-xlarge/strings.xml b/res/values-ko-large/strings.xml index 4c7e3c61e..4c7e3c61e 100644 --- a/res/values-ko-xlarge/strings.xml +++ b/res/values-ko-large/strings.xml diff --git a/res/values-xlarge-land/dimens.xml b/res/values-large-land/dimens.xml index 8d255557e..8d255557e 100644 --- a/res/values-xlarge-land/dimens.xml +++ b/res/values-large-land/dimens.xml diff --git a/res/values-xlarge-port/dimens.xml b/res/values-large-port/dimens.xml index e696e3449..e696e3449 100644 --- a/res/values-xlarge-port/dimens.xml +++ b/res/values-large-port/dimens.xml diff --git a/res/values-xlarge/config.xml b/res/values-large/config.xml index 99ee1ec58..99ee1ec58 100644 --- a/res/values-xlarge/config.xml +++ b/res/values-large/config.xml diff --git a/res/values-xlarge/dimens.xml b/res/values-large/dimens.xml index 11f85ab92..11f85ab92 100644 --- a/res/values-xlarge/dimens.xml +++ b/res/values-large/dimens.xml diff --git a/res/values-xlarge/strings.xml b/res/values-large/strings.xml index 75a22a2c5..75a22a2c5 100644 --- a/res/values-xlarge/strings.xml +++ b/res/values-large/strings.xml diff --git a/res/values-xlarge/styles.xml b/res/values-large/styles.xml index bcbe038ac..bcbe038ac 100644 --- a/res/values-xlarge/styles.xml +++ b/res/values-large/styles.xml diff --git a/res/values-xlarge/wallpapers.xml b/res/values-large/wallpapers.xml index 85bb433f1..85bb433f1 100644 --- a/res/values-xlarge/wallpapers.xml +++ b/res/values-large/wallpapers.xml diff --git a/res/values-lt-xlarge/strings.xml b/res/values-lt-large/strings.xml index 527a09bc8..527a09bc8 100644 --- a/res/values-lt-xlarge/strings.xml +++ b/res/values-lt-large/strings.xml diff --git a/res/values-lv-xlarge/strings.xml b/res/values-lv-large/strings.xml index 167ee7a5a..167ee7a5a 100644 --- a/res/values-lv-xlarge/strings.xml +++ b/res/values-lv-large/strings.xml diff --git a/res/values-nb-xlarge/strings.xml b/res/values-nb-large/strings.xml index dd58eae5c..dd58eae5c 100644 --- a/res/values-nb-xlarge/strings.xml +++ b/res/values-nb-large/strings.xml diff --git a/res/values-nl-xlarge/strings.xml b/res/values-nl-large/strings.xml index 474f13b8e..474f13b8e 100644 --- a/res/values-nl-xlarge/strings.xml +++ b/res/values-nl-large/strings.xml diff --git a/res/values-pl-xlarge/strings.xml b/res/values-pl-large/strings.xml index 51b2442f2..51b2442f2 100644 --- a/res/values-pl-xlarge/strings.xml +++ b/res/values-pl-large/strings.xml diff --git a/res/values-pt-xlarge/strings.xml b/res/values-pt-large/strings.xml index b283297da..b283297da 100644 --- a/res/values-pt-xlarge/strings.xml +++ b/res/values-pt-large/strings.xml diff --git a/res/values-pt-rPT-xlarge/strings.xml b/res/values-pt-rPT-large/strings.xml index 9ec0e0fc6..9ec0e0fc6 100644 --- a/res/values-pt-rPT-xlarge/strings.xml +++ b/res/values-pt-rPT-large/strings.xml diff --git a/res/values-ro-xlarge/strings.xml b/res/values-ro-large/strings.xml index 6bea7b5df..6bea7b5df 100644 --- a/res/values-ro-xlarge/strings.xml +++ b/res/values-ro-large/strings.xml diff --git a/res/values-ru-xlarge/strings.xml b/res/values-ru-large/strings.xml index 01796bcda..01796bcda 100644 --- a/res/values-ru-xlarge/strings.xml +++ b/res/values-ru-large/strings.xml diff --git a/res/values-sk-xlarge/strings.xml b/res/values-sk-large/strings.xml index c857c3c77..c857c3c77 100644 --- a/res/values-sk-xlarge/strings.xml +++ b/res/values-sk-large/strings.xml diff --git a/res/values-sl-xlarge/strings.xml b/res/values-sl-large/strings.xml index f007b98f1..f007b98f1 100644 --- a/res/values-sl-xlarge/strings.xml +++ b/res/values-sl-large/strings.xml diff --git a/res/values-sr-xlarge/strings.xml b/res/values-sr-large/strings.xml index f7169091a..f7169091a 100644 --- a/res/values-sr-xlarge/strings.xml +++ b/res/values-sr-large/strings.xml diff --git a/res/values-sv-xlarge/strings.xml b/res/values-sv-large/strings.xml index 907348a97..907348a97 100644 --- a/res/values-sv-xlarge/strings.xml +++ b/res/values-sv-large/strings.xml diff --git a/res/values-th-xlarge/strings.xml b/res/values-th-large/strings.xml index 38c7d85cc..38c7d85cc 100644 --- a/res/values-th-xlarge/strings.xml +++ b/res/values-th-large/strings.xml diff --git a/res/values-tl-xlarge/strings.xml b/res/values-tl-large/strings.xml index 7eadb6d22..7eadb6d22 100644 --- a/res/values-tl-xlarge/strings.xml +++ b/res/values-tl-large/strings.xml diff --git a/res/values-tr-xlarge/strings.xml b/res/values-tr-large/strings.xml index a81e9984a..a81e9984a 100644 --- a/res/values-tr-xlarge/strings.xml +++ b/res/values-tr-large/strings.xml diff --git a/res/values-uk-xlarge/strings.xml b/res/values-uk-large/strings.xml index 49501426b..49501426b 100644 --- a/res/values-uk-xlarge/strings.xml +++ b/res/values-uk-large/strings.xml diff --git a/res/values-vi-xlarge/strings.xml b/res/values-vi-large/strings.xml index 925732745..925732745 100644 --- a/res/values-vi-xlarge/strings.xml +++ b/res/values-vi-large/strings.xml diff --git a/res/values-zh-rCN-xlarge/strings.xml b/res/values-zh-rCN-large/strings.xml index 323cce24a..323cce24a 100644 --- a/res/values-zh-rCN-xlarge/strings.xml +++ b/res/values-zh-rCN-large/strings.xml diff --git a/res/values-zh-rTW-xlarge/strings.xml b/res/values-zh-rTW-large/strings.xml index 793b58d90..793b58d90 100644 --- a/res/values-zh-rTW-xlarge/strings.xml +++ b/res/values-zh-rTW-large/strings.xml diff --git a/src/com/android/launcher2/ApplicationInfoDropTarget.java b/src/com/android/launcher2/ApplicationInfoDropTarget.java index ce359d44a..f42aaf535 100644 --- a/src/com/android/launcher2/ApplicationInfoDropTarget.java +++ b/src/com/android/launcher2/ApplicationInfoDropTarget.java @@ -50,7 +50,7 @@ public class ApplicationInfoDropTarget extends IconDropTarget { int colour = getContext().getResources().getColor(R.color.app_info_filter); mHoverPaint.setColorFilter(new PorterDuffColorFilter(colour, PorterDuff.Mode.SRC_ATOP)); - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { // For the application info drop target, we just ignore the left padding since we don't want // to overlap with the delete zone padding int tb = getResources().getDimensionPixelSize( diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 5173672da..14e051c64 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -319,7 +319,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen public void run() { cl.calculateSpans(itemInfo); if (cl.findCellForSpan(null, itemInfo.spanX, itemInfo.spanY)) { - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { animateItemOntoScreen(dragView, cl, itemInfo); } else { mLauncher.addExternalItemToScreen(itemInfo, cl); diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index 52b59f10c..8efb6ce7c 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -167,7 +167,7 @@ public class CellLayout extends ViewGroup { final Resources res = getResources(); - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { mNormalBackground = res.getDrawable(R.drawable.homescreen_large_blue); mActiveBackground = res.getDrawable(R.drawable.homescreen_large_green); mActiveGlowBackground = res.getDrawable(R.drawable.homescreen_large_green_strong); @@ -353,7 +353,7 @@ public class CellLayout extends ViewGroup { } void animateDrop() { - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { Resources res = getResources(); float onDropScale = res.getInteger(R.integer.config_screenOnDropScalePercent) / 100.0f; ObjectAnimator scaleUp = ObjectAnimator.ofFloat(this, "hoverScale", onDropScale); @@ -391,7 +391,7 @@ public class CellLayout extends ViewGroup { // When we're small, we are either drawn normally or in the "accepts drops" state (during // a drag). However, we also drag the mini hover background *over* one of those two // backgrounds - if (LauncherApplication.isScreenXLarge() && mBackgroundAlpha > 0.0f) { + if (LauncherApplication.isScreenLarge() && mBackgroundAlpha > 0.0f) { Drawable bg; boolean mini = getScaleX() < 0.5f; diff --git a/src/com/android/launcher2/DeleteZone.java b/src/com/android/launcher2/DeleteZone.java index 4b3592164..fdd41257f 100644 --- a/src/com/android/launcher2/DeleteZone.java +++ b/src/com/android/launcher2/DeleteZone.java @@ -68,7 +68,7 @@ public class DeleteZone extends IconDropTarget { mOrientation = a.getInt(R.styleable.DeleteZone_direction, ORIENTATION_HORIZONTAL); a.recycle(); - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { int tb = getResources().getDimensionPixelSize( R.dimen.delete_zone_vertical_drag_padding); int lr = getResources().getDimensionPixelSize( @@ -81,7 +81,7 @@ public class DeleteZone extends IconDropTarget { protected void onFinishInflate() { super.onFinishInflate(); mTransition = (TransitionDrawable) getCompoundDrawables()[LEFT_DRAWABLE]; - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { mTransition.setCrossFadeEnabled(false); } @@ -102,7 +102,7 @@ public class DeleteZone extends IconDropTarget { final ItemInfo item = (ItemInfo) dragInfo; // On x-large screens, you can uninstall an app by dragging from all apps - if (item instanceof ApplicationInfo && LauncherApplication.isScreenXLarge()) { + if (item instanceof ApplicationInfo && LauncherApplication.isScreenLarge()) { mLauncher.startApplicationUninstallActivity((ApplicationInfo) item); } @@ -166,7 +166,7 @@ public class DeleteZone extends IconDropTarget { getHitRect(mRegion); mRegionF.set(mRegion); - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { // This region will be a "dead zone" for scrolling; make it extend to the edge of // the screen so users don't accidentally trigger a scroll while deleting items mRegionF.top = mLauncher.getWorkspace().getTop(); @@ -223,7 +223,7 @@ public class DeleteZone extends IconDropTarget { mInAnimation = new AnimatorSet(); mInAnimation.setInterpolator(new AccelerateInterpolator()); mInAnimation.setDuration(duration); - if (!LauncherApplication.isScreenXLarge()) { + if (!LauncherApplication.isScreenLarge()) { Animator translateAnim; if (mOrientation == ORIENTATION_HORIZONTAL) { translateAnim = ObjectAnimator.ofFloat(this, "translationY", @@ -243,7 +243,7 @@ public class DeleteZone extends IconDropTarget { mOutAnimation = new AnimatorSet(); mOutAnimation.setInterpolator(new AccelerateInterpolator()); mOutAnimation.setDuration(duration); - if (!LauncherApplication.isScreenXLarge()) { + if (!LauncherApplication.isScreenLarge()) { Animator translateAnim; if (mOrientation == ORIENTATION_HORIZONTAL) { translateAnim = ObjectAnimator.ofFloat(this, "translationY", 0f, @@ -269,12 +269,12 @@ public class DeleteZone extends IconDropTarget { } private int getTransitionAnimationDuration() { - return LauncherApplication.isScreenXLarge() ? + return LauncherApplication.isScreenLarge() ? XLARGE_TRANSITION_DURATION : TRANSITION_DURATION; } private int getAnimationDuration() { - return LauncherApplication.isScreenXLarge() ? + return LauncherApplication.isScreenLarge() ? XLARGE_ANIMATION_DURATION : ANIMATION_DURATION; } } diff --git a/src/com/android/launcher2/FocusHelper.java b/src/com/android/launcher2/FocusHelper.java index f14ebaeb9..861a70b2d 100644 --- a/src/com/android/launcher2/FocusHelper.java +++ b/src/com/android/launcher2/FocusHelper.java @@ -132,7 +132,7 @@ public class FocusHelper { * To be deprecated. */ static boolean handlePagedViewWidgetKeyEvent(PagedViewWidget w, int keyCode, KeyEvent e) { - if (!LauncherApplication.isScreenXLarge()) return false; + if (!LauncherApplication.isScreenLarge()) return false; final PagedViewExtendedLayout parent = (PagedViewExtendedLayout) w.getParent(); final ViewGroup container = (ViewGroup) parent.getParent(); @@ -522,7 +522,7 @@ public class FocusHelper { * Handles key events in the tab widget. */ static boolean handleTabKeyEvent(AccessibleTabView v, int keyCode, KeyEvent e) { - if (!LauncherApplication.isScreenXLarge()) return false; + if (!LauncherApplication.isScreenLarge()) return false; final FocusOnlyTabWidget parent = (FocusOnlyTabWidget) v.getParent(); final TabHost tabHost = findTabHostParent(parent); @@ -577,7 +577,7 @@ public class FocusHelper { * Handles key events in the workspace button bar. */ static boolean handleButtonBarButtonKeyEvent(View v, int keyCode, KeyEvent e) { - if (!LauncherApplication.isScreenXLarge()) return false; + if (!LauncherApplication.isScreenLarge()) return false; final ViewGroup parent = (ViewGroup) v.getParent(); final ViewGroup launcher = (ViewGroup) parent.getParent(); diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java index 0c26bf05c..7e37afe82 100644 --- a/src/com/android/launcher2/IconCache.java +++ b/src/com/android/launcher2/IconCache.java @@ -54,7 +54,7 @@ public class IconCache { mContext = context; mPackageManager = context.getPackageManager(); mBubble = new Utilities.BubbleText(context); - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { mIconDpi = DisplayMetrics.DENSITY_HIGH; } else { mIconDpi = context.getResources().getDisplayMetrics().densityDpi; diff --git a/src/com/android/launcher2/IconDropTarget.java b/src/com/android/launcher2/IconDropTarget.java index fb5d0f081..4d018e64f 100644 --- a/src/com/android/launcher2/IconDropTarget.java +++ b/src/com/android/launcher2/IconDropTarget.java @@ -126,7 +126,7 @@ public class IconDropTarget extends TextView implements DropTarget, DragControll @Override public void getHitRect(Rect outRect) { super.getHitRect(outRect); - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { outRect.top -= mDragPadding[0]; outRect.right += mDragPadding[1]; outRect.bottom += mDragPadding[2]; diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 9b136c45d..2fe1c7d5b 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -346,7 +346,7 @@ public final class Launcher extends Activity registerReceiver(mCloseSystemDialogsReceiver, filter); // If we have a saved version of these external icons, we load them up immediately - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { if (sGlobalSearchIcon == null || sVoiceSearchIcon == null || sAppMarketIcon == null) { updateIconsAffectedByPackageManagerChanges(); } @@ -895,7 +895,7 @@ public final class Launcher extends Activity DragLayer dragLayer = (DragLayer) findViewById(R.id.drag_layer); dragLayer.setDragController(dragController); - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { mAllAppsGrid = (AllAppsView) dragLayer.findViewById(R.id.all_apps_view); mAllAppsGrid.setup(this, dragController); // We don't want a hole punched in our window. @@ -963,7 +963,7 @@ public final class Launcher extends Activity final View divider = findViewById(R.id.all_apps_divider); final View configureButton = findViewById(R.id.configure_button); - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { deleteZone.setOverlappingViews(new View[] { allAppsButton, divider, configureButton }); } else { deleteZone.setOverlappingView(findViewById(R.id.all_apps_button_cluster)); @@ -1013,7 +1013,7 @@ public final class Launcher extends Activity } mButtonCluster = (ViewGroup) findViewById(R.id.all_apps_button_cluster); View.OnKeyListener listener = null; - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { // For tablets, AllApps lives in the button bar at the top listener = new ButtonBarKeyEventListener(); } else { @@ -1695,7 +1695,7 @@ public final class Launcher extends Activity } private void addItems() { - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { // Animate the widget chooser up from the bottom of the screen if (mState != State.CUSTOMIZE) { showCustomizationDrawer(true); @@ -2198,7 +2198,7 @@ public final class Launcher extends Activity mWorkspace.setAllowLongPress(false); mWorkspace.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { addItems(); } else { startWallpaper(); @@ -2513,7 +2513,7 @@ public final class Launcher extends Activity // AllAppsView.Watcher public void zoomed(float zoom) { // In XLarge view, we zoom down the workspace below all apps so it's still visible - if (zoom == 1.0f && !LauncherApplication.isScreenXLarge()) { + if (zoom == 1.0f && !LauncherApplication.isScreenLarge()) { mWorkspace.setVisibility(View.GONE); } } @@ -2586,7 +2586,7 @@ public final class Launcher extends Activity case WORKSPACE: hideOrShowToolbarButton(true, mButtonCluster, showSeq); mDeleteZone.setDragAndDropEnabled(true); - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { mDeleteZone.setText(getResources().getString(R.string.delete_zone_label_workspace)); } break; @@ -2594,7 +2594,7 @@ public final class Launcher extends Activity case APPS_CUSTOMIZE: hideOrShowToolbarButton(false, mButtonCluster, hideSeq); mDeleteZone.setDragAndDropEnabled(false); - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { mDeleteZone.setText(getResources().getString(R.string.delete_zone_label_all_apps)); } break; @@ -2651,7 +2651,7 @@ public final class Launcher extends Activity View tmpView; if (toAllApps) { - tmpView = (LauncherApplication.isScreenXLarge()) + tmpView = (LauncherApplication.isScreenLarge()) ? (View) mAllAppsGrid : mAppsCustomizeTabHost; } else { tmpView = mHomeCustomizationDrawer; @@ -2664,7 +2664,7 @@ public final class Launcher extends Activity if (!springLoaded) { mWorkspace.shrink(ShrinkState.BOTTOM_HIDDEN, animated); - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { // Everytime we launch into AllApps, we reset the successful drop flag which // controls when it should hide/show the mini workspaces mAllAppsPagedView.resetSuccessfulDropFlag(); @@ -2781,14 +2781,14 @@ public final class Launcher extends Activity View tmpView; if (fromAllApps) { - tmpView = (LauncherApplication.isScreenXLarge()) + tmpView = (LauncherApplication.isScreenLarge()) ? (View) mAllAppsGrid : mAppsCustomizeTabHost; } else { tmpView = mHomeCustomizationDrawer; } final View fromView = tmpView; - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { mCustomizePagedView.endChoiceMode(); mAllAppsPagedView.endChoiceMode(); } @@ -2894,7 +2894,7 @@ public final class Launcher extends Activity mWorkspace.enterSpringLoadedDragMode(layout); if (mState == State.ALL_APPS || mState == State.APPS_CUSTOMIZE) { mState = State.ALL_APPS_SPRING_LOADED; - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { cameraZoomIn(State.ALL_APPS, true, true); } else { cameraZoomIn(State.APPS_CUSTOMIZE, true, true); @@ -2910,7 +2910,7 @@ public final class Launcher extends Activity void exitSpringLoadedDragMode() { if (mState == State.ALL_APPS_SPRING_LOADED) { mWorkspace.exitSpringLoadedDragMode(Workspace.ShrinkState.BOTTOM_VISIBLE); - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { cameraZoomOut(State.ALL_APPS, true, true); mState = State.ALL_APPS; } else { @@ -2928,7 +2928,7 @@ public final class Launcher extends Activity void showAllApps(boolean animated) { if (mState != State.WORKSPACE) return; - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { cameraZoomOut(State.ALL_APPS, animated, false); ((View) mAllAppsGrid).requestFocus(); @@ -2994,7 +2994,7 @@ public final class Launcher extends Activity * - From another workspace */ void closeAllApps(boolean animated) { - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { if (mState == State.ALL_APPS || mState == State.ALL_APPS_SPRING_LOADED) { mWorkspace.setVisibility(View.VISIBLE); cameraZoomIn(State.ALL_APPS, animated, false); @@ -3125,7 +3125,7 @@ public final class Launcher extends Activity } private void updateGlobalSearchIcon() { - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { final View searchButton = findViewById(R.id.search_button); final View searchDivider = findViewById(R.id.search_divider); @@ -3149,7 +3149,7 @@ public final class Launcher extends Activity } private void updateVoiceSearchIcon() { - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { final View searchDivider = findViewById(R.id.search_divider); final View voiceButton = findViewById(R.id.voice_button); @@ -3501,7 +3501,7 @@ public final class Launcher extends Activity // Workaround a bug that occurs when rotating the device while the customization mode is // open, we trigger a new layout on all the CellLayout children. - if (LauncherApplication.isScreenXLarge() && (mState == State.CUSTOMIZE)) { + if (LauncherApplication.isScreenLarge() && (mState == State.CUSTOMIZE)) { final int childCount = mWorkspace.getChildCount(); for (int i = 0; i < childCount; ++i) { mWorkspace.getChildAt(i).requestLayout(); diff --git a/src/com/android/launcher2/LauncherApplication.java b/src/com/android/launcher2/LauncherApplication.java index 041392c68..67573e083 100644 --- a/src/com/android/launcher2/LauncherApplication.java +++ b/src/com/android/launcher2/LauncherApplication.java @@ -27,7 +27,7 @@ import android.os.Handler; public class LauncherApplication extends Application { public LauncherModel mModel; public IconCache mIconCache; - private static boolean sIsScreenXLarge; + private static boolean sIsScreenLarge; private static float sScreenDensity; private static final boolean ENABLE_ROTATION = false; @@ -36,7 +36,9 @@ public class LauncherApplication extends Application { super.onCreate(); // set sIsScreenXLarge and sScreenDensity *before* creating icon cache - sIsScreenXLarge = (getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_XLARGE; + final int screenSize = getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK; + sIsScreenLarge = screenSize == Configuration.SCREENLAYOUT_SIZE_LARGE || + screenSize == Configuration.SCREENLAYOUT_SIZE_XLARGE; sScreenDensity = getResources().getDisplayMetrics().density; mIconCache = new IconCache(this); @@ -97,11 +99,11 @@ public class LauncherApplication extends Application { } public static boolean isInPlaceRotationEnabled() { - return sIsScreenXLarge && ENABLE_ROTATION; + return sIsScreenLarge && ENABLE_ROTATION; } - public static boolean isScreenXLarge() { - return sIsScreenXLarge; + public static boolean isScreenLarge() { + return sIsScreenLarge; } public static float getScreenDensity() { diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/android/launcher2/PagedViewCellLayout.java index 92459d8eb..54bdec40c 100644 --- a/src/com/android/launcher2/PagedViewCellLayout.java +++ b/src/com/android/launcher2/PagedViewCellLayout.java @@ -259,7 +259,7 @@ public class PagedViewCellLayout extends ViewGroup implements Page { } int getContentWidth() { - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { // Return the distance from the left edge of the content of the leftmost icon to // the right edge of the content of the rightmost icon @@ -283,7 +283,7 @@ public class PagedViewCellLayout extends ViewGroup implements Page { int count = getChildCount(); for (int i = 0; i < count; i++) { View child = getChildAt(i); - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { child.layout(0, 0, r - l, b - t); } else { child.layout(mPaddingLeft, mPaddingTop, getMeasuredWidth() - mPaddingRight, @@ -477,7 +477,7 @@ public class PagedViewCellLayout extends ViewGroup implements Page { height = myCellVSpan * cellHeight + ((myCellVSpan - 1) * heightGap) - topMargin - bottomMargin; - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { x = hStartPadding + myCellX * (cellWidth + widthGap) + leftMargin; y = vStartPadding + myCellY * (cellHeight + heightGap) + topMargin; } else { diff --git a/src/com/android/launcher2/PagedViewExtendedLayout.java b/src/com/android/launcher2/PagedViewExtendedLayout.java index f471b76c7..94890d8ce 100644 --- a/src/com/android/launcher2/PagedViewExtendedLayout.java +++ b/src/com/android/launcher2/PagedViewExtendedLayout.java @@ -42,7 +42,7 @@ public class PagedViewExtendedLayout extends LinearLayout implements Page { } protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { super.onMeasure(widthMeasureSpec, heightMeasureSpec); } else { // PagedView currently has issues with different-sized pages since it calculates the diff --git a/src/com/android/launcher2/PagedViewWidget.java b/src/com/android/launcher2/PagedViewWidget.java index 6492888ce..2ffa398d1 100644 --- a/src/com/android/launcher2/PagedViewWidget.java +++ b/src/com/android/launcher2/PagedViewWidget.java @@ -257,7 +257,7 @@ public class PagedViewWidget extends LinearLayout implements Checkable { @Override public boolean onKeyDown(int keyCode, KeyEvent event) { - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { return FocusHelper.handlePagedViewWidgetKeyEvent(this, keyCode, event) || super.onKeyDown(keyCode, event); } else { @@ -268,7 +268,7 @@ public class PagedViewWidget extends LinearLayout implements Checkable { @Override public boolean onKeyUp(int keyCode, KeyEvent event) { - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { return FocusHelper.handlePagedViewWidgetKeyEvent(this, keyCode, event) || super.onKeyUp(keyCode, event); } else { diff --git a/src/com/android/launcher2/Utilities.java b/src/com/android/launcher2/Utilities.java index cd98cab7f..ba258939c 100644 --- a/src/com/android/launcher2/Utilities.java +++ b/src/com/android/launcher2/Utilities.java @@ -243,7 +243,7 @@ final class Utilities { final float density = metrics.density; sIconWidth = sIconHeight = (int) resources.getDimension(R.dimen.app_icon_size); - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { sIconContentSize = (int) resources.getDimension(R.dimen.app_icon_content_size); } sIconTextureWidth = sIconTextureHeight = sIconWidth + 2; diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 192787e33..1373996aa 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -249,7 +249,7 @@ public class Workspace extends SmoothPagedView super(context, attrs, defStyle); mContentIsRefreshable = false; - if (!LauncherApplication.isScreenXLarge()) { + if (!LauncherApplication.isScreenLarge()) { mFadeInAdjacentScreens = false; } @@ -333,7 +333,7 @@ public class Workspace extends SmoothPagedView @Override protected int getScrollMode() { - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { return SmoothPagedView.X_LARGE_MODE; } else { return SmoothPagedView.DEFAULT_MODE; @@ -1063,7 +1063,7 @@ public class Workspace extends SmoothPagedView // If the screen is not xlarge, then don't rotate the CellLayouts // NOTE: If we don't update the side pages alpha, then we should not hide the side pages. // see unshrink(). - if (!LauncherApplication.isScreenXLarge()) return; + if (!LauncherApplication.isScreenLarge()) return; final int halfScreenSize = getMeasuredWidth() / 2; @@ -1292,7 +1292,7 @@ public class Workspace extends SmoothPagedView public boolean onTouchEvent(MotionEvent ev) { if (mLauncher.isAllAppsVisible() && mShrinkState == ShrinkState.BOTTOM_HIDDEN) { PagedView appsPane; - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { appsPane = (PagedView) mLauncher.findViewById(R.id.all_apps_paged_view); } else { appsPane = (PagedView) mLauncher.findViewById(R.id.apps_customize_pane_content); @@ -1864,7 +1864,7 @@ public class Workspace extends SmoothPagedView final CellLayout cl = (CellLayout)getChildAt(i); float finalAlphaValue = 0f; float rotation = 0f; - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { finalAlphaValue = (i == mCurrentPage) ? 1.0f : 0.0f; if (i < mCurrentPage) { @@ -1886,7 +1886,7 @@ public class Workspace extends SmoothPagedView // If the screen is not xlarge, then don't rotate the CellLayouts // NOTE: If we don't update the side pages alpha, then we should not hide the side // pages. see unshrink(). - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { translation = getOffsetXForRotation(rotation, cl.getWidth(), cl.getHeight()); } @@ -2407,7 +2407,7 @@ public class Workspace extends SmoothPagedView if (source != this) { final int[] touchXY = new int[] { (int) mDragViewVisualCenter[0], (int) mDragViewVisualCenter[1] }; - if (LauncherApplication.isScreenXLarge() && (mIsSmall || mIsInUnshrinkAnimation) + if (LauncherApplication.isScreenLarge() && (mIsSmall || mIsInUnshrinkAnimation) && !mLauncher.isAllAppsVisible()) { // When the workspace is shrunk and the drop comes from customize, don't actually // add the item to the screen -- customize will do this itself @@ -2921,7 +2921,7 @@ public class Workspace extends SmoothPagedView // Workaround the fact that we don't actually want spring-loaded mode in phone // UI yet. - if (LauncherApplication.isScreenXLarge()) { + if (LauncherApplication.isScreenLarge()) { // In spring-loaded mode, we still want the user to be able to hover over a // full screen (which is traditionally set to not accept drops) if they want // to get to pages beyond the screen that is full. |