Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8baed009d9a5358202c10c0fea0c89a400085ffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Will Osborn
2023-01-17 18:16:48 +00:00
committed by Automerger Merge Worker
parent e52bf579bd b8c2e307f7
commit ae8937f6b4
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/view/RotationPolicy.java
View File

@@ -106,7 +106,9 @@ public final class RotationPolicy {
* Enables or disables rotation lock from the system UI toggle. * Enables or disables rotation lock from the system UI toggle.
*/ */
public static void setRotationLock(Context context, final boolean enabled) { 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); setRotationLockAtAngle(context, enabled, rotation);
} }
@@ -139,6 +141,11 @@ public final class RotationPolicy {
return context.getResources().getBoolean(R.bool.config_allowAllRotations); 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) { private static void setRotationLock(final boolean enabled, final int rotation) {
AsyncTask.execute(new Runnable() { AsyncTask.execute(new Runnable() {
@Override @Override

4
core/res/res/values/config.xml
View File

@@ -560,6 +560,10 @@
rotations as the default behavior. --> rotations as the default behavior. -->
<bool name="config_allowAllRotations">false</bool> <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 <!-- If true, the direction rotation is applied to get to an application's requested
orientation is reversed. Normally, the model is that landscape is orientation is reversed. Normally, the model is that landscape is
clockwise from portrait; thus on a portrait device an app requesting clockwise from portrait; thus on a portrait device an app requesting

1
core/res/res/values/symbols.xml
View File

@@ -1721,6 +1721,7 @@
<java-symbol type="attr" name="dialogTitleDecorLayout" /> <java-symbol type="attr" name="dialogTitleDecorLayout" />
<java-symbol type="attr" name="dialogTitleIconsDecorLayout" /> <java-symbol type="attr" name="dialogTitleIconsDecorLayout" />
<java-symbol type="bool" name="config_allowAllRotations" /> <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_annoy_dianne" />
<java-symbol type="bool" name="config_startDreamImmediatelyOnDock" /> <java-symbol type="bool" name="config_startDreamImmediatelyOnDock" />
<java-symbol type="bool" name="config_carDockEnablesAccelerometer" /> <java-symbol type="bool" name="config_carDockEnablesAccelerometer" />