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

Commit a76164e1 authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android (Google) Code Review
Browse files

Merge "Only use bottom outset for main display." into klp-modular-dev

parents e1e81a9e b57503c3

policy/src/com/android/internal/policy/impl/PhoneWindow.java

+12 −3
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ import android.util.SparseArray; 
import android.util.TypedValue;

import android.view.ActionMode;

import android.view.ContextThemeWrapper;

import android.view.Display;

import android.view.Gravity;

import android.view.IRotationWatcher;

import android.view.IWindowManager;
@@ -2941,9 +2942,17 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
            a.getValue(com.android.internal.R.styleable.Window_windowFixedHeightMinor,

                    mFixedHeightMinor);

        }

        if (a.hasValue(com.android.internal.R.styleable.Window_windowOutsetBottom)) {



        final WindowManager windowService = (WindowManager) getContext().getSystemService(

                Context.WINDOW_SERVICE);

        if (windowService != null) {

            final Display display = windowService.getDefaultDisplay();

            if (display.getDisplayId() == Display.DEFAULT_DISPLAY &&

                    a.hasValue(com.android.internal.R.styleable.Window_windowOutsetBottom)) {

                if (mOutsetBottom == null) mOutsetBottom = new TypedValue();

            a.getValue(com.android.internal.R.styleable.Window_windowOutsetBottom, mOutsetBottom);

                a.getValue(com.android.internal.R.styleable.Window_windowOutsetBottom,

                        mOutsetBottom);

            }

        }



        final Context context = getContext();