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

Commit 281193e9 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Move content resolver call to constructor and cache 

Changing fixed rotation enabled system setting flag
should be followed by a restart of launcher for it
to take effect.

Bug: 149571513
Change-Id: I84fbb654c325076571a038604fa929984d22f254
parent 69d77263

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ public class TouchInteractionService extends Service implements PluginListener<O 
        if (TestProtocol.sDebugTracing) {

            Log.d(TestProtocol.PAUSE_NOT_DETECTED, "handleOrientationSetup.1");

        }

        if (!isFixedRotationTransformEnabled(this)) {

        if (!isFixedRotationTransformEnabled()) {

            return;

        }

        mDeviceState.enableMultipleRegions(baseInputConsumer instanceof OtherActivityInputConsumer);

quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ public class RecentsAnimationDeviceState implements 
    }



    private void setupOrientationSwipeHandler() {

        if (!isFixedRotationTransformEnabled(mContext)) {

        if (!isFixedRotationTransformEnabled()) {

            return;

        }

quickstep/src/com/android/quickstep/util/RecentsOrientedState.java

+8 −4
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre 
    private SysUINavigationMode.NavigationModeChangeListener mNavModeChangeListener =

            newMode -> setFlag(FLAG_ROTATION_WATCHER_SUPPORTED, newMode != TWO_BUTTONS);



    /** TODO: Remove once R ships. This is unlikely to change across different swipe gestures. */

    private static boolean sFixedRotationEnabled;



    private final Context mContext;

    private final ContentResolver mContentResolver;

    private final SharedPreferences mSharedPrefs;
@@ -165,7 +168,9 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre 
        if (originalSmallestWidth < 600) {

            mFlags |= FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_DENSITY;

        }

        if (isFixedRotationTransformEnabled(context)) {

        sFixedRotationEnabled = Settings.Global.getInt(

                context.getContentResolver(), FIXED_ROTATION_TRANSFORM_SETTING_NAME, 1) == 1;

        if (sFixedRotationEnabled) {

            mFlags |= FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_FLAG;

        }

        initFlags();
@@ -519,9 +524,8 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre 
     * Returns true if system can keep Launcher fixed to portrait layout even if the

     * foreground app is rotated

     */

    public static boolean isFixedRotationTransformEnabled(Context context) {

        return Settings.Global.getInt(

                context.getContentResolver(), FIXED_ROTATION_TRANSFORM_SETTING_NAME, 1) == 1;

    public static boolean isFixedRotationTransformEnabled() {

        return sFixedRotationEnabled;

    }



    @NonNull