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

Merge "Reconfigure display info. after configuration changes." into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-04-22 19:42:51 +00:00
committed by Android (Google) Code Review
parent e67960ecae ccdb00ccc5
commit 10f4f44efe
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -846,6 +846,13 @@ public class WindowManagerService extends IWindowManager.Stub
// since they won't be notified through the app window animator.
final List<IBinder> mNoAnimationNotifyOnTransitionFinished = new ArrayList<>();
// List of displays to reconfigure after configuration changes.
// Some of the information reported for a display is dependent on resources to do the right
// calculations. For example, {@link DisplayInfo#smallestNominalAppWidth} and company are
// dependent on the height and width of the status and nav bar which change depending on the
// current configuration.
private final DisplayContentList mReconfigureOnConfigurationChanged = new DisplayContentList();
/** Listener to notify activity manager about app transitions. */
private final WindowManagerInternal.AppTransitionListener mActivityManagerAppTransitionNotifier
= new WindowManagerInternal.AppTransitionListener() {
@@ -3694,7 +3701,19 @@ public class WindowManagerService extends IWindowManager.Stub
private int[] onConfigurationChanged() {
mPolicy.onConfigurationChanged();
getDefaultDisplayContentLocked().getDockedDividerController().onConfigurationChanged();
final DisplayContent defaultDisplayContent = getDefaultDisplayContentLocked();
if (!mReconfigureOnConfigurationChanged.contains(defaultDisplayContent)) {
// The default display size information is heavily dependent on the resources in the
// current configuration, so we need to reconfigure it everytime the configuration
// changes. See {@link PhoneWindowManager#setInitialDisplaySize}...sigh...
mReconfigureOnConfigurationChanged.add(defaultDisplayContent);
}
for (int i = mReconfigureOnConfigurationChanged.size() - 1; i >= 0; i--) {
reconfigureDisplayLocked(mReconfigureOnConfigurationChanged.remove(i));
}
defaultDisplayContent.getDockedDividerController().onConfigurationChanged();
mChangedStackList.clear();
for (int stackNdx = mStackIdToStack.size() - 1; stackNdx >= 0; stackNdx--) {
final TaskStack stack = mStackIdToStack.valueAt(stackNdx);
@@ -8852,6 +8871,9 @@ public class WindowManagerService extends IWindowManager.Stub
mWaitingForConfig = true;
startFreezingDisplayLocked(false, 0, 0);
mH.sendEmptyMessage(H.SEND_NEW_CONFIGURATION);
if (!mReconfigureOnConfigurationChanged.contains(displayContent)) {
mReconfigureOnConfigurationChanged.add(displayContent);
}
}
mWindowPlacerLocked.performSurfacePlacement();