Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 337cc6f5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Apply layout param to NotificationShelf only when needed" into... 

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

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



Change-Id: I2b8aaf80e8dc4a90b198a46ecfd81d49432ac3bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b9ecc133 ddd7d73d

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+5 −2
Original line number Diff line number Diff line
@@ -132,8 +132,11 @@ public class NotificationShelf extends ActivatableNotificationView implements 
        mPaddingBetweenElements = res.getDimensionPixelSize(R.dimen.notification_divider_height);



        ViewGroup.LayoutParams layoutParams = getLayoutParams();

        layoutParams.height = res.getDimensionPixelOffset(R.dimen.notification_shelf_height);

        final int newShelfHeight = res.getDimensionPixelOffset(R.dimen.notification_shelf_height);

        if (newShelfHeight != layoutParams.height) {

            layoutParams.height = newShelfHeight;

            setLayoutParams(layoutParams);

        }



        final int padding = res.getDimensionPixelOffset(R.dimen.shelf_icon_container_padding);

        mShelfIcons.setPadding(padding, 0, padding, 0);