Merge "Remove unused dimens notification_min_height_media" into tm-qpr-dev am: c19d2fe0ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21752159 Change-Id: Ib8fe0d2f579f0f7606bd42de2252454b1a243309 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -196,9 +196,6 @@
|
|||||||
<!-- Increased height of a small notification in the status bar -->
|
<!-- Increased height of a small notification in the status bar -->
|
||||||
<dimen name="notification_min_height_increased">146dp</dimen>
|
<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 -->
|
<!-- Height of a small notification in the status bar which was used before android N -->
|
||||||
<dimen name="notification_min_height_legacy">64dp</dimen>
|
<dimen name="notification_min_height_legacy">64dp</dimen>
|
||||||
|
|
||||||
|
|||||||
@@ -191,7 +191,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
|
|||||||
private int mMaxSmallHeightBeforeS;
|
private int mMaxSmallHeightBeforeS;
|
||||||
private int mMaxSmallHeight;
|
private int mMaxSmallHeight;
|
||||||
private int mMaxSmallHeightLarge;
|
private int mMaxSmallHeightLarge;
|
||||||
private int mMaxSmallHeightMedia;
|
|
||||||
private int mMaxExpandedHeight;
|
private int mMaxExpandedHeight;
|
||||||
private int mIncreasedPaddingBetweenElements;
|
private int mIncreasedPaddingBetweenElements;
|
||||||
private int mNotificationLaunchHeight;
|
private int mNotificationLaunchHeight;
|
||||||
@@ -1771,8 +1770,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
|
|||||||
R.dimen.notification_min_height);
|
R.dimen.notification_min_height);
|
||||||
mMaxSmallHeightLarge = NotificationUtils.getFontScaledHeight(mContext,
|
mMaxSmallHeightLarge = NotificationUtils.getFontScaledHeight(mContext,
|
||||||
R.dimen.notification_min_height_increased);
|
R.dimen.notification_min_height_increased);
|
||||||
mMaxSmallHeightMedia = NotificationUtils.getFontScaledHeight(mContext,
|
|
||||||
R.dimen.notification_min_height_media);
|
|
||||||
mMaxExpandedHeight = NotificationUtils.getFontScaledHeight(mContext,
|
mMaxExpandedHeight = NotificationUtils.getFontScaledHeight(mContext,
|
||||||
R.dimen.notification_max_height);
|
R.dimen.notification_max_height);
|
||||||
mMaxHeadsUpHeightBeforeN = NotificationUtils.getFontScaledHeight(mContext,
|
mMaxHeadsUpHeightBeforeN = NotificationUtils.getFontScaledHeight(mContext,
|
||||||
|
|||||||
Reference in New Issue
Block a user