commit 64d5f27f039f3843f9bfbf615c4c3ddf04fd2335
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Sep 11 17:25:44 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 11 17:25:44 2018 +0000
tree 8e732f7df010a529b952bb5b3c92de90bac55818
parent 447036d0d70ec90d05ad5ab25499fabefda6245b
parent 05fbc5381720f3ef3a6ac8c37d689beb367f77ed

Merge "Do not ask for rotation lock when controlling quickscrub from launcher activtiy" into ub-launcher3-master

quickstep/src/com/android/quickstep/ActivityControlHelper.java

diff --git a/quickstep/src/com/android/quickstep/ActivityControlHelper.java b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
index 4b91810..f39a007 100644
--- a/quickstep/src/com/android/quickstep/ActivityControlHelper.java
+++ b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
@@ -161,9 +161,11 @@
                     .getQuickScrubController();
             controller.onQuickScrubStart(activityVisible && !fromState.overviewUi, this);
 
-            // For the duration of the gesture, lock the screen orientation to ensure that we do not
-            // rotate mid-quickscrub
-            activity.getRotationHelper().setStateHandlerRequest(REQUEST_LOCK);
+            if (!activityVisible) {
+                // For the duration of the gesture, lock the screen orientation to ensure that we
+                // do not rotate mid-quickscrub
+                activity.getRotationHelper().setStateHandlerRequest(REQUEST_LOCK);
+            }
         }
 
         @Override