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

Merge "Gates RotationResolverService with a config flag" into tm-qpr-dev am: d0b406dd51

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

Change-Id: I6e75f88e724f6f023f607454b1e9964d5d53c043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yi Jiang
2023-04-26 05:14:05 +00:00
committed by Automerger Merge Worker
parent 9b25a61c51 d0b406dd51
commit 4178e2cb57
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -558,6 +558,9 @@
docked if the dock is configured to enable the accelerometer. --> docked if the dock is configured to enable the accelerometer. -->
<bool name="config_supportAutoRotation">true</bool> <bool name="config_supportAutoRotation">true</bool>
<!-- If true, allows rotation resolver service to help resolve screen rotation. -->
<bool name="config_allowRotationResolver">true</bool>
<!-- If true, the screen can be rotated via the accelerometer in all 4 <!-- If true, the screen can be rotated via the accelerometer in all 4
rotations as the default behavior. --> rotations as the default behavior. -->
<bool name="config_allowAllRotations">false</bool> <bool name="config_allowAllRotations">false</bool>

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

@@ -1715,6 +1715,7 @@
<java-symbol type="integer" name="config_motionPredictionOffsetNanos" /> <java-symbol type="integer" name="config_motionPredictionOffsetNanos" />
<java-symbol type="bool" name="config_showNavigationBar" /> <java-symbol type="bool" name="config_showNavigationBar" />
<java-symbol type="bool" name="config_supportAutoRotation" /> <java-symbol type="bool" name="config_supportAutoRotation" />
<java-symbol type="bool" name="config_allowRotationResolver" />
<java-symbol type="bool" name="config_dockedStackDividerFreeSnapMode" /> <java-symbol type="bool" name="config_dockedStackDividerFreeSnapMode" />
<java-symbol type="dimen" name="docked_stack_divider_thickness" /> <java-symbol type="dimen" name="docked_stack_divider_thickness" />
<java-symbol type="dimen" name="docked_stack_divider_insets" /> <java-symbol type="dimen" name="docked_stack_divider_insets" />

6
services/core/java/com/android/server/wm/DisplayRotation.java
View File

@@ -123,6 +123,7 @@ public class DisplayRotation {
public final boolean isDefaultDisplay; public final boolean isDefaultDisplay;
private final boolean mSupportAutoRotation; private final boolean mSupportAutoRotation;
private final boolean mAllowRotationResolver;
private final int mLidOpenRotation; private final int mLidOpenRotation;
private final int mCarDockRotation; private final int mCarDockRotation;
private final int mDeskDockRotation; private final int mDeskDockRotation;
@@ -272,6 +273,8 @@ public class DisplayRotation {
mSupportAutoRotation = mSupportAutoRotation =
mContext.getResources().getBoolean(R.bool.config_supportAutoRotation); mContext.getResources().getBoolean(R.bool.config_supportAutoRotation);
mAllowRotationResolver =
mContext.getResources().getBoolean(R.bool.config_allowRotationResolver);
mLidOpenRotation = readRotation(R.integer.config_lidOpenRotation); mLidOpenRotation = readRotation(R.integer.config_lidOpenRotation);
mCarDockRotation = readRotation(R.integer.config_carDockRotation); mCarDockRotation = readRotation(R.integer.config_carDockRotation);
mDeskDockRotation = readRotation(R.integer.config_deskDockRotation); mDeskDockRotation = readRotation(R.integer.config_deskDockRotation);
@@ -2041,7 +2044,8 @@ public class DisplayRotation {
@Override @Override
public boolean isRotationResolverEnabled() { public boolean isRotationResolverEnabled() {
return mUserRotationMode == WindowManagerPolicy.USER_ROTATION_FREE return mAllowRotationResolver
&& mUserRotationMode == WindowManagerPolicy.USER_ROTATION_FREE
&& mCameraRotationMode == CAMERA_ROTATION_ENABLED && mCameraRotationMode == CAMERA_ROTATION_ENABLED
&& !mService.mPowerManager.isPowerSaveMode(); && !mService.mPowerManager.isPowerSaveMode();
} }