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

Commit 5f29953a authored by András Kurucz's avatar András Kurucz Committed by Automerger Merge Worker
Browse files

Merge "Remove unused dimens notification_min_height_media" into tm-qpr-dev am:... 

Merge "Remove unused dimens notification_min_height_media" into tm-qpr-dev am: c19d2fe0 am: f25cdd8a

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



Change-Id: Idf6d44af8bc084fcf888581a2f19f26a44e4c605
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 46c164be f25cdd8a

packages/SystemUI/res/values/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -196,9 +196,6 @@ 
    <!-- Increased height of a small notification in the status bar -->

    <dimen name="notification_min_height_increased">146dp</dimen>



    <!-- Increased height of a collapsed media notification in the status bar -->

    <dimen name="notification_min_height_media">160dp</dimen>



    <!-- Height of a small notification in the status bar which was used before android N -->

    <dimen name="notification_min_height_legacy">64dp</dimen>

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+0 −3
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    private int mMaxSmallHeightBeforeS;

    private int mMaxSmallHeight;

    private int mMaxSmallHeightLarge;

    private int mMaxSmallHeightMedia;

    private int mMaxExpandedHeight;

    private int mIncreasedPaddingBetweenElements;

    private int mNotificationLaunchHeight;
@@ -1774,8 +1773,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
                R.dimen.notification_min_height);

        mMaxSmallHeightLarge = NotificationUtils.getFontScaledHeight(mContext,

                R.dimen.notification_min_height_increased);

        mMaxSmallHeightMedia = NotificationUtils.getFontScaledHeight(mContext,

                R.dimen.notification_min_height_media);

        mMaxExpandedHeight = NotificationUtils.getFontScaledHeight(mContext,

                R.dimen.notification_max_height);

        mMaxHeadsUpHeightBeforeN = NotificationUtils.getFontScaledHeight(mContext,