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

Merge "Dismiss immersive mode confirmation on setting changed to confirm" into sc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2021-05-07 03:40:29 +00:00
committed by Android (Google) Code Review
parent 397273a160 702928a093
commit c41c018ac8
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -2861,6 +2861,10 @@ public class DisplayPolicy {
mImmersiveModeConfirmation.onLockTaskModeChangedLw(lockTaskState);
}
boolean onSystemUiSettingsChanged() {
return mImmersiveModeConfirmation.onSettingChanged(mService.mCurrentUserId);
}
/**
* Request a screenshot be taken.
*

9
services/core/java/com/android/server/wm/ImmersiveModeConfirmation.java
View File

@@ -148,6 +148,15 @@ public class ImmersiveModeConfirmation {
}
}
boolean onSettingChanged(int currentUserId) {
final boolean changed = loadSetting(currentUserId, mContext);
// Remove the window if the setting changes to be confirmed.
if (changed && sConfirmed) {
mHandler.sendEmptyMessage(H.HIDE);
}
return changed;
}
void immersiveModeChangedLw(int rootDisplayAreaId, boolean isImmersiveMode,
boolean userSetupComplete, boolean navBarEmpty) {
mHandler.removeMessages(H.SHOW);

23
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -818,7 +818,7 @@ public class WindowManagerService extends IWindowManager.Stub
}
if (mImmersiveModeConfirmationsUri.equals(uri) || mPolicyControlUri.equals(uri)) {
updateSystemUiSettings();
updateSystemUiSettings(true /* handleChange */);
return;
}
@@ -874,17 +874,22 @@ public class WindowManagerService extends IWindowManager.Stub
}
void loadSettings() {
updateSystemUiSettings();
updateSystemUiSettings(false /* handleChange */);
updatePointerLocation();
}
void updateSystemUiSettings() {
boolean changed;
void updateSystemUiSettings(boolean handleChange) {
synchronized (mGlobalLock) {
changed = ImmersiveModeConfirmation.loadSetting(mCurrentUserId, mContext);
}
if (changed) {
updateRotation(false /* alwaysSendConfiguration */, false /* forceRelayout */);
boolean changed = false;
if (handleChange) {
changed = getDefaultDisplayContentLocked().getDisplayPolicy()
.onSystemUiSettingsChanged();
} else {
ImmersiveModeConfirmation.loadSetting(mCurrentUserId, mContext);
}
if (changed) {
mWindowPlacerLocked.requestTraversal();
}
}
}
@@ -2990,7 +2995,7 @@ public class WindowManagerService extends IWindowManager.Stub
@Override
public void onUserSwitched() {
mSettingsObserver.updateSystemUiSettings();
mSettingsObserver.updateSystemUiSettings(true /* handleChange */);
synchronized (mGlobalLock) {
// force a re-application of focused window sysui visibility on each display.
mRoot.forAllDisplayPolicies(DisplayPolicy::resetSystemUiVisibilityLw);