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

Commit 27a0ee31 authored by Evan Laird's avatar Evan Laird Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Use status_bar_padding_top" into qt-qpr1-dev

parents 65964e05 bc95ab7a

packages/SystemUI/res/layout/keyguard_status_bar.xml

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
        android:id="@+id/status_icon_area"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:paddingTop="@dimen/status_bar_padding_top"

        android:layout_alignParentEnd="true"

        android:gravity="center_vertical|end" >

        <FrameLayout android:id="@+id/system_icons_container"
@@ -66,6 +67,7 @@ 
        android:id="@+id/keyguard_carrier_text"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingTop="@dimen/status_bar_padding_top"

        android:layout_marginStart="@dimen/keyguard_carrier_text_margin"

        android:layout_toStartOf="@id/system_icons_container"

        android:gravity="center_vertical"

packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ 
    android:orientation="horizontal"

    android:clickable="true"

    android:paddingStart="@dimen/status_bar_padding_start"

    android:paddingEnd="@dimen/status_bar_padding_end" >

    android:paddingEnd="@dimen/status_bar_padding_end"

    android:paddingTop="@dimen/status_bar_padding_top" >



    <com.android.systemui.statusbar.policy.Clock

        android:id="@+id/clock"

packages/SystemUI/res/layout/system_icons.xml

+1 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
        android:layout_weight="1"

        android:layout_height="match_parent"

        android:paddingEnd="@dimen/signal_cluster_battery_padding"

        android:paddingTop="@dimen/status_bar_padding_top"

        android:gravity="center_vertical"

        android:orientation="horizontal"/>

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

+8 −3
Original line number Diff line number Diff line
@@ -402,10 +402,15 @@ public class QuickStatusBarHeader extends RelativeLayout implements 
                cutout, getDisplay());

        if (padding == null) {

            mSystemIconsView.setPaddingRelative(

                    getResources().getDimensionPixelSize(R.dimen.status_bar_padding_start), 0,

                    getResources().getDimensionPixelSize(R.dimen.status_bar_padding_end), 0);

                    getResources().getDimensionPixelSize(R.dimen.status_bar_padding_start),

                    getResources().getDimensionPixelSize(R.dimen.status_bar_padding_top),

                    getResources().getDimensionPixelSize(R.dimen.status_bar_padding_end),

                    0);

        } else {

            mSystemIconsView.setPadding(padding.first, 0, padding.second, 0);

            mSystemIconsView.setPadding(

                    padding.first,

                    getResources().getDimensionPixelSize(R.dimen.status_bar_padding_top),

                    padding.second, 0);



        }

        return super.onApplyWindowInsets(insets);

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java

+20 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ public class PhoneStatusBarView extends PanelBar { 
    @Override

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

        updateResources();



        // May trigger cutout space layout-ing

        if (updateOrientationAndCutout(newConfig.orientation)) {
@@ -297,9 +298,28 @@ public class PhoneStatusBarView extends PanelBar { 
        mCutoutSideNudge = getResources().getDimensionPixelSize(

                R.dimen.display_cutout_margin_consumption);



        boolean isRtl = getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;



        int statusBarPaddingTop = getResources().getDimensionPixelSize(

                R.dimen.status_bar_padding_top);

        int statusBarPaddingStart = getResources().getDimensionPixelSize(

                R.dimen.status_bar_padding_start);

        int statusBarPaddingEnd = getResources().getDimensionPixelSize(

                R.dimen.status_bar_padding_end);



        ViewGroup.LayoutParams layoutParams = getLayoutParams();

        mStatusBarHeight = getResources().getDimensionPixelSize(R.dimen.status_bar_height);

        layoutParams.height = mStatusBarHeight;



        View sbContents = findViewById(R.id.status_bar_contents);

        sbContents.setPadding(

                isRtl ? statusBarPaddingEnd : statusBarPaddingStart,

                statusBarPaddingTop,

                isRtl ? statusBarPaddingStart : statusBarPaddingEnd,

                0);



        findViewById(R.id.notification_lights_out).setPadding(0, statusBarPaddingStart, 0, 0);



        setLayoutParams(layoutParams);

    }