diff options
3 files changed, 16 insertions, 4 deletions
diff --git a/packages/SystemUI/res/values-sw600dp-port/dimens.xml b/packages/SystemUI/res/values-sw600dp-port/dimens.xml index 589d12f95f45..347cf2965c77 100644 --- a/packages/SystemUI/res/values-sw600dp-port/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp-port/dimens.xml @@ -21,5 +21,10 @@ <dimen name="keyguard_status_view_bottom_margin">40dp</dimen> <dimen name="bouncer_user_switcher_y_trans">20dp</dimen> + <!-- qs_tiles_page_horizontal_margin should be margin / 2, otherwise full space between two + pages is margin * 2, and that makes tiles page not appear immediately after user swipes to + the side --> + <dimen name="qs_tiles_page_horizontal_margin">32dp</dimen> + <dimen name="qqs_layout_padding_bottom">16dp</dimen> </resources> diff --git a/packages/SystemUI/res/values-sw720dp-port/dimens.xml b/packages/SystemUI/res/values-sw720dp-port/dimens.xml index 2abc9e3d6119..4de7bb7ef100 100644 --- a/packages/SystemUI/res/values-sw720dp-port/dimens.xml +++ b/packages/SystemUI/res/values-sw720dp-port/dimens.xml @@ -29,5 +29,11 @@ <dimen name="notification_panel_margin_horizontal">80dp</dimen> <dimen name="notification_side_paddings">40dp</dimen> + + <!-- qs_tiles_page_horizontal_margin should be margin / 2, otherwise full space between two + pages is margin * 2, and that makes tiles page not appear immediately after user swipes to the + side --> + <dimen name="qs_tiles_page_horizontal_margin">60dp</dimen> + <dimen name="notification_section_divider_height">16dp</dimen> </resources> diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java index f87cb29a8758..f9bebc52b258 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java @@ -622,10 +622,11 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca if (mLastQSExpansion == 1.0f) { // Fully expanded, let's set the layout bounds as clip bounds. This is necessary because // it's a scrollview and otherwise wouldn't be clipped. However, we set the horizontal - // bounds so the pages go to the ends of QSContainerImpl - ViewGroup.MarginLayoutParams lp = - (ViewGroup.MarginLayoutParams) mQSPanelScrollView.getLayoutParams(); - mQsBounds.set(-lp.leftMargin, 0, mQSPanelScrollView.getWidth() + lp.rightMargin, + // bounds so the pages go to the ends of QSContainerImpl (most cases) or its parent + // (large screen portrait) + int sideMargin = getResources().getDimensionPixelSize( + R.dimen.qs_tiles_page_horizontal_margin) * 2; + mQsBounds.set(-sideMargin, 0, mQSPanelScrollView.getWidth() + sideMargin, mQSPanelScrollView.getHeight()); } mQSPanelScrollView.setClipBounds(mQsBounds); |