Merge "Prevent blinking when user presses home." into ub-launcher3-master

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() {
     }
 }

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();
         }
     }