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

Commit 3f8e49bf authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

Merge "Fix height of keyguard status bar" into pi-dev 

am: 49748cd1

Change-Id: Ib485e5af6eae7dfd3850eef57ed0d4ae38496996
parents 2f075d17 49748cd1

packages/SystemUI/res/layout/keyguard_status_bar.xml

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="@dimen/status_bar_header_height_keyguard"

    android:baselineAligned="false"

    android:gravity="center_vertical"

    >



    <LinearLayout
@@ -33,7 +34,7 @@ 
        android:gravity="center_vertical|end" >

        <FrameLayout android:id="@+id/system_icons_container"

            android:layout_width="0dp"

            android:layout_height="@dimen/status_bar_height"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:layout_marginStart="@dimen/system_icons_super_container_margin_start"

            android:gravity="center_vertical|end"

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

+0 −6
Original line number Diff line number Diff line
@@ -128,13 +128,7 @@ public class KeyguardStatusBarView extends RelativeLayout 
        mMultiUserSwitch.setLayoutParams(lp);



        // System icons

        lp = (MarginLayoutParams) mStatusIconArea.getLayoutParams();

        lp.height = getResources().getDimensionPixelSize(

                com.android.internal.R.dimen.status_bar_height);



        lp = (MarginLayoutParams) mSystemIconsContainer.getLayoutParams();

        lp.height = getResources().getDimensionPixelSize(

                R.dimen.status_bar_height);

        lp.setMarginStart(getResources().getDimensionPixelSize(

                R.dimen.system_icons_super_container_margin_start));

        mSystemIconsContainer.setLayoutParams(lp);