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

Merge "Fix a case where adding new local insets source provider was not triggering insets change." into tm-dev

Browse Source
This commit is contained in:
Gaurav Bhola
2022-02-24 21:29:00 +00:00
committed by Android (Google) Code Review
parent bb35a7ccac 01892320ec
commit c19e723931
2 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/WindowContainer.java
View File

@@ -437,15 +437,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
+ " already exists. Overwriting");
}
}
if (insetsSourceProvider == null
|| !(insetsSourceProvider instanceof RectInsetsSourceProvider)) {
insetsSourceProvider =
new RectInsetsSourceProvider(
new InsetsSource(insetsTypes[i]),
mDisplayContent.getInsetsStateController(),
mDisplayContent);
mLocalInsetsSourceProviders.put(insetsTypes[i], insetsSourceProvider);
}
insetsSourceProvider = new RectInsetsSourceProvider(new InsetsSource(insetsTypes[i]),
mDisplayContent.getInsetsStateController(), mDisplayContent);
mLocalInsetsSourceProviders.put(insetsTypes[i], insetsSourceProvider);
((RectInsetsSourceProvider) insetsSourceProvider).setRect(providerFrame);
}
mDisplayContent.getInsetsStateController().updateAboveInsetsState(true);

35
services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java
View File

@@ -1339,6 +1339,41 @@ public class WindowContainerTests extends WindowTestsBase {
}, true);
}
@Test
public void testAddLocalInsetsSourceProvider_sameType_replacesInsets() {
/*
___ rootTask ________________________________________
| | |
activity0 navigationBarInsetsProvider1 navigationBarInsetsProvider2
*/
final Task rootTask = createTask(mDisplayContent);
final ActivityRecord activity0 = createActivityRecord(mDisplayContent,
createTaskInRootTask(rootTask, 0 /* userId */));
final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams(
TYPE_BASE_APPLICATION);
attrs.setTitle("AppWindow0");
activity0.addWindow(createWindowState(attrs, activity0));
Rect navigationBarInsetsRect1 = new Rect(0, 200, 1080, 700);
Rect navigationBarInsetsRect2 = new Rect(0, 0, 1080, 200);
rootTask.addLocalRectInsetsSourceProvider(navigationBarInsetsRect1,
new int[]{ITYPE_LOCAL_NAVIGATION_BAR_1});
activity0.forAllWindows(window -> {
assertEquals(navigationBarInsetsRect1,
window.getInsetsState().peekSource(ITYPE_LOCAL_NAVIGATION_BAR_1).getFrame());
}, true);
rootTask.addLocalRectInsetsSourceProvider(navigationBarInsetsRect2,
new int[]{ITYPE_LOCAL_NAVIGATION_BAR_1});
activity0.forAllWindows(window -> {
assertEquals(navigationBarInsetsRect2,
window.getInsetsState().peekSource(ITYPE_LOCAL_NAVIGATION_BAR_1).getFrame());
}, true);
}
@Test
public void testRemoveLocalInsetsSourceProvider() {
/*