Merge "Import some unabbreviated translations for large screens." into honeycomb
diff --git a/res/drawable-xlarge-hdpi/homescreen_small_blue.9.png b/res/drawable-xlarge-hdpi/homescreen_small_blue.9.png
index c3faa24..db93b3c 100644
--- a/res/drawable-xlarge-hdpi/homescreen_small_blue.9.png
+++ b/res/drawable-xlarge-hdpi/homescreen_small_blue.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
index 096df7f..28bc33b 100644
--- a/res/drawable-xlarge-mdpi/homescreen_small_blue.9.png
+++ b/res/drawable-xlarge-mdpi/homescreen_small_blue.9.png
Binary files differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 05d37d9..addea4b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -39,7 +39,7 @@
<string name="wallpaper_instructions">Set wallpaper</string>
<!-- Option in "Select wallpaper from" dialog box -->
<string name="pick_wallpaper">Wallpapers</string>
- <!-- Displayed when user selects a shortcut for an app that was uninstalled -->
+ <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
<string name="activity_not_found">Application is not installed.</string>
<!-- List item for configuring the current wallpaper -->
<string name="configure_wallpaper">Configure...</string>
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 53a584e..121aa22 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -474,7 +474,7 @@
// 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 (mBackgroundAlpha > 0.0f) {
+ if (LauncherApplication.isScreenXLarge() && mBackgroundAlpha > 0.0f) {
Drawable bg;
boolean mini = getScaleX() < 0.5f;
@@ -646,11 +646,13 @@
@Override
public void removeAllViews() {
+ super.removeAllViews();
clearOccupiedCells();
}
@Override
public void removeAllViewsInLayout() {
+ super.removeAllViewsInLayout();
clearOccupiedCells();
}
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index ee9e7a8..83f13aa 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -995,9 +995,9 @@
final View configureButton = findViewById(R.id.configure_button);
if (LauncherApplication.isScreenXLarge()) {
- mDeleteZone.setOverlappingViews(new View[] { allAppsButton, divider, configureButton });
+ deleteZone.setOverlappingViews(new View[] { allAppsButton, divider, configureButton });
} else {
- deleteZone.setOverlappingView(configureButton);
+ deleteZone.setOverlappingView(findViewById(R.id.all_apps_button_cluster));
}
dragController.addDragListener(deleteZone);
