Merge "Apply layout param to NotificationShelf only when needed" into tm-qpr-dev am: 0ceb4ae22f

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

Change-Id: I757398c1793d4011a33af38ce6f5e0c2d8403960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-11-15 20:11:54 +00:00
committed by Automerger Merge Worker

View File

@@ -132,8 +132,11 @@ public class NotificationShelf extends ActivatableNotificationView implements
mPaddingBetweenElements = res.getDimensionPixelSize(R.dimen.notification_divider_height); mPaddingBetweenElements = res.getDimensionPixelSize(R.dimen.notification_divider_height);
ViewGroup.LayoutParams layoutParams = getLayoutParams(); ViewGroup.LayoutParams layoutParams = getLayoutParams();
layoutParams.height = res.getDimensionPixelOffset(R.dimen.notification_shelf_height); final int newShelfHeight = res.getDimensionPixelOffset(R.dimen.notification_shelf_height);
setLayoutParams(layoutParams); if (newShelfHeight != layoutParams.height) {
layoutParams.height = newShelfHeight;
setLayoutParams(layoutParams);
}
final int padding = res.getDimensionPixelOffset(R.dimen.shelf_icon_container_padding); final int padding = res.getDimensionPixelOffset(R.dimen.shelf_icon_container_padding);
mShelfIcons.setPadding(padding, 0, padding, 0); mShelfIcons.setPadding(padding, 0, padding, 0);