Merge "Differentiating max widget cell count and max wallpaper cell count in customization drawer."

commit: bf54662596481406fbc70855847d26b6557cc677 [log] [tgz]
author: Winson Chung <winsonc@google.com> Thu Dec 09 16:40:03 2010 -0800
committer: Android (Google) Code Review <android-gerrit@google.com> Thu Dec 09 16:40:03 2010 -0800
tree: 1fec073d26a4813491cdd49c2a9d38f32eaacf35
parent: fbc29531f8f1886201e994f886c8792bb4e1f3c5 [diff]
parent: 78bd53c71d8c27624ebabaa5903646272c0e3f5b [diff]
diff --git a/res/drawable-hdpi/gardening_crosshairs.png b/res/drawable-hdpi/gardening_crosshairs.png
index 3c0484c..fca6036 100644
--- a/res/drawable-hdpi/gardening_crosshairs.png
+++ b/res/drawable-hdpi/gardening_crosshairs.png
Binary files differ

diff --git a/res/drawable-hdpi/home_screen_bg.9.png b/res/drawable-hdpi/home_screen_bg.9.png
deleted file mode 100644
index 413e492..0000000
--- a/res/drawable-hdpi/home_screen_bg.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-hdpi/home_screen_bg_hover.9.png b/res/drawable-hdpi/home_screen_bg_hover.9.png
deleted file mode 100644
index 73696bf..0000000
--- a/res/drawable-hdpi/home_screen_bg_hover.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-hdpi/mini_home_screen_bg.9.png b/res/drawable-hdpi/mini_home_screen_bg.9.png
deleted file mode 100644
index 4602609..0000000
--- a/res/drawable-hdpi/mini_home_screen_bg.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-hdpi/mini_home_screen_bg_accepts_drops.9.png b/res/drawable-hdpi/mini_home_screen_bg_accepts_drops.9.png
deleted file mode 100644
index b1aa98b..0000000
--- a/res/drawable-hdpi/mini_home_screen_bg_accepts_drops.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-hdpi/mini_home_screen_bg_hover.9.png b/res/drawable-hdpi/mini_home_screen_bg_hover.9.png
deleted file mode 100644
index a30e992..0000000
--- a/res/drawable-hdpi/mini_home_screen_bg_hover.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-hdpi/rounded_rect_green.9.png b/res/drawable-hdpi/rounded_rect_green.9.png
deleted file mode 100644
index 50268fb..0000000
--- a/res/drawable-hdpi/rounded_rect_green.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-hdpi/rounded_rect_red.9.png b/res/drawable-hdpi/rounded_rect_red.9.png
deleted file mode 100644
index ef68d4d..0000000
--- a/res/drawable-hdpi/rounded_rect_red.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-hdpi/tab_unselected_holo.9.png b/res/drawable-hdpi/tab_unselected_holo.9.png
index eaa306a..db6fc14 100644
--- a/res/drawable-hdpi/tab_unselected_holo.9.png
+++ b/res/drawable-hdpi/tab_unselected_holo.9.png
Binary files differ

diff --git a/res/drawable-mdpi/gardening_crosshairs.png b/res/drawable-mdpi/gardening_crosshairs.png
index cbaee78..d473044 100644
--- a/res/drawable-mdpi/gardening_crosshairs.png
+++ b/res/drawable-mdpi/gardening_crosshairs.png
Binary files differ

