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

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

Exclude extra navigation bar insets for floating windows 

Extra navigation bar should be treated as navigation bar for floating
window and PIP window. It should not affect the content layout.

Bug: 160750722
Test: Add extra navigation bar from system UI, and launch a freeform
      window to test.
Test: go/wm-smoke
Change-Id: I145881e3e87f5f0ef0866ca5143121f76dc7dace
parent 95959617

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

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.wm; 
import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.view.InsetsState.ITYPE_CAPTION_BAR;

import static android.view.InsetsState.ITYPE_EXTRA_NAVIGATION_BAR;

import static android.view.InsetsState.ITYPE_IME;

import static android.view.InsetsState.ITYPE_INVALID;

import static android.view.InsetsState.ITYPE_NAVIGATION_BAR;
@@ -171,6 +172,7 @@ class InsetsStateController { 
            state = new InsetsState(state);

            state.removeSource(ITYPE_STATUS_BAR);

            state.removeSource(ITYPE_NAVIGATION_BAR);

            state.removeSource(ITYPE_EXTRA_NAVIGATION_BAR);

        }



        if (aboveIme) {