summaryrefslogtreecommitdiffstats
path: root/quickstep
diff options
context:
space:
mode:
authorJonathan Miranda <jonmiranda@google.com>2018-07-31 18:41:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-07-31 18:41:16 +0000
commitfaf1086f33dc0956bd3c73e0e794105cc1271f46 (patch)
tree70c6b463f9b6016aff1d6a61c43c841182bf71fd /quickstep
parente5f7acf74a89d4d3fc9d76380268d89fc6d0ee7e (diff)
parent4a2b9d5e369cc764f4a3093f4ee8b4b2b4ce2f1c (diff)
downloadandroid_packages_apps_Trebuchet-faf1086f33dc0956bd3c73e0e794105cc1271f46.tar.gz
android_packages_apps_Trebuchet-faf1086f33dc0956bd3c73e0e794105cc1271f46.tar.bz2
android_packages_apps_Trebuchet-faf1086f33dc0956bd3c73e0e794105cc1271f46.zip
Merge "Fix bug where icon appears large until transluscent activity finishes." into ub-launcher3-master
Diffstat (limited to 'quickstep')
-rw-r--r--quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
index 14633afa5..37d0b12bd 100644
--- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
@@ -537,6 +537,9 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
@Override
public void onAnimationEnd(Animator animation) {
// Reset launcher to normal state
+ if (isBubbleTextView) {
+ ((BubbleTextView) v).setStayPressed(false);
+ }
v.setVisibility(View.VISIBLE);
((ViewGroup) mDragLayer.getParent()).removeView(mFloatingView);
}