diff --git a/res/drawable-mdpi/rounded_rect_green.9.png b/res/drawable-mdpi/rounded_rect_green.9.png
deleted file mode 100644
index 5787c3d..0000000
--- a/res/drawable-mdpi/rounded_rect_green.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-mdpi/rounded_rect_red.9.png b/res/drawable-mdpi/rounded_rect_red.9.png
deleted file mode 100644
index 7a5fdee..0000000
--- a/res/drawable-mdpi/rounded_rect_red.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-mdpi/tab_unselected_holo.9.png b/res/drawable-mdpi/tab_unselected_holo.9.png
index 848f3f1..e621983 100644
--- a/res/drawable-mdpi/tab_unselected_holo.9.png
+++ b/res/drawable-mdpi/tab_unselected_holo.9.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/divider_launcher_holo.9.png b/res/drawable-xlarge-hdpi/divider_launcher_holo.9.png
new file mode 100644
index 0000000..0a1bd2a
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/divider_launcher_holo.9.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/home_screen_bg.9.png b/res/drawable-xlarge-hdpi/home_screen_bg.9.png
deleted file mode 100644
index 0a4ee8d..0000000
--- a/res/drawable-xlarge-hdpi/home_screen_bg.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/home_screen_bg_hover.9.png b/res/drawable-xlarge-hdpi/home_screen_bg_hover.9.png
deleted file mode 100644
index 2822639..0000000
--- a/res/drawable-xlarge-hdpi/home_screen_bg_hover.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/homescreen_large_blue.9.png b/res/drawable-xlarge-hdpi/homescreen_large_blue.9.png
new file mode 100644
index 0000000..6ce3d29
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/homescreen_large_blue.9.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/homescreen_large_blue_strong.9.png b/res/drawable-xlarge-hdpi/homescreen_large_blue_strong.9.png
new file mode 100644
index 0000000..8110148
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/homescreen_large_blue_strong.9.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/homescreen_large_green.9.png b/res/drawable-xlarge-hdpi/homescreen_large_green.9.png
new file mode 100644
index 0000000..4a6546e
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/homescreen_large_green.9.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/homescreen_large_green_strong.9.png b/res/drawable-xlarge-hdpi/homescreen_large_green_strong.9.png
new file mode 100644
index 0000000..5ba9ebe
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/homescreen_large_green_strong.9.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/homescreen_small_blue.9.png b/res/drawable-xlarge-hdpi/homescreen_small_blue.9.png
new file mode 100644
index 0000000..c3faa24
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/homescreen_small_blue.9.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/homescreen_small_blue_strong.9.png b/res/drawable-xlarge-hdpi/homescreen_small_blue_strong.9.png
new file mode 100644
index 0000000..32bd857
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/homescreen_small_blue_strong.9.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/homescreen_small_green.9.png b/res/drawable-xlarge-hdpi/homescreen_small_green.9.png
new file mode 100644
index 0000000..00baae9
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/homescreen_small_green.9.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/homescreen_small_green_strong.9.png b/res/drawable-xlarge-hdpi/homescreen_small_green_strong.9.png
new file mode 100644
index 0000000..e1e64c5
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/homescreen_small_green_strong.9.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/ic_home_all_apps_holo_dark.png b/res/drawable-xlarge-hdpi/ic_home_all_apps_holo_dark.png
new file mode 100644
index 0000000..3c7930f
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/ic_home_all_apps_holo_dark.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/ic_home_configure_holo_dark.png b/res/drawable-xlarge-hdpi/ic_home_configure_holo_dark.png
new file mode 100644
index 0000000..6c94a31
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/ic_home_configure_holo_dark.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/ic_home_delete_holo_dark.png b/res/drawable-xlarge-hdpi/ic_home_delete_holo_dark.png
new file mode 100644
index 0000000..9d64278
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/ic_home_delete_holo_dark.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/ic_home_delete_hover_holo_dark.png b/res/drawable-xlarge-hdpi/ic_home_delete_hover_holo_dark.png
new file mode 100644
index 0000000..60d5b15
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/ic_home_delete_hover_holo_dark.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/ic_home_info_holo_dark.png b/res/drawable-xlarge-hdpi/ic_home_info_holo_dark.png
new file mode 100644
index 0000000..02df4e1
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/ic_home_info_holo_dark.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/ic_voice_search.png b/res/drawable-xlarge-hdpi/ic_voice_search.png
deleted file mode 100644
index f659877..0000000
--- a/res/drawable-xlarge-hdpi/ic_voice_search.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/mini_home_screen_bg.9.png b/res/drawable-xlarge-hdpi/mini_home_screen_bg.9.png
deleted file mode 100644
index e255178..0000000
--- a/res/drawable-xlarge-hdpi/mini_home_screen_bg.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/mini_home_screen_bg_accepts_drops.9.png b/res/drawable-xlarge-hdpi/mini_home_screen_bg_accepts_drops.9.png
deleted file mode 100644
index c9834fa..0000000
--- a/res/drawable-xlarge-hdpi/mini_home_screen_bg_accepts_drops.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/mini_home_screen_bg_hover.9.png b/res/drawable-xlarge-hdpi/mini_home_screen_bg_hover.9.png
deleted file mode 100644
index 83afcc0..0000000
--- a/res/drawable-xlarge-hdpi/mini_home_screen_bg_hover.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/tab_selected_focused_holo.9.png b/res/drawable-xlarge-hdpi/tab_selected_focused_holo.9.png
new file mode 100644
index 0000000..1ba35d5
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/tab_selected_focused_holo.9.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/tab_selected_holo.9.png b/res/drawable-xlarge-hdpi/tab_selected_holo.9.png
new file mode 100644
index 0000000..ef913cc
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/tab_selected_holo.9.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-xlarge-hdpi/tab_selected_pressed_focused_holo.9.png
new file mode 100644
index 0000000..d7e9688
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/tab_selected_pressed_focused_holo.9.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/tab_selected_pressed_holo.9.png b/res/drawable-xlarge-hdpi/tab_selected_pressed_holo.9.png
new file mode 100644
index 0000000..b8b1fcf
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/tab_selected_pressed_holo.9.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/trashcan.png b/res/drawable-xlarge-hdpi/trashcan.png
new file mode 100644
index 0000000..a07f784
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/trashcan.png
Binary files differ

