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

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

Remove special logic for top/bottom gesture insets 

With the removal, only the insets with mandatory gesture types provides
mandatory gesture insets. Previously we treat the top and bottom gesture
insets differently.

Modified to addWindowLw to let the bars provide correct insets type
corresponding to the change.

Bug: 161689946
Test: DisplayPolicyTests DisplayPolicyLayoutTests
Change-Id: I91f19d4b50d06a8afcac8355d08e1634973127f1
parent d8343be5

core/java/android/view/InsetsState.java

+2 −2
Original line number Diff line number Diff line
@@ -576,13 +576,13 @@ public class InsetsState implements Parcelable { 
                return Type.CAPTION_BAR;

            case ITYPE_IME:

                return Type.IME;

            case ITYPE_TOP_GESTURES:

            case ITYPE_BOTTOM_GESTURES:

            case ITYPE_TOP_MANDATORY_GESTURES:

            case ITYPE_BOTTOM_MANDATORY_GESTURES:

            case ITYPE_LEFT_MANDATORY_GESTURES:

            case ITYPE_RIGHT_MANDATORY_GESTURES:

                return Type.MANDATORY_SYSTEM_GESTURES;

            case ITYPE_TOP_GESTURES:

            case ITYPE_BOTTOM_GESTURES:

            case ITYPE_LEFT_GESTURES:

            case ITYPE_RIGHT_GESTURES:

                return Type.SYSTEM_GESTURES;

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

+4 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECOND 
import static android.content.res.Configuration.UI_MODE_TYPE_CAR;

import static android.content.res.Configuration.UI_MODE_TYPE_MASK;

import static android.view.Display.TYPE_INTERNAL;

import static android.view.InsetsState.ITYPE_BOTTOM_GESTURES;

import static android.view.InsetsState.ITYPE_BOTTOM_MANDATORY_GESTURES;

import static android.view.InsetsState.ITYPE_BOTTOM_TAPPABLE_ELEMENT;

import static android.view.InsetsState.ITYPE_CAPTION_BAR;

import static android.view.InsetsState.ITYPE_CLIMATE_BAR;
@@ -35,7 +35,7 @@ import static android.view.InsetsState.ITYPE_LEFT_GESTURES; 
import static android.view.InsetsState.ITYPE_NAVIGATION_BAR;

import static android.view.InsetsState.ITYPE_RIGHT_GESTURES;

import static android.view.InsetsState.ITYPE_STATUS_BAR;

import static android.view.InsetsState.ITYPE_TOP_GESTURES;

import static android.view.InsetsState.ITYPE_TOP_MANDATORY_GESTURES;

import static android.view.InsetsState.ITYPE_TOP_TAPPABLE_ELEMENT;

import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS;

import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;
@@ -1077,7 +1077,7 @@ public class DisplayPolicy { 
                            rect.bottom = rect.top + getStatusBarHeight(displayFrames);

                        };

                mDisplayContent.setInsetProvider(ITYPE_STATUS_BAR, win, frameProvider);

                mDisplayContent.setInsetProvider(ITYPE_TOP_GESTURES, win, frameProvider);

                mDisplayContent.setInsetProvider(ITYPE_TOP_MANDATORY_GESTURES, win, frameProvider);

                mDisplayContent.setInsetProvider(ITYPE_TOP_TAPPABLE_ELEMENT, win, frameProvider);

                break;

            case TYPE_NAVIGATION_BAR:
@@ -1104,7 +1104,7 @@ public class DisplayPolicy { 
                        (displayFrames, windowState, inOutFrame) ->

                                inOutFrame.set(windowState.getFrame()));



                mDisplayContent.setInsetProvider(ITYPE_BOTTOM_GESTURES, win,

                mDisplayContent.setInsetProvider(ITYPE_BOTTOM_MANDATORY_GESTURES, win,

                        (displayFrames, windowState, inOutFrame) -> {

                            inOutFrame.top -= mBottomGestureAdditionalInset;

                        });