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

Commit ec5b7c44 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Use the adapter where supported 

Test: SystemUI presubmit
Bug: 395857098
Flag: com.android.systemui.notification_bundle_ui
Change-Id: I76d72568a951de11d869bd9cce6ab9df975525ad
parent 973f0b16

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

+7 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.systemui.statusbar.notification.SourceType; 
import com.android.systemui.statusbar.notification.row.ActivatableNotificationView;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.row.ExpandableView;

import com.android.systemui.statusbar.notification.shared.NotificationBundleUi;

import com.android.systemui.statusbar.notification.shared.NotificationMinimalism;

import com.android.systemui.statusbar.notification.shelf.NotificationShelfBackgroundView;

import com.android.systemui.statusbar.notification.shelf.NotificationShelfIconContainer;
@@ -672,7 +673,9 @@ public class NotificationShelf extends ActivatableNotificationView { 
            // if the shelf is clipped, lets make sure we also clip the icon

            maxTop = Math.max(maxTop, getTranslationY() + getClipTopAmount());

        }

        StatusBarIconView icon = row.getEntry().getIcons().getShelfIcon();

        StatusBarIconView icon = NotificationBundleUi.isEnabled()

                ? row.getEntryAdapter().getIcons().getShelfIcon()

                : row.getEntry().getIcons().getShelfIcon();

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

        if (shelfIconPosition < maxTop && !mAmbientState.isFullyHidden()) {

            int top = (int) (maxTop - shelfIconPosition);
@@ -684,7 +687,9 @@ public class NotificationShelf extends ActivatableNotificationView { 
    }



    private void updateContinuousClipping(final ExpandableNotificationRow row) {

        StatusBarIconView icon = row.getEntry().getIcons().getShelfIcon();

        StatusBarIconView icon = NotificationBundleUi.isEnabled()

                ? row.getEntryAdapter().getIcons().getShelfIcon()

                : row.getEntry().getIcons().getShelfIcon();

        boolean needsContinuousClipping = ViewState.isAnimatingY(icon) && !mAmbientState.isDozing();

        boolean isContinuousClipping = icon.getTag(TAG_CONTINUOUS_CLIPPING) != null;

        if (needsContinuousClipping && !isContinuousClipping) {

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

+5 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.systemui.statusbar.notification.FeedbackIcon; 
import com.android.systemui.statusbar.notification.NotificationFadeAware;

import com.android.systemui.statusbar.notification.TransformState;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.shared.NotificationBundleUi;



/**

 * Wraps the actual notification content view; used to implement behaviors which are different for
@@ -135,7 +136,10 @@ public abstract class NotificationViewWrapper implements TransformableView { 
        }



        // Apps targeting Q should fix their dark mode bugs.

        if (mRow.getEntry().targetSdk >= Build.VERSION_CODES.Q) {

        int targetSdk = NotificationBundleUi.isEnabled()

                ? mRow.getEntryAdapter().getTargetSdk()

                : mRow.getEntry().targetSdk;

        if (targetSdk >= Build.VERSION_CODES.Q) {

            return false;

        }