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

Commit d10dc203 authored by Evan Laird's avatar Evan Laird Committed by Automerger Merge Worker
Browse files

Merge "Use status_bar_padding_top for status bar elements" into rvc-dev am: cd0281ea 

Change-Id: Id67005fc87190c9f0836ed52a302fc855f1f0c8d
parents 37b29738 cd0281ea

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
@@ -26,7 +26,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/statusbar/phone/PhoneStatusBarView.java

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

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

        updateResources();



        // May trigger cutout space layout-ing

        if (updateOrientationAndCutout()) {
@@ -298,6 +299,24 @@ public class PhoneStatusBarView extends PanelBar { 
        ViewGroup.LayoutParams layoutParams = getLayoutParams();

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

        layoutParams.height = mStatusBarHeight - waterfallTopInset;



        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);



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

        sbContents.setPaddingRelative(

                statusBarPaddingStart,

                statusBarPaddingTop,

                statusBarPaddingEnd,

                0);



        findViewById(R.id.notification_lights_out)

                .setPaddingRelative(0, statusBarPaddingStart, 0, 0);



        setLayoutParams(layoutParams);

    }