diff options
author | Alex Mang <alexmang@google.com> | 2019-05-01 23:59:09 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-01 23:59:09 +0000 |
commit | 35bda496f3086cd12820207802b14df3fbf4774c (patch) | |
tree | efd8d68e13cbcaee32e3d6a396978f3fbbe7c1f5 /src | |
parent | f57c62c091e6fad067afe61e3ad9f349123b7ff0 (diff) | |
parent | 497708c2972566749f24ede839b4ec92313a272f (diff) | |
download | android_packages_apps_Trebuchet-35bda496f3086cd12820207802b14df3fbf4774c.tar.gz android_packages_apps_Trebuchet-35bda496f3086cd12820207802b14df3fbf4774c.tar.bz2 android_packages_apps_Trebuchet-35bda496f3086cd12820207802b14df3fbf4774c.zip |
Merge "Clear should not show after Widget Configuration activity" into ub-launcher3-qt-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/DropTargetBar.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/DropTargetBar.java b/src/com/android/launcher3/DropTargetBar.java index 0543e8d71..ca001a35b 100644 --- a/src/com/android/launcher3/DropTargetBar.java +++ b/src/com/android/launcher3/DropTargetBar.java @@ -204,7 +204,7 @@ public class DropTargetBar extends FrameLayout return visibleCount; } - private void animateToVisibility(boolean isVisible) { + public void animateToVisibility(boolean isVisible) { if (mVisible != isVisible) { mVisible = isVisible; diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index fda674f22..ddaaa5d08 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -879,7 +879,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, super.onPause(); mDragController.cancelDrag(); mDragController.resetLastGestureUpTime(); - + mDropTargetBar.animateToVisibility(false); if (mLauncherCallbacks != null) { mLauncherCallbacks.onPause(); } |