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

Commit e8f7e70e authored by Yunfan Chen's avatar Yunfan Chen
Browse files

Do not override insets frame if not set 

Only set imeFrameProvider if the value is set in the base layout params.
This will improve the performance as the null provider can be skipped,
in the meanwhile, it will fix an error where the ime frame is
accidentally overridden.

Test: KeyboardVisibilityControlTest (CTS, on auto builds)
Bug: 229346670
Change-Id: Iaf6298e81c92b8dd221cae79e6391799b8023e95
parent e41f27bf

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

+15 −13
Original line number Diff line number Diff line
@@ -1190,7 +1190,8 @@ public class DisplayPolicy { 
                if (attrs.providesInsetsTypes != null) {

                    for (@InternalInsetsType int insetsType : attrs.providesInsetsTypes) {

                        final TriConsumer<DisplayFrames, WindowContainer, Rect> imeFrameProvider =

                                (displayFrames, windowContainer, inOutFrame) -> {

                                win.getAttrs().providedInternalImeInsets != null

                                        ? (displayFrames, windowContainer, inOutFrame) -> {

                                    final Insets[] providedInternalImeInsets =

                                            win.getLayoutingAttrs(displayFrames.mRotation)

                                                    .providedInternalImeInsets;
@@ -1199,7 +1200,7 @@ public class DisplayPolicy { 
                                            && providedInternalImeInsets[insetsType] != null) {

                                        inOutFrame.inset(providedInternalImeInsets[insetsType]);

                                    }

                                };

                                } : null;

                        switch (insetsType) {

                            case ITYPE_STATUS_BAR:

                                mStatusBarAlt = win;
@@ -1218,7 +1219,8 @@ public class DisplayPolicy { 
                                mExtraNavBarAltPosition = getAltBarPosition(attrs);

                                break;

                        }

                        mDisplayContent.setInsetProvider(insetsType, win, (displayFrames,

                        mDisplayContent.setInsetProvider(insetsType, win,

                                win.getAttrs().providedInternalInsets != null ? (displayFrames,

                                        windowContainer, inOutFrame) -> {

                                    final Insets[] providedInternalInsets = win.getLayoutingAttrs(

                                            displayFrames.mRotation).providedInternalInsets;
@@ -1228,7 +1230,7 @@ public class DisplayPolicy { 
                                        inOutFrame.inset(providedInternalInsets[insetsType]);

                                    }

                                    inOutFrame.inset(win.mGivenContentInsets);

                        }, imeFrameProvider);

                                } : null, imeFrameProvider);

                        mInsetsSourceWindowsExceptIme.add(win);

                    }

                }