Merge branch 'master' into honeycomb-release
* master:
Re-enabling clipping of children in cell layout (not necessary now that hotdog is out).
Fix mipmap generation with RS API update.
Removing "phone" from the only string that used it
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a8a9969..4879052 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -40,7 +40,7 @@
<!-- 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 -->
- <string name="activity_not_found">Application is not installed on your phone.</string>
+ <string name="activity_not_found">Application is not installed.</string>
<!-- List item for configuring the current wallpaper -->
<string name="configure_wallpaper">Configure...</string>
<!-- Labels for the tabs in the customize drawer -->
diff --git a/src/com/android/launcher2/AllApps3D.java b/src/com/android/launcher2/AllApps3D.java
index 5584dcb..9f40b55 100644
--- a/src/com/android/launcher2/AllApps3D.java
+++ b/src/com/android/launcher2/AllApps3D.java
@@ -1251,8 +1251,12 @@
}
private void createAppIconAllocations(int index, ApplicationInfo item) {
- mIcons[index] = Allocation.createFromBitmap(sRS, item.iconBitmap);
- mLabels[index] = Allocation.createFromBitmap(sRS, item.titleBitmap);
+ mIcons[index] = Allocation.createFromBitmap(sRS, item.iconBitmap,
+ Allocation.MipmapControl.MIPMAP_ON_SYNC_TO_TEXTURE,
+ Allocation.USAGE_GRAPHICS_TEXTURE);
+ mLabels[index] = Allocation.createFromBitmap(sRS, item.titleBitmap,
+ Allocation.MipmapControl.MIPMAP_ON_SYNC_TO_TEXTURE,
+ Allocation.USAGE_GRAPHICS_TEXTURE);
}
/**
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index daaf4be..fd0ef51 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -139,7 +139,6 @@
// A ViewGroup usually does not draw, but CellLayout needs to draw a rectangle to show
// the user where a dragged item will land when dropped.
setWillNotDraw(false);
- setClipChildren(false);
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CellLayout, defStyle, 0);