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

Merge "Read isKeyguardScreenRotationAllowed each time instead of caching" into sc-v2-dev am: f1edea6716

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

Change-Id: I530062a258a275badc4bd5268146d5d9caeedaed
This commit is contained in:
Alex Florescu
2021-08-11 15:33:34 +00:00
committed by Automerger Merge Worker
parent 3cbca3331b f1edea6716
commit cf79a70c66
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java
View File

@@ -84,8 +84,8 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
private final WindowManager mWindowManager; private final WindowManager mWindowManager;
private final IActivityManager mActivityManager; private final IActivityManager mActivityManager;
private final DozeParameters mDozeParameters; private final DozeParameters mDozeParameters;
private final KeyguardStateController mKeyguardStateController;
private final LayoutParams mLpChanged; private final LayoutParams mLpChanged;
private final boolean mKeyguardScreenRotation;
private final long mLockScreenDisplayTimeout; private final long mLockScreenDisplayTimeout;
private final float mKeyguardPreferredRefreshRate; // takes precedence over max private final float mKeyguardPreferredRefreshRate; // takes precedence over max
private final float mKeyguardMaxRefreshRate; private final float mKeyguardMaxRefreshRate;
@@ -123,8 +123,8 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
mContext = context; mContext = context;
mWindowManager = windowManager; mWindowManager = windowManager;
mActivityManager = activityManager; mActivityManager = activityManager;
mKeyguardScreenRotation = keyguardStateController.isKeyguardScreenRotationAllowed();
mDozeParameters = dozeParameters; mDozeParameters = dozeParameters;
mKeyguardStateController = keyguardStateController;
mScreenBrightnessDoze = mDozeParameters.getScreenBrightnessDoze(); mScreenBrightnessDoze = mDozeParameters.getScreenBrightnessDoze();
mLpChanged = new LayoutParams(); mLpChanged = new LayoutParams();
mKeyguardViewMediator = keyguardViewMediator; mKeyguardViewMediator = keyguardViewMediator;
@@ -323,7 +323,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
private void adjustScreenOrientation(State state) { private void adjustScreenOrientation(State state) {
if (state.isKeyguardShowingAndNotOccluded() || state.mDozing) { if (state.isKeyguardShowingAndNotOccluded() || state.mDozing) {
if (mKeyguardScreenRotation) { if (mKeyguardStateController.isKeyguardScreenRotationAllowed()) {
mLpChanged.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_USER; mLpChanged.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_USER;
} else { } else {
mLpChanged.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR; mLpChanged.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;