diff options
| -rw-r--r-- | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher2/BubbleTextView.java | 5 | ||||
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 6 |
4 files changed, 16 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 63d7b3b4d..0f4a3ba66 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -242,5 +242,6 @@ s --> <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/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 4dd667b58..ca4d61448 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -711,9 +711,11 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen layout.createHardwareLayers(); + /* TEMPORARILY DISABLE HOLOGRAPHIC ICONS if (mFadeInAdjacentScreens) { prepareGenerateHoloOutlinesTask(page, items, images); } + */ } /** @@ -1132,9 +1134,11 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen 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/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java index 79e27b0d3..cdc89ba61 100644 --- a/src/com/android/launcher2/BubbleTextView.java +++ b/src/com/android/launcher2/BubbleTextView.java @@ -256,6 +256,11 @@ public class BubbleTextView extends TextView { } } + void clearPressedOrFocusedBackground() { + mPressedOrFocusedBackground = null; + setCellLayoutPressedOrFocusedIcon(); + } + Bitmap getPressedOrFocusedBackground() { return mPressedOrFocusedBackground; } diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 873c03841..70289d4a0 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -1882,6 +1882,12 @@ public class Workspace extends SmoothPagedView dragRect = new Rect(0, 0, child.getWidth(), previewSize); } + // Clear the pressed state if necessary + if (child instanceof BubbleTextView) { + BubbleTextView icon = (BubbleTextView) child; + icon.clearPressedOrFocusedBackground(); + } + mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(), DragController.DRAG_ACTION_MOVE, dragRect); b.recycle(); |