Merge "Fix some paddings in QS" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
8c95f71ec3
@@ -26,7 +26,6 @@
|
|||||||
android:layout_gravity="top"
|
android:layout_gravity="top"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:paddingTop="@dimen/status_bar_padding_top"
|
|
||||||
android:minHeight="48dp">
|
android:minHeight="48dp">
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
|
|||||||
@@ -78,7 +78,6 @@ public class QuickStatusBarHeader extends FrameLayout {
|
|||||||
private TintedIconManager mTintedIconManager;
|
private TintedIconManager mTintedIconManager;
|
||||||
private QSExpansionPathInterpolator mQSExpansionPathInterpolator;
|
private QSExpansionPathInterpolator mQSExpansionPathInterpolator;
|
||||||
|
|
||||||
private int mStatusBarPaddingTop = 0;
|
|
||||||
private int mRoundedCornerPadding = 0;
|
private int mRoundedCornerPadding = 0;
|
||||||
private int mWaterfallTopInset;
|
private int mWaterfallTopInset;
|
||||||
private int mCutOutPaddingLeft;
|
private int mCutOutPaddingLeft;
|
||||||
@@ -205,7 +204,6 @@ public class QuickStatusBarHeader extends FrameLayout {
|
|||||||
|
|
||||||
mRoundedCornerPadding = resources.getDimensionPixelSize(
|
mRoundedCornerPadding = resources.getDimensionPixelSize(
|
||||||
R.dimen.rounded_corner_content_padding);
|
R.dimen.rounded_corner_content_padding);
|
||||||
mStatusBarPaddingTop = resources.getDimensionPixelSize(R.dimen.status_bar_padding_top);
|
|
||||||
|
|
||||||
int qsOffsetHeight = resources.getDimensionPixelSize(
|
int qsOffsetHeight = resources.getDimensionPixelSize(
|
||||||
com.android.internal.R.dimen.quick_qs_offset_height);
|
com.android.internal.R.dimen.quick_qs_offset_height);
|
||||||
@@ -465,11 +463,11 @@ public class QuickStatusBarHeader extends FrameLayout {
|
|||||||
}
|
}
|
||||||
|
|
||||||
mDatePrivacyView.setPadding(paddingLeft,
|
mDatePrivacyView.setPadding(paddingLeft,
|
||||||
mWaterfallTopInset + mStatusBarPaddingTop,
|
mWaterfallTopInset,
|
||||||
paddingRight,
|
paddingRight,
|
||||||
0);
|
0);
|
||||||
mClockIconsView.setPadding(paddingLeft,
|
mClockIconsView.setPadding(paddingLeft,
|
||||||
mWaterfallTopInset + mStatusBarPaddingTop,
|
mWaterfallTopInset,
|
||||||
paddingRight,
|
paddingRight,
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user