diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-02-08 03:48:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-08 03:48:56 +0000 |
| commit | 7780fa7bc711afbf89fbdc6fe94b473f2e3db3f2 (patch) | |
| tree | 4c6d37aaaa68199d58afdc15b898bb0d8ee4ce07 /src | |
| parent | ce29861598006cf2f53fce5539540d3c854a523d (diff) | |
| parent | 0d5daafd2f99945664284126f2dad75838f14e7a (diff) | |
| download | android_packages_apps_Trebuchet-7780fa7bc711afbf89fbdc6fe94b473f2e3db3f2.tar.gz android_packages_apps_Trebuchet-7780fa7bc711afbf89fbdc6fe94b473f2e3db3f2.tar.bz2 android_packages_apps_Trebuchet-7780fa7bc711afbf89fbdc6fe94b473f2e3db3f2.zip | |
Merge "Prevent blinking when user presses home." into ub-launcher3-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherAppTransitionManager.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherStateManager.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherAppTransitionManager.java b/src/com/android/launcher3/LauncherAppTransitionManager.java index c0d52c1c1..43d5e623d 100644 --- a/src/com/android/launcher3/LauncherAppTransitionManager.java +++ b/src/com/android/launcher3/LauncherAppTransitionManager.java @@ -65,7 +65,7 @@ public class LauncherAppTransitionManager { return getDefaultActivityLaunchOptions(launcher, v); } - /** Cancels the current transition animation */ - public void finishAnimation() { + /** Cancels the current Launcher transition animation */ + public void finishLauncherAnimation() { } } diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java index 4aed52099..137e4b13e 100644 --- a/src/com/android/launcher3/LauncherStateManager.java +++ b/src/com/android/launcher3/LauncherStateManager.java @@ -276,7 +276,7 @@ public class LauncherStateManager { // finish it and let this state animation take over. LauncherAppTransitionManager transitionManager = mLauncher.getAppTransitionManager(); if (transitionManager != null) { - transitionManager.finishAnimation(); + transitionManager.finishLauncherAnimation(); } } |