Merge "Import revised translations."
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/res/layout-xlarge-land/customization_drawer.xml b/res/layout-xlarge-land/customization_drawer.xml
index 3fff2b0..9d088f2 100644
--- a/res/layout-xlarge-land/customization_drawer.xml
+++ b/res/layout-xlarge-land/customization_drawer.xml
@@ -20,6 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
launcher:wallpaperCellSpanX="3"
+ launcher:wallpaperCellCountX="12"
launcher:widgetCellCountX="16"
launcher:cellCountX="8"
launcher:cellCountY="3"
diff --git a/res/layout-xlarge-port/customization_drawer.xml b/res/layout-xlarge-port/customization_drawer.xml
index d90f3ca..a1bc7cc 100644
--- a/res/layout-xlarge-port/customization_drawer.xml
+++ b/res/layout-xlarge-port/customization_drawer.xml
@@ -20,7 +20,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
launcher:wallpaperCellSpanX="3"
- launcher:widgetCellCountX="9"
+ launcher:wallpaperCellCountX="9"
+ launcher:widgetCellCountX="10"
launcher:cellCountX="5"
launcher:cellCountY="3"
launcher:pageLayoutWidthGap="36dp"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 853d49e..3373869 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -107,6 +107,8 @@
<declare-styleable name="CustomizePagedView">
<!-- The cell span of an item in the wallpapers tab -->
<attr name="wallpaperCellSpanX" format="integer" />
+ <!-- The max cell span of all items in a particular wallpaper tab page -->
+ <attr name="wallpaperCellCountX" format="integer" />
<!-- The number of horizontal cells for the widget tab -->
<attr name="widgetCellCountX" format="integer" />
</declare-styleable>
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);
}
diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java
index 342974a..799e017 100644
--- a/src/com/android/launcher2/CustomizePagedView.java
+++ b/src/com/android/launcher2/CustomizePagedView.java
@@ -103,6 +103,9 @@
// The size of the items on the wallpaper tab
private int mWallpaperCellHSpan;
+ // The max number of wallpaper cells to take a "page" of wallpaper items
+ private int mMaxWallpaperCellHSpan;
+
// The raw sources of data for each of the different tabs of the customization page
private List<AppWidgetProviderInfo> mWidgetList;
private List<ResolveInfo> mShortcutList;
@@ -140,6 +143,7 @@
TypedArray a;
a = context.obtainStyledAttributes(attrs, R.styleable.CustomizePagedView, defStyle, 0);
mWallpaperCellHSpan = a.getInt(R.styleable.CustomizePagedView_wallpaperCellSpanX, 4);
+ mMaxWallpaperCellHSpan = a.getInt(R.styleable.CustomizePagedView_wallpaperCellCountX, 8);
mMaxWidgetsCellHSpan = a.getInt(R.styleable.CustomizePagedView_widgetCellCountX, 8);
a.recycle();
a = context.obtainStyledAttributes(attrs, R.styleable.PagedView, defStyle, 0);
@@ -926,7 +930,7 @@
// We need to repopulate the LinearLayout for the wallpaper pages
removeAllViews();
int numPages = (int) Math.ceil((float) (mWallpaperList.size() * mWallpaperCellHSpan) /
- mMaxWidgetsCellHSpan);
+ mMaxWallpaperCellHSpan);
for (int i = 0; i < numPages; ++i) {
LinearLayout layout = new PagedViewExtendedLayout(getContext());
layout.setGravity(Gravity.CENTER_HORIZONTAL);
@@ -944,7 +948,7 @@
LinearLayout layout = (LinearLayout) getChildAt(page);
layout.removeAllViews();
final int count = mWallpaperList.size();
- final int numItemsPerPage = mMaxWidgetsCellHSpan / mWallpaperCellHSpan;
+ final int numItemsPerPage = mMaxWallpaperCellHSpan / mWallpaperCellHSpan;
final int startIndex = page * numItemsPerPage;
final int endIndex = Math.min(count, startIndex + numItemsPerPage);
for (int i = startIndex; i < endIndex; ++i) {
