Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efed838c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

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

Change-Id: I6b76b96cb1f8a0f9fbc605d548442aeac41a931f
parents bf0c9e2e 916a7f68

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

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public final class FeatureFlags { 
            "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

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public class RotationHelper implements OnSharedPreferenceChangeListener { 
     */

    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;