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

Commit e742689c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8445529 from f7369c8b to tm-qpr1-release 

Change-Id: I409ae7690449989e85a1a80b2e092c92098a1ca5
parents e0b3a43d f7369c8b

core/java/android/view/WindowInsets.java

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ public final class WindowInsets { 
    @Deprecated

    @NonNull

    public Insets getStableInsets() {

        return getInsets(mTypeMaxInsetsMap, mCompatInsetsTypes);

        return getInsets(mTypeMaxInsetsMap, systemBars());

    }



    /**

core/java/com/android/internal/policy/PhoneWindow.java

+6 −0
Original line number Diff line number Diff line
@@ -912,6 +912,12 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
            }

        }



        if (!st.hasPanelItems()) {

            // Ensure that |st.decorView| has its actual content. Otherwise, an empty window can be

            // created and cause ANR.

            return;

        }



        st.isHandled = false;



        WindowManager.LayoutParams lp = new WindowManager.LayoutParams(

core/java/com/android/internal/policy/SystemBarUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public final class SystemBarUtils { 
     * Gets the status bar height with a specific display cutout.

     */

    public static int getStatusBarHeight(Resources res, DisplayCutout cutout) {

        final int defaultSize = res.getDimensionPixelSize(R.dimen.status_bar_height);

        final int defaultSize = res.getDimensionPixelSize(R.dimen.status_bar_height_default);

        final int safeInsetTop = cutout == null ? 0 : cutout.getSafeInsetTop();

        final int waterfallInsetTop = cutout == null ? 0 : cutout.getWaterfallInsets().top;

        // The status bar height should be:
@@ -73,7 +73,7 @@ public final class SystemBarUtils { 
            }

        }

        final int defaultSize =

                context.getResources().getDimensionPixelSize(R.dimen.status_bar_height);

                context.getResources().getDimensionPixelSize(R.dimen.status_bar_height_default);

        // The status bar height should be:

        // Max(top cutout size, (status bar default height + waterfall top size))

        return Math.max(insets.top, defaultSize + waterfallInsets.top);

core/res/res/values-land/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
    <dimen name="password_keyboard_spacebar_vertical_correction">2dip</dimen>

    <dimen name="preference_widget_width">72dp</dimen>



    <!-- Height of the status bar -->

    <dimen name="status_bar_height">@dimen/status_bar_height_landscape</dimen>

    <!-- Height of area above QQS where battery/time go -->

    <dimen name="quick_qs_offset_height">48dp</dimen>

    <!-- Default height of an action bar. -->

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -3804,6 +3804,9 @@ 
    <!-- True if the device supports running activities on secondary displays. -->

    <bool name="config_supportsMultiDisplay">true</bool>



    <!-- Indicates whether the device supports bubble notifications or not. -->

    <bool name="config_supportsBubble">true</bool>



    <!-- True if the device has no home screen. That is a launcher activity

         where the user can launch other applications from.  -->

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