From 5760ca1769b719eaf8528aa992216bdb47925ab2 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 10 Jul 2017 12:52:00 -0700
Subject: [PATCH] Do not run page snap animation if already on the default page

Bug: 63454716
Change-Id: Ibf3eea7f1b967c6e43042c87fd4545c03edf38e8
---
 src/com/android/launcher3/Workspace.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 5065a09509..063a9a292c 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3979,8 +3979,9 @@ public class Workspace extends PagedView
         }
     }
 
-    private void moveToScreen(int page, boolean animate) {
-        if (!workspaceInModalState()) {
+    void moveToDefaultScreen(boolean animate) {
+        int page = getDefaultPage();
+        if (!workspaceInModalState() && getCurrentPage() != page) {
             if (animate) {
                 snapToPage(page);
             } else {
@@ -3993,10 +3994,6 @@ public class Workspace extends PagedView
         }
     }
 
-    void moveToDefaultScreen(boolean animate) {
-        moveToScreen(getDefaultPage(), animate);
-    }
-
     void moveToCustomContentScreen(boolean animate) {
         if (hasCustomContent()) {
             int ccIndex = getPageIndexForScreenId(CUSTOM_CONTENT_SCREEN_ID);