commit efed838c0fcc21ef7d2e13837477f860dc771c30
author android-build-team Robot <android-build-team-robot@google.com> Wed Mar 18 23:32:10 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Mar 18 23:32:10 2020 +0000
tree c6160fbd94b6268cfbae0e7c4a7cc7a20f188845
parent bf0c9e2efd435bda2162ea37c3c0e5e50f23ccc5
parent 916a7f681d13733ccabcde731f0f2b2b98f76971

Merge cherrypicks of [10735612, 10734887, 10739937] into rvc-release

Change-Id: I6b76b96cb1f8a0f9fbc605d548442aeac41a931f

src/com/android/launcher3/config/FeatureFlags.java

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 471a743..650b20a 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -156,7 +156,7 @@
             "Always use hardware optimization for folder animations.");
 
     public static final BooleanFlag ENABLE_FIXED_ROTATION_TRANSFORM = getDebugFlag(
-            FLAG_ENABLE_FIXED_ROTATION_TRANSFORM, true,
+            FLAG_ENABLE_FIXED_ROTATION_TRANSFORM, false,
             "Launch/close apps without rotation animation. Fix Launcher to portrait");
 
     public static void initialize(Context context) {

src/com/android/launcher3/states/RotationHelper.java

diff --git a/src/com/android/launcher3/states/RotationHelper.java b/src/com/android/launcher3/states/RotationHelper.java
index fae0fe2..8c8aa9b 100644
--- a/src/com/android/launcher3/states/RotationHelper.java
+++ b/src/com/android/launcher3/states/RotationHelper.java
@@ -134,7 +134,7 @@
      */
     private void updateForcedRotation(boolean setValueFromPrefs) {
         boolean isForcedRotation = mFeatureFlagsPrefs
-                .getBoolean(FLAG_ENABLE_FIXED_ROTATION_TRANSFORM, true)
+                .getBoolean(FLAG_ENABLE_FIXED_ROTATION_TRANSFORM, false)
                 && !getAllowRotationDefaultValue();
         if (mForcedRotation == isForcedRotation) {
             return;