Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add some padding between QS and shelf" into sc-dev

Browse Source
This commit is contained in:
Fabian Kozynski
2021-04-20 13:36:18 +00:00
committed by Android (Google) Code Review
parent 9ab42eb145 e03e4c9e84
commit 28de2e23ff
6 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/layout/qs_detail.xml
View File

@@ -23,6 +23,7 @@
android:clickable="true"
android:orientation="vertical"
android:layout_marginTop="@*android:dimen/quick_qs_offset_height"
android:layout_marginBottom="@dimen/qs_container_bottom_padding"
android:paddingBottom="8dp"
android:visibility="invisible"
android:elevation="4dp"

1
packages/SystemUI/res/layout/qs_panel.xml
View File

@@ -32,6 +32,7 @@
android:id="@+id/expanded_qs_scroll_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/qs_container_bottom_padding"
android:elevation="4dp"
android:importantForAccessibility="no"
android:scrollbars="none"

2
packages/SystemUI/res/values-land/dimens.xml
View File

@@ -33,7 +33,7 @@
<dimen name="battery_detail_graph_space_top">9dp</dimen>
<dimen name="battery_detail_graph_space_bottom">9dp</dimen>
<dimen name="qs_detail_margin_top">0dp</dimen>
<dimen name="qs_detail_margin_top">14dp</dimen>
<dimen name="volume_tool_tip_right_margin">136dp</dimen>
<dimen name="volume_tool_tip_top_margin">12dp</dimen>

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -610,6 +610,8 @@
<dimen name="qs_notif_collapsed_space">64dp</dimen>
<dimen name="qs_container_bottom_padding">24dp</dimen>
<!-- Desired qs icon overlay size. -->
<dimen name="qs_detail_icon_overlay_size">24dp</dimen>

8
packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java
View File

@@ -206,6 +206,12 @@ public class QSContainerImpl extends FrameLayout {
layoutParams.topMargin = mContext.getResources().getDimensionPixelSize(
com.android.internal.R.dimen.quick_qs_offset_height);
mQSPanelContainer.setLayoutParams(layoutParams);
mQSPanelContainer.setPaddingRelative(
mQSPanelContainer.getPaddingStart(),
mQSPanelContainer.getPaddingTop(),
mQSPanelContainer.getPaddingEnd(),
mContext.getResources().getDimensionPixelSize(R.dimen.qs_container_bottom_padding)
);
mSideMargins = getResources().getDimensionPixelSize(R.dimen.notification_side_paddings);
int padding = getResources().getDimensionPixelSize(
@@ -237,6 +243,8 @@ public class QSContainerImpl extends FrameLayout {
int scrollBottom = calculateContainerBottom();
setBottom(getTop() + height);
mQSDetail.setBottom(getTop() + scrollBottom);
int qsDetailBottomMargin = ((MarginLayoutParams) mQSDetail.getLayoutParams()).bottomMargin;
mQSDetail.setBottom(getTop() + scrollBottom - qsDetailBottomMargin);
mBackground.setTop(mQSPanelContainer.getTop());
updateBackgroundBottom(scrollBottom, animate);
}

6
packages/SystemUI/src/com/android/systemui/qs/QSDetail.java
View File

@@ -150,6 +150,12 @@ public class QSDetail extends LinearLayout {
public void updateResources() {
updateDetailText();
MarginLayoutParams lp = (MarginLayoutParams) getLayoutParams();
lp.topMargin = mContext.getResources().getDimensionPixelSize(
com.android.internal.R.dimen.quick_qs_offset_height);
lp.bottomMargin = mContext.getResources().getDimensionPixelSize(
R.dimen.qs_container_bottom_padding);
setLayoutParams(lp);
}
public boolean isClosingDetail() {