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

Commit 6cfb5efa authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge changes from topic "NRCBI-flagged" into main 

* changes:
  Code cleanups
  Split out more InflationProgress fields into a NotificationContentModel
  Reorganize some logic within NotificationRowContentBinderImpl
  Use the new NotificationRowContentBinderImpl based on the flag.
  Copy the NotificationContentInflater and convert to Kotlin
parents 3685cf98 8556be78

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java

+13 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ import com.android.systemui.statusbar.notification.icon.IconPack; 
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

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

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

import com.android.systemui.statusbar.notification.row.shared.HeadsUpStatusBarModel;

import com.android.systemui.statusbar.notification.row.shared.NotificationContentModel;

import com.android.systemui.statusbar.notification.row.shared.NotificationRowContentBinderRefactor;

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

import com.android.systemui.util.ListenerSet;
@@ -951,6 +954,7 @@ public final class NotificationEntry extends ListEntry { 
     * heads up.

     */

    public void setHeadsUpStatusBarText(CharSequence headsUpStatusBarText) {

        NotificationRowContentBinderRefactor.assertInLegacyMode();

        this.mHeadsUpStatusBarText.setValue(headsUpStatusBarText);

    }
@@ -964,6 +968,7 @@ public final class NotificationEntry extends ListEntry { 
     * heads up, and its content is sensitive right now.

     */

    public void setHeadsUpStatusBarTextPublic(CharSequence headsUpStatusBarTextPublic) {

        NotificationRowContentBinderRefactor.assertInLegacyMode();

        this.mHeadsUpStatusBarTextPublic.setValue(headsUpStatusBarTextPublic);

    }
@@ -1036,6 +1041,14 @@ public final class NotificationEntry extends ListEntry { 
                == Notification.VISIBILITY_PRIVATE;

    }



    /** Set the content generated by the notification inflater. */

    public void setContentModel(NotificationContentModel contentModel) {

        if (NotificationRowContentBinderRefactor.isUnexpectedlyInLegacyMode()) return;

        HeadsUpStatusBarModel headsUpStatusBarModel = contentModel.getHeadsUpStatusBarModel();

        this.mHeadsUpStatusBarText.setValue(headsUpStatusBarModel.getPrivateText());

        this.mHeadsUpStatusBarTextPublic.setValue(headsUpStatusBarModel.getPublicText());

    }



    /** Information about a suggestion that is being edited. */

    public static class EditedSuggestionInfo {

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

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import com.android.systemui.statusbar.notification.InflationException; 
import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.row.shared.AsyncGroupHeaderViewInflation;

import com.android.systemui.statusbar.notification.row.shared.AsyncHybridViewInflation;

import com.android.systemui.statusbar.notification.row.shared.NotificationRowContentBinderRefactor;

import com.android.systemui.statusbar.notification.row.ui.viewbinder.SingleLineConversationViewBinder;

import com.android.systemui.statusbar.notification.row.ui.viewbinder.SingleLineViewBinder;

import com.android.systemui.statusbar.notification.row.ui.viewmodel.SingleLineViewModel;
@@ -105,6 +106,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder 
            NotifLayoutInflaterFactory.Provider notifLayoutInflaterFactoryProvider,

            HeadsUpStyleProvider headsUpStyleProvider,

            NotificationRowContentBinderLogger logger) {

        NotificationRowContentBinderRefactor.assertInLegacyMode();

        mRemoteViewCache = remoteViewCache;

        mRemoteInputManager = remoteInputManager;

        mConversationProcessor = conversationProcessor;

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

+0 −5
Original line number Diff line number Diff line
@@ -147,11 +147,6 @@ public interface NotificationRowContentBinder { 
         * Use increased height when binding heads up views.

         */

        public boolean usesIncreasedHeadsUpHeight;



        /**

         * Is group summary notification

         */

        public boolean mIsGroupSummary;

    }



    /**

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImpl.kt

0 → 100644
+1569 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+15 −3
Original line number Diff line number Diff line
@@ -17,9 +17,13 @@ 
package com.android.systemui.statusbar.notification.row;



import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.statusbar.notification.row.shared.NotificationRowContentBinderRefactor;



import dagger.Binds;

import dagger.Module;

import dagger.Provides;



import javax.inject.Provider;



/**

 * Dagger Module containing notification row and view inflation implementations.
@@ -30,10 +34,18 @@ public abstract class NotificationRowModule { 
    /**

     * Provides notification row content binder instance.

     */

    @Binds

    @Provides

    @SysUISingleton

    public abstract NotificationRowContentBinder provideNotificationRowContentBinder(

            NotificationContentInflater contentBinderImpl);

    public static NotificationRowContentBinder provideNotificationRowContentBinder(

            Provider<NotificationContentInflater> legacyImpl,

            Provider<NotificationRowContentBinderImpl> refactoredImpl

    ) {

        if (NotificationRowContentBinderRefactor.isEnabled()) {

            return refactoredImpl.get();

        } else {

            return legacyImpl.get();

        }

    }



    /**

     * Provides notification remote view cache instance.