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

Commit b2ecdfe7 authored by Steve Elliott's avatar Steve Elliott Committed by Android (Google) Code Review
Browse files

Merge changes I2c1a6811,I7e952d62,I6d027d06 into main 

* changes:
  Remove NICViewModel interface
  Deprecate CrossFadeHelper Runnable callbacks
  Migrate NICRefactor to aconfig flag
parents b4374980 50bc42d9

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java

+3 −2
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ import com.android.systemui.statusbar.notification.PropertyAnimator; 
import com.android.systemui.statusbar.notification.icon.ui.viewbinder.AlwaysOnDisplayNotificationIconViewStore;

import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder;

import com.android.systemui.statusbar.notification.icon.ui.viewmodel.NotificationIconContainerAlwaysOnDisplayViewModel;

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

import com.android.systemui.statusbar.notification.stack.AnimationProperties;

import com.android.systemui.statusbar.phone.DozeParameters;

import com.android.systemui.statusbar.phone.NotificationIconAreaController;
@@ -346,7 +347,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
    int getNotificationIconAreaHeight() {

        if (mFeatureFlags.isEnabled(Flags.MIGRATE_KEYGUARD_STATUS_VIEW)) {

            return 0;

        } else if (mFeatureFlags.isEnabled(Flags.NOTIFICATION_ICON_CONTAINER_REFACTOR)) {

        } else if (NotificationIconContainerRefactor.isEnabled()) {

            return mAodIconContainer != null ? mAodIconContainer.getHeight() : 0;

        } else {

            return mNotificationIconAreaController.getHeight();
@@ -565,7 +566,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
            NotificationIconContainer nic = (NotificationIconContainer)

                    mView.findViewById(

                            com.android.systemui.res.R.id.left_aligned_notification_icon_container);

            if (mFeatureFlags.isEnabled(Flags.NOTIFICATION_ICON_CONTAINER_REFACTOR)) {

            if (NotificationIconContainerRefactor.isEnabled()) {

                if (mAodIconsBindJob != null) {

                    mAodIconsBindJob.dispose();

                }

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −5
Original line number Diff line number Diff line
@@ -87,11 +87,6 @@ object Flags { 
    @JvmField

    val NOTIFICATION_SHELF_REFACTOR = releasedFlag("notification_shelf_refactor")



    // TODO(b/290787599): Tracking Bug

    @JvmField

    val NOTIFICATION_ICON_CONTAINER_REFACTOR =

        unreleasedFlag("notification_icon_container_refactor")



    // TODO(b/288326013): Tracking Bug

    @JvmField

    val NOTIFICATION_ASYNC_HYBRID_VIEW_INFLATION =

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AodNotificationIconsSection.kt

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.systemui.shade.NotificationPanelView 
import com.android.systemui.statusbar.notification.icon.ui.viewbinder.AlwaysOnDisplayNotificationIconViewStore

import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder

import com.android.systemui.statusbar.notification.icon.ui.viewmodel.NotificationIconContainerAlwaysOnDisplayViewModel

import com.android.systemui.statusbar.notification.shared.NotificationIconContainerRefactor

import com.android.systemui.statusbar.phone.DozeParameters

import com.android.systemui.statusbar.phone.NotificationIconAreaController

import com.android.systemui.statusbar.phone.NotificationIconContainer
@@ -86,7 +87,7 @@ constructor( 
            return

        }



        if (featureFlags.isEnabled(Flags.NOTIFICATION_ICON_CONTAINER_REFACTOR)) {

        if (NotificationIconContainerRefactor.isEnabled) {

            nic.setOnLockScreen(true)

            nicBindingDisposable?.dispose()

            nicBindingDisposable =

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

+14 −0
Original line number Diff line number Diff line
@@ -48,6 +48,13 @@ public class CrossFadeHelper { 
        fadeOut(view, duration, delay, (Runnable) null);

    }



    /**

     * Perform a fade-out animation, invoking {@code endRunnable} when the animation ends. It will

     * not be invoked if the animation is cancelled.

     *

     * @deprecated Use {@link #fadeOut(View, long, int, Animator.AnimatorListener)} instead.

     */

    @Deprecated

    public static void fadeOut(final View view, long duration, int delay,

            @Nullable final Runnable endRunnable) {

        view.animate().cancel();
@@ -155,6 +162,13 @@ public class CrossFadeHelper { 
        fadeIn(view, duration, delay, /* endRunnable= */ (Runnable) null);

    }



    /**

     * Perform a fade-in animation, invoking {@code endRunnable} when the animation ends. It will

     * not be invoked if the animation is cancelled.

     *

     * @deprecated Use {@link #fadeIn(View, long, int, Animator.AnimatorListener)} instead.

     */

    @Deprecated

    public static void fadeIn(final View view, long duration, int delay,

            @Nullable Runnable endRunnable) {

        view.animate().cancel();

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

+3 −6
Original line number Diff line number Diff line
@@ -29,14 +29,13 @@ import android.util.Log; 


import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.flags.FeatureFlagsClassic;

import com.android.systemui.flags.Flags;

import com.android.systemui.plugins.PluginManager;

import com.android.systemui.statusbar.dagger.CentralSurfacesModule;

import com.android.systemui.statusbar.domain.interactor.SilentNotificationStatusIconsVisibilityInteractor;

import com.android.systemui.statusbar.notification.collection.NotifCollection;

import com.android.systemui.statusbar.notification.collection.PipelineDumpable;

import com.android.systemui.statusbar.notification.collection.PipelineDumper;

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

import com.android.systemui.statusbar.phone.CentralSurfaces;

import com.android.systemui.statusbar.phone.NotificationListenerWithPlugins;

import com.android.systemui.util.time.SystemClock;
@@ -62,7 +61,6 @@ public class NotificationListener extends NotificationListenerWithPlugins implem 
    private static final long MAX_RANKING_DELAY_MILLIS = 500L;



    private final Context mContext;

    private final FeatureFlagsClassic mFeatureFlags;

    private final NotificationManager mNotificationManager;

    private final SilentNotificationStatusIconsVisibilityInteractor mStatusIconInteractor;

    private final SystemClock mSystemClock;
@@ -80,7 +78,6 @@ public class NotificationListener extends NotificationListenerWithPlugins implem 
    @Inject

    public NotificationListener(

            Context context,

            FeatureFlagsClassic featureFlags,

            NotificationManager notificationManager,

            SilentNotificationStatusIconsVisibilityInteractor statusIconInteractor,

            SystemClock systemClock,
@@ -88,7 +85,6 @@ public class NotificationListener extends NotificationListenerWithPlugins implem 
            PluginManager pluginManager) {

        super(pluginManager);

        mContext = context;

        mFeatureFlags = featureFlags;

        mNotificationManager = notificationManager;

        mStatusIconInteractor = statusIconInteractor;

        mSystemClock = systemClock;
@@ -106,6 +102,7 @@ public class NotificationListener extends NotificationListenerWithPlugins implem 
    /** Registers a listener that's notified when any notification-related settings change. */

    @Deprecated

    public void addNotificationSettingsListener(NotificationSettingsListener listener) {

        NotificationIconContainerRefactor.assertInLegacyMode();

        mSettingsListeners.add(listener);

    }
@@ -240,7 +237,7 @@ public class NotificationListener extends NotificationListenerWithPlugins implem 


    @Override

    public void onSilentStatusBarIconsVisibilityChanged(boolean hideSilentStatusIcons) {

        if (mFeatureFlags.isEnabled(Flags.NOTIFICATION_ICON_CONTAINER_REFACTOR)) {

        if (NotificationIconContainerRefactor.isEnabled()) {

            mStatusIconInteractor.setHideSilentStatusIcons(hideSilentStatusIcons);

        } else {

            for (NotificationSettingsListener listener : mSettingsListeners) {