diff options
author | Adam Cohen <adamcohen@google.com> | 2011-09-30 20:09:57 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-30 20:09:57 -0700 |
commit | 79568720bfb745c5c136d4fbb5031a0b7e2e95ea (patch) | |
tree | 76c91f98aa69e8db57cdceba2e1277547a5ccd98 | |
parent | a91b07de99bf0ef2f93d5a4bead52f864e039c69 (diff) | |
parent | 1e9cbfef04366a206d59922c14fe4356b7cca426 (diff) | |
download | android_packages_apps_Trebuchet-79568720bfb745c5c136d4fbb5031a0b7e2e95ea.tar.gz android_packages_apps_Trebuchet-79568720bfb745c5c136d4fbb5031a0b7e2e95ea.tar.bz2 android_packages_apps_Trebuchet-79568720bfb745c5c136d4fbb5031a0b7e2e95ea.zip |
Merge "Fixing issue where folder icon shows holographic outline."
-rw-r--r-- | src/com/android/launcher2/BubbleTextView.java | 5 | ||||
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 6 |
2 files changed, 11 insertions, 0 deletions
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(); |