Merge "Fixing issue where folder icon shows holographic outline."
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 63d7b3b..0f4a3ba 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -242,5 +242,6 @@
<string name="folder_cling_create_folder">To make a new folder on your home screen, stack one app on top of another.</string>
<!-- The text on the button to dismiss a cling [CHAR_LIMIT=none] -->
<string name="cling_dismiss">OK</string>
+ <add-resource type="string" name="default_folder_name" />
</resources>
diff --git a/src/com/android/launcher2/AppWidgetResizeFrame.java b/src/com/android/launcher2/AppWidgetResizeFrame.java
index 4762193..b7943ec 100644
--- a/src/com/android/launcher2/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher2/AppWidgetResizeFrame.java
@@ -111,11 +111,11 @@
Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM);
addView(mBottomHandle, lp);
- Resources r = context.getResources();
- mWidgetPaddingLeft = r.getDimensionPixelSize(R.dimen.app_widget_padding_left);
- mWidgetPaddingTop = r.getDimensionPixelSize(R.dimen.app_widget_padding_top);
- mWidgetPaddingRight = r.getDimensionPixelSize(R.dimen.app_widget_padding_right);
- mWidgetPaddingBottom = r.getDimensionPixelSize(R.dimen.app_widget_padding_bottom);
+ Launcher.Padding p = mLauncher.getPaddingForWidget(widgetView.getAppWidgetInfo().provider);
+ mWidgetPaddingLeft = p.left;
+ mWidgetPaddingTop = p.top;
+ mWidgetPaddingRight = p.right;
+ mWidgetPaddingBottom = p.bottom;
if (mResizeMode == AppWidgetProviderInfo.RESIZE_HORIZONTAL) {
mTopHandle.setVisibility(GONE);
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index 4dd667b..ca4d614 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -711,9 +711,11 @@
layout.createHardwareLayers();
+ /* TEMPORARILY DISABLE HOLOGRAPHIC ICONS
if (mFadeInAdjacentScreens) {
prepareGenerateHoloOutlinesTask(page, items, images);
}
+ */
}
/**
@@ -1132,9 +1134,11 @@
invalidate();
forceUpdateAdjacentPagesAlpha();
+ /* TEMPORARILY DISABLE HOLOGRAPHIC ICONS
if (mFadeInAdjacentScreens) {
prepareGenerateHoloOutlinesTask(data.page, data.items, data.generatedImages);
}
+ */
}
private void onHolographicPageItemsLoaded(AsyncTaskPageData data) {
// Invalidate early to short-circuit children invalidates
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 02fccc5..83bce6d 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -75,9 +75,9 @@
import android.view.MotionEvent;
import android.view.Surface;
import android.view.View;
-import android.view.View.OnLongClickListener;
import android.view.ViewGroup;
import android.view.WindowManager;
+import android.view.View.OnLongClickListener;
import android.view.accessibility.AccessibilityEvent;
import android.view.animation.AccelerateDecelerateInterpolator;
import android.view.animation.AccelerateInterpolator;
@@ -876,10 +876,16 @@
if (appInfo.targetSdkVersion >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
Resources r = getResources();
- p.left = r.getDimensionPixelSize(R.dimen.app_widget_padding_left);
- p.right = r.getDimensionPixelSize(R.dimen.app_widget_padding_right);
- p.top = r.getDimensionPixelSize(R.dimen.app_widget_padding_top);
- p.bottom = r.getDimensionPixelSize(R.dimen.app_widget_padding_bottom);
+ // The default padding values are private API currently, but will be added in
+ // API level 15. The current values are (8, 8, 8, 8).
+ p.left = r.getDimensionPixelSize(com.android.internal.
+ R.dimen.default_app_widget_padding_left);
+ p.right = r.getDimensionPixelSize(com.android.internal.
+ R.dimen.default_app_widget_padding_right);
+ p.top = r.getDimensionPixelSize(com.android.internal.
+ R.dimen.default_app_widget_padding_top);
+ p.bottom = r.getDimensionPixelSize(com.android.internal.
+ R.dimen.default_app_widget_padding_bottom);
}
return p;
diff --git a/src/com/android/launcher2/LauncherAppWidgetHostView.java b/src/com/android/launcher2/LauncherAppWidgetHostView.java
index 7917118..1a4a45e 100644
--- a/src/com/android/launcher2/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher2/LauncherAppWidgetHostView.java
@@ -116,18 +116,6 @@
}
@Override
- public void setAppWidget(int appWidgetId, AppWidgetProviderInfo info) {
- super.setAppWidget(appWidgetId, info);
- // Sometimes the AppWidgetManager returns a null AppWidgetProviderInfo object for
- // a widget, eg. for some widgets in safe mode.
- if (info != null) {
- // We add necessary padding to the AppWidgetHostView
- Launcher.Padding padding = mLauncher.getPaddingForWidget(info.provider);
- setPadding(padding.left, padding.top, padding.right, padding.bottom);
- }
- }
-
- @Override
public int getDescendantFocusability() {
return ViewGroup.FOCUS_BLOCK_DESCENDANTS;
}