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

Commit 93f45af6 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix some paddings in QS" into sc-dev am: 8c95f71e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15190047

Change-Id: If40f4a45302655ea53c72ae8d65036397620f703
parents 5cbaa013 8c95f71e

packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
    android:layout_gravity="top"

    android:orientation="horizontal"

    android:clickable="true"

    android:paddingTop="@dimen/status_bar_padding_top"

    android:minHeight="48dp">



    <FrameLayout

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

+2 −4
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ public class QuickStatusBarHeader extends FrameLayout { 
    private TintedIconManager mTintedIconManager;

    private QSExpansionPathInterpolator mQSExpansionPathInterpolator;



    private int mStatusBarPaddingTop = 0;

    private int mRoundedCornerPadding = 0;

    private int mWaterfallTopInset;

    private int mCutOutPaddingLeft;
@@ -205,7 +204,6 @@ public class QuickStatusBarHeader extends FrameLayout { 


        mRoundedCornerPadding = resources.getDimensionPixelSize(

                R.dimen.rounded_corner_content_padding);

        mStatusBarPaddingTop = resources.getDimensionPixelSize(R.dimen.status_bar_padding_top);



        int qsOffsetHeight = resources.getDimensionPixelSize(

                com.android.internal.R.dimen.quick_qs_offset_height);
@@ -465,11 +463,11 @@ public class QuickStatusBarHeader extends FrameLayout { 
        }



        mDatePrivacyView.setPadding(paddingLeft,

                mWaterfallTopInset + mStatusBarPaddingTop,

                mWaterfallTopInset,

                paddingRight,

                0);

        mClockIconsView.setPadding(paddingLeft,

                mWaterfallTopInset + mStatusBarPaddingTop,

                mWaterfallTopInset,

                paddingRight,

                0);

    }