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

Commit f4399e72 authored by Michael Kolb's avatar Michael Kolb
Browse files

resolved conflict for merge from d42eeab2 to master 

Change-Id: I41bd238f0628110c923b79259de4cd11a783340c
parents 47391720 d42eeab2

core/java/android/view/ViewRootImpl.java

+9 −1
Original line number Diff line number Diff line
@@ -1173,7 +1173,15 @@ public final class ViewRootImpl implements ViewParent, 


    void dispatchApplyInsets(View host) {

        mFitSystemWindowsInsets.set(mAttachInfo.mContentInsets);

        host.dispatchApplyWindowInsets(new WindowInsets(mFitSystemWindowsInsets));

        boolean isRound = false;

        if ((mWindowAttributes.flags & WindowManager.LayoutParams.FLAG_LAYOUT_IN_OVERSCAN) != 0

                && mDisplay.getDisplayId() == 0) {

            // we're fullscreen and not hosted in an ActivityView

            isRound = mContext.getResources().getBoolean(

                    com.android.internal.R.bool.config_windowIsRound);

        }

        host.dispatchApplyWindowInsets(new WindowInsets(

                mFitSystemWindowsInsets, isRound));

    }



    private void performTraversals() {

core/java/android/view/WindowInsets.java

+5 −0
Original line number Diff line number Diff line
@@ -50,6 +50,11 @@ public class WindowInsets { 
        this(systemWindowInsets, windowDecorInsets, false);

    }



    /** @hide */

    public WindowInsets(Rect systemWindowInsets, boolean isRound) {

        this(systemWindowInsets, EMPTY_RECT, isRound);

    }



    /** @hide */

    public WindowInsets(Rect systemWindowInsets, Rect windowDecorInsets, boolean isRound) {

        mSystemWindowInsets = systemWindowInsets;

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -1429,4 +1429,7 @@ 
         2 - The device DOES NOT have a permanent menu key; ignore autodetection. -->

    <integer name="config_overrideHasPermanentMenuKey">0</integer>



    <!-- default window inset isRound property -->

    <bool name="config_windowIsRound">false</bool>



</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ 
  <java-symbol type="bool" name="config_wifi_batched_scan_supported" />

  <java-symbol type="bool" name="config_enableMultiUserUI"/>

  <java-symbol type="bool" name="config_disableUsbPermissionDialogs"/>

  <java-symbol type="bool" name="config_windowIsRound" />



  <java-symbol type="integer" name="config_cursorWindowSize" />

  <java-symbol type="integer" name="config_extraFreeKbytesAdjust" />