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

Commit efb301ca authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Smaller notification icons on AOD" into qt-dev am: 4f901570 

am: 6987b3d9

Change-Id: I6318fe809f32fd1585bcf4bbb0f604bceb4f648e
parents 71a76b84 6987b3d9

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -252,6 +252,9 @@ 
    <!-- size at which Notification icons will be drawn on Ambient Display -->

    <dimen name="status_bar_icon_drawing_size_dark">@*android:dimen/notification_header_icon_size_ambient</dimen>



    <!-- size of notification icons on AOD -->

    <dimen name="dark_shelf_icon_size">16dp</dimen>



    <!-- opacity at which Notification icons will be drawn in the status bar -->

    <item type="dimen" name="status_bar_icon_drawing_alpha">90%</item>

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

+5 −2
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ public class NotificationShelf extends ActivatableNotificationView implements 
    private int mIconAppearTopPadding;

    private int mShelfAppearTranslation;

    private float mDarkShelfPadding;

    private float mDarkShelfIconSize;

    private int mStatusBarHeight;

    private int mStatusBarPaddingStart;

    private AmbientState mAmbientState;
@@ -151,6 +152,7 @@ public class NotificationShelf extends ActivatableNotificationView implements 
        mScrollFastThreshold = res.getDimensionPixelOffset(R.dimen.scroll_fast_threshold);

        mShowNotificationShelf = res.getBoolean(R.bool.config_showNotificationShelf);

        mIconSize = res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_icon_size);

        mDarkShelfIconSize = res.getDimensionPixelOffset(R.dimen.dark_shelf_icon_size);

        mGapHeight = res.getDimensionPixelSize(R.dimen.qs_notification_padding);



        if (!mShowNotificationShelf) {
@@ -705,12 +707,13 @@ public class NotificationShelf extends ActivatableNotificationView implements 
        }

        notificationIconPosition += iconTopPadding;

        float shelfIconPosition = getTranslationY() + icon.getTop();

        shelfIconPosition += (icon.getHeight() - icon.getIconScale() * mIconSize) / 2.0f;

        float iconSize = mDark ? mDarkShelfIconSize : mIconSize;

        shelfIconPosition += (icon.getHeight() - icon.getIconScale() * iconSize) / 2.0f;

        float iconYTranslation = NotificationUtils.interpolate(

                notificationIconPosition - shelfIconPosition,

                0,

                transitionAmount);

        float shelfIconSize = mIconSize * icon.getIconScale();

        float shelfIconSize = iconSize * icon.getIconScale();

        float alpha = 1.0f;

        boolean noIcon = !row.isShowingIcon();

        if (noIcon) {