summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-09-30 16:52:26 -0700
committerWinson Chung <winsonc@google.com>2011-09-30 16:55:05 -0700
commit1e9cbfef04366a206d59922c14fe4356b7cca426 (patch)
tree7cfbb056efa3d1c40be95653fc81f2a3766b15fd /src
parente4a647f8793ce7823394db43d6af57f9eab8a340 (diff)
downloadandroid_packages_apps_Trebuchet-1e9cbfef04366a206d59922c14fe4356b7cca426.tar.gz
android_packages_apps_Trebuchet-1e9cbfef04366a206d59922c14fe4356b7cca426.tar.bz2
android_packages_apps_Trebuchet-1e9cbfef04366a206d59922c14fe4356b7cca426.zip
Fixing issue where folder icon shows holographic outline.
Change-Id: Iabb26cdbd25d02170f79ba030f97323120a3aa7b
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/BubbleTextView.java5
-rw-r--r--src/com/android/launcher2/Workspace.java6
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();