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

Commit ae8937f6 authored by Will Osborn's avatar Will Osborn Committed by Automerger Merge Worker
Browse files

Merge "Allow rotations to portrait on unlocking when unfolded" into tm-qpr-dev am: b8c2e307 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20896921



Change-Id: I8baed009d9a5358202c10c0fea0c89a400085ffa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e52bf579 b8c2e307

core/java/com/android/internal/view/RotationPolicy.java

+8 −1
Original line number Diff line number Diff line
@@ -106,7 +106,9 @@ public final class RotationPolicy { 
     * Enables or disables rotation lock from the system UI toggle.

     */

    public static void setRotationLock(Context context, final boolean enabled) {

        final int rotation = areAllRotationsAllowed(context) ? CURRENT_ROTATION : NATURAL_ROTATION;

        final int rotation = areAllRotationsAllowed(context)

                || useCurrentRotationOnRotationLockChange(context) ? CURRENT_ROTATION

                : NATURAL_ROTATION;

        setRotationLockAtAngle(context, enabled, rotation);

    }
@@ -139,6 +141,11 @@ public final class RotationPolicy { 
        return context.getResources().getBoolean(R.bool.config_allowAllRotations);

    }



    private static boolean useCurrentRotationOnRotationLockChange(Context context) {

        return context.getResources().getBoolean(

                R.bool.config_useCurrentRotationOnRotationLockChange);

    }



    private static void setRotationLock(final boolean enabled, final int rotation) {

        AsyncTask.execute(new Runnable() {

            @Override

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -560,6 +560,10 @@ 
         rotations as the default behavior. -->

    <bool name="config_allowAllRotations">false</bool>



    <!-- If false and config_allowAllRotations is false, the screen will rotate to the natural

         orientation of the device when the auto-rotate policy is toggled. -->

    <bool name="config_useCurrentRotationOnRotationLockChange">false</bool>



    <!-- If true, the direction rotation is applied to get to an application's requested

         orientation is reversed.  Normally, the model is that landscape is

         clockwise from portrait; thus on a portrait device an app requesting

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1721,6 +1721,7 @@ 
  <java-symbol type="attr" name="dialogTitleDecorLayout" />

  <java-symbol type="attr" name="dialogTitleIconsDecorLayout" />

  <java-symbol type="bool" name="config_allowAllRotations" />

  <java-symbol type="bool" name="config_useCurrentRotationOnRotationLockChange"/>

  <java-symbol type="bool" name="config_annoy_dianne" />

  <java-symbol type="bool" name="config_startDreamImmediatelyOnDock" />

  <java-symbol type="bool" name="config_carDockEnablesAccelerometer" />