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

Commit ddd7d73d 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 tm-qpr-dev am: 0ceb4ae2 

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



Change-Id: I757398c1793d4011a33af38ce6f5e0c2d8403960
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ffec20f8 0ceb4ae2

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);