diff --git a/res/drawable-xlarge-hdpi/trashcan_hover.png b/res/drawable-xlarge-hdpi/trashcan_hover.png
new file mode 100644
index 0000000..6dbc8f3
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/trashcan_hover.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/divider_launcher_holo.9.png b/res/drawable-xlarge-mdpi/divider_launcher_holo.9.png
new file mode 100644
index 0000000..6d101f4
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/divider_launcher_holo.9.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/home_screen_bg.9.png b/res/drawable-xlarge-mdpi/home_screen_bg.9.png
deleted file mode 100644
index 413e492..0000000
--- a/res/drawable-xlarge-mdpi/home_screen_bg.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/home_screen_bg_hover.9.png b/res/drawable-xlarge-mdpi/home_screen_bg_hover.9.png
deleted file mode 100644
index 73696bf..0000000
--- a/res/drawable-xlarge-mdpi/home_screen_bg_hover.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/homescreen_large_blue.9.png b/res/drawable-xlarge-mdpi/homescreen_large_blue.9.png
new file mode 100644
index 0000000..5e7e61f
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/homescreen_large_blue.9.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/homescreen_large_blue_strong.9.png b/res/drawable-xlarge-mdpi/homescreen_large_blue_strong.9.png
new file mode 100644
index 0000000..f4913e5
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/homescreen_large_blue_strong.9.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/homescreen_large_green.9.png b/res/drawable-xlarge-mdpi/homescreen_large_green.9.png
new file mode 100644
index 0000000..2f83bac
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/homescreen_large_green.9.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/homescreen_large_green_strong.9.png b/res/drawable-xlarge-mdpi/homescreen_large_green_strong.9.png
new file mode 100644
index 0000000..1e14502
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/homescreen_large_green_strong.9.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/homescreen_small_blue.9.png b/res/drawable-xlarge-mdpi/homescreen_small_blue.9.png
new file mode 100644
index 0000000..096df7f
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/homescreen_small_blue.9.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/homescreen_small_blue_strong.9.png b/res/drawable-xlarge-mdpi/homescreen_small_blue_strong.9.png
new file mode 100644
index 0000000..f286de9
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/homescreen_small_blue_strong.9.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/homescreen_small_green.9.png b/res/drawable-xlarge-mdpi/homescreen_small_green.9.png
new file mode 100644
index 0000000..58698ea
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/homescreen_small_green.9.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/homescreen_small_green_strong.9.png b/res/drawable-xlarge-mdpi/homescreen_small_green_strong.9.png
new file mode 100644
index 0000000..9773085
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/homescreen_small_green_strong.9.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png b/res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png
new file mode 100644
index 0000000..0261d0d
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/ic_home_configure_holo_dark.png b/res/drawable-xlarge-mdpi/ic_home_configure_holo_dark.png
new file mode 100644
index 0000000..8a99273
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/ic_home_configure_holo_dark.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/ic_home_delete_holo_dark.png b/res/drawable-xlarge-mdpi/ic_home_delete_holo_dark.png
new file mode 100644
index 0000000..647fd80
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/ic_home_delete_holo_dark.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/ic_home_delete_hover_holo_dark.png b/res/drawable-xlarge-mdpi/ic_home_delete_hover_holo_dark.png
new file mode 100644
index 0000000..06b62e2
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/ic_home_delete_hover_holo_dark.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/ic_home_info_holo_dark.png b/res/drawable-xlarge-mdpi/ic_home_info_holo_dark.png
new file mode 100644
index 0000000..c34f443
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/ic_home_info_holo_dark.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/mini_home_screen_bg.9.png b/res/drawable-xlarge-mdpi/mini_home_screen_bg.9.png
deleted file mode 100644
index 4602609..0000000
--- a/res/drawable-xlarge-mdpi/mini_home_screen_bg.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/mini_home_screen_bg_accepts_drops.9.png b/res/drawable-xlarge-mdpi/mini_home_screen_bg_accepts_drops.9.png
deleted file mode 100644
index b1aa98b..0000000
--- a/res/drawable-xlarge-mdpi/mini_home_screen_bg_accepts_drops.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/mini_home_screen_bg_hover.9.png b/res/drawable-xlarge-mdpi/mini_home_screen_bg_hover.9.png
deleted file mode 100644
index a30e992..0000000
--- a/res/drawable-xlarge-mdpi/mini_home_screen_bg_hover.9.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/rotate_button_normal.png b/res/drawable-xlarge-mdpi/rotate_button_normal.png
deleted file mode 100644
index fd014aa..0000000
--- a/res/drawable-xlarge-mdpi/rotate_button_normal.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/rotate_button_pressed.png b/res/drawable-xlarge-mdpi/rotate_button_pressed.png
deleted file mode 100644
index 29fb8d9..0000000
--- a/res/drawable-xlarge-mdpi/rotate_button_pressed.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/tab_selected_focused_holo.9.png b/res/drawable-xlarge-mdpi/tab_selected_focused_holo.9.png
new file mode 100644
index 0000000..782ae35
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/tab_selected_focused_holo.9.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/tab_selected_holo.9.png b/res/drawable-xlarge-mdpi/tab_selected_holo.9.png
new file mode 100644
index 0000000..255d072
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/tab_selected_holo.9.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-xlarge-mdpi/tab_selected_pressed_focused_holo.9.png
new file mode 100644
index 0000000..10152bb
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/tab_selected_pressed_focused_holo.9.png
Binary files differ

