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

Merge "Fix pageMargin in PagedTileLayout" into sc-dev am: 95c0278060 am: c079cb8633

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

Change-Id: I4539f3587cc59695dece375922ad12fde6fde815
This commit is contained in:
Fabian Kozynski
2021-05-04 15:58:37 +00:00
committed by Automerger Merge Worker
parent 11ae392a1a c079cb8633
commit 5e013a0963
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,6 @@ import android.animation.ObjectAnimator;
import android.animation.PropertyValuesHolder; import android.animation.PropertyValuesHolder;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
@@ -333,11 +332,6 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
@Override @Override
public boolean updateResources() { public boolean updateResources() {
// Update bottom padding, useful for removing extra space once the panel page indicator is
// hidden.
Resources res = getContext().getResources();
setPageMargin(res.getDimensionPixelOffset(R.dimen.qs_tile_margin_horizontal));
setPadding(0, 0, 0, setPadding(0, 0, 0,
getContext().getResources().getDimensionPixelSize( getContext().getResources().getDimensionPixelSize(
R.dimen.qs_paged_tile_layout_padding_bottom)); R.dimen.qs_paged_tile_layout_padding_bottom));

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

@@ -207,11 +207,12 @@ public class QSContainerImpl extends FrameLayout {
mContext.getResources().getDimensionPixelSize(R.dimen.qs_container_bottom_padding) mContext.getResources().getDimensionPixelSize(R.dimen.qs_container_bottom_padding)
); );
mSideMargins = getResources().getDimensionPixelSize(R.dimen.notification_side_paddings); int sideMargins = getResources().getDimensionPixelSize(R.dimen.notification_side_paddings);
int padding = getResources().getDimensionPixelSize( int padding = getResources().getDimensionPixelSize(
R.dimen.notification_shade_content_margin_horizontal); R.dimen.notification_shade_content_margin_horizontal);
boolean marginsChanged = padding != mContentPadding; boolean marginsChanged = padding != mContentPadding || sideMargins != mSideMargins;
mContentPadding = padding; mContentPadding = padding;
mSideMargins = sideMargins;
if (marginsChanged) { if (marginsChanged) {
updatePaddingsAndMargins(qsPanelController, quickStatusBarHeaderController); updatePaddingsAndMargins(qsPanelController, quickStatusBarHeaderController);
} }