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

Merge "Fix not updating split bounds after devices unfolded" into sc-v2-dev am: 11a26a5665

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

Change-Id: Ie2f7e00b52eee7cbdac5f606f6c4334f4c34dfa8
This commit is contained in:
Jerry Chang
2021-06-11 03:53:46 +00:00
committed by Automerger Merge Worker
parent 560208f561 11a26a5665
commit cd672f385e
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java
View File

@@ -172,13 +172,12 @@ public final class SplitLayout {
affectsLayout = true; affectsLayout = true;
} }
if (mInitialized && affectsLayout) { if (mInitialized) {
release(); release();
init(); init();
return true;
} }
return false; return affectsLayout;
} }
/** Updates recording bounds of divider window and both of the splits. */ /** Updates recording bounds of divider window and both of the splits. */

3
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
View File

@@ -602,7 +602,8 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
public void onDisplayAreaInfoChanged(DisplayAreaInfo displayAreaInfo) { public void onDisplayAreaInfoChanged(DisplayAreaInfo displayAreaInfo) {
mDisplayAreaInfo = displayAreaInfo; mDisplayAreaInfo = displayAreaInfo;
if (mSplitLayout != null if (mSplitLayout != null
&& mSplitLayout.updateConfiguration(mDisplayAreaInfo.configuration)) { && mSplitLayout.updateConfiguration(mDisplayAreaInfo.configuration)
&& mMainStage.isActive()) {
onBoundsChanged(mSplitLayout); onBoundsChanged(mSplitLayout);
} }
} }

1
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/SplitLayoutTests.java
View File

@@ -72,7 +72,6 @@ public class SplitLayoutTests extends ShellTestCase {
@UiThreadTest @UiThreadTest
public void testUpdateConfiguration() { public void testUpdateConfiguration() {
final Configuration config = getConfiguration(); final Configuration config = getConfiguration();
mSplitLayout.init();
// Verify it returns true if new config won't affect split layout. // Verify it returns true if new config won't affect split layout.
assertThat(mSplitLayout.updateConfiguration(config)).isFalse(); assertThat(mSplitLayout.updateConfiguration(config)).isFalse();