diff --git a/res/drawable-xlarge-mdpi/tab_selected_pressed_holo.9.png b/res/drawable-xlarge-mdpi/tab_selected_pressed_holo.9.png
new file mode 100644
index 0000000..822ed51
--- /dev/null
+++ b/res/drawable-xlarge-mdpi/tab_selected_pressed_holo.9.png
Binary files differ

diff --git a/res/drawable-xlarge-nodpi/customize_bg_gradient.png b/res/drawable-xlarge-nodpi/customize_bg_gradient.png
index fb3ec90..89df7a9 100644
--- a/res/drawable-xlarge-nodpi/customize_bg_gradient.png
+++ b/res/drawable-xlarge-nodpi/customize_bg_gradient.png
Binary files differ

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index a104c55..fd0ef51 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java

@@ -169,16 +169,16 @@
         final Resources res = getResources();
 
         if (LauncherApplication.isScreenXLarge()) {
-            mBackgroundMini = res.getDrawable(R.drawable.mini_home_screen_bg);
+            mBackgroundMini = res.getDrawable(R.drawable.homescreen_small_blue);
             mBackgroundMini.setFilterBitmap(true);
-            mBackground = res.getDrawable(R.drawable.home_screen_bg);
+            mBackground = res.getDrawable(R.drawable.homescreen_large_blue);
             mBackground.setFilterBitmap(true);
-            mBackgroundMiniHover = res.getDrawable(R.drawable.mini_home_screen_bg_hover);
+            mBackgroundMiniHover = res.getDrawable(R.drawable.homescreen_small_green_strong);
             mBackgroundMiniHover.setFilterBitmap(true);
-            mBackgroundHover = res.getDrawable(R.drawable.home_screen_bg_hover);
+            mBackgroundHover = res.getDrawable(R.drawable.homescreen_large_green_strong);
             mBackgroundHover.setFilterBitmap(true);
             mBackgroundMiniAcceptsDrops = res.getDrawable(
-                    R.drawable.mini_home_screen_bg_accepts_drops);
+                    R.drawable.homescreen_small_green);
             mBackgroundMiniAcceptsDrops.setFilterBitmap(true);
         }
commit	bf54662596481406fbc70855847d26b6557cc677	[log] [tgz]
author	Winson Chung <winsonc@google.com>	Thu Dec 09 16:40:03 2010 -0800
committer	Android (Google) Code Review <android-gerrit@google.com>	Thu Dec 09 16:40:03 2010 -0800
tree	1fec073d26a4813491cdd49c2a9d38f32eaacf35
parent	fbc29531f8f1886201e994f886c8792bb4e1f3c5 [diff]
parent	78bd53c71d8c27624ebabaa5903646272c0e3f5b [diff]