diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-10-05 11:40:05 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2017-10-06 09:07:36 -0700 |
| commit | 3dce5f3f507d0fbd27ab9c62ad66e0259abf22b3 (patch) | |
| tree | 8428171acce6b8cbae91479c17fecd039aa2c0e7 /src/com/android/launcher3/BubbleTextView.java | |
| parent | a9e345f886fe73435e727ef2ff286c2363c2a3c1 (diff) | |
| download | android_packages_apps_Trebuchet-3dce5f3f507d0fbd27ab9c62ad66e0259abf22b3.tar.gz android_packages_apps_Trebuchet-3dce5f3f507d0fbd27ab9c62ad66e0259abf22b3.tar.bz2 android_packages_apps_Trebuchet-3dce5f3f507d0fbd27ab9c62ad66e0259abf22b3.zip | |
Merging duplicate logic for deferred drop handling in Worksace and Folder
> All the logic is contained in UninstallDropTarget
> Also fixing a bug were mWaitingForResume was not cleared
Bug: 34692289
Change-Id: I617475ce53062902d6817954fb608198e6e03d3c
Diffstat (limited to 'src/com/android/launcher3/BubbleTextView.java')
| -rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index 485125e03..cd72fbace 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -42,6 +42,7 @@ import android.widget.TextView; import com.android.launcher3.IconCache.IconLoadRequest; import com.android.launcher3.IconCache.ItemInfoUpdateReceiver; +import com.android.launcher3.Launcher.OnResumeCallback; import com.android.launcher3.badge.BadgeInfo; import com.android.launcher3.badge.BadgeRenderer; import com.android.launcher3.folder.FolderIcon; @@ -59,7 +60,7 @@ import java.text.NumberFormat; * because we want to make the bubble taller than the text and TextView's clip is * too aggressive. */ -public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver { +public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, OnResumeCallback { private static final int DISPLAY_WORKSPACE = 0; private static final int DISPLAY_ALL_APPS = 1; @@ -330,6 +331,13 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver { refreshDrawableState(); } + @Override + public void onLauncherResume() { + // Reset the pressed state of icon that was locked in the press state while activity + // was launching + setStayPressed(false); + } + void clearPressedBackground() { setPressed(false); setStayPressed(false); |