Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c19e7239 authored by Gaurav Bhola's avatar Gaurav Bhola Committed by Android (Google) Code Review
Browse files

Merge "Fix a case where adding new local insets source provider was not... 

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

services/core/java/com/android/server/wm/WindowContainer.java

+3 −9
Original line number Diff line number Diff line
@@ -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);

            insetsSourceProvider = new RectInsetsSourceProvider(new InsetsSource(insetsTypes[i]),

                    mDisplayContent.getInsetsStateController(), mDisplayContent);

            mLocalInsetsSourceProviders.put(insetsTypes[i], insetsSourceProvider);

            }

            ((RectInsetsSourceProvider) insetsSourceProvider).setRect(providerFrame);

        }

        mDisplayContent.getInsetsStateController().updateAboveInsetsState(true);

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

+35 −0
Original line number Diff line number Diff line
@@ -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() {

         /*