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

Commit 657d1a7f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-for-b/147407617" 

* changes:
  Revert "Convert NotificationContentInflater to singleton"
  Revert "Move a bunch of row setters into an init method."
parents a013dfc6 dc4c1003

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+0 −3
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ import com.android.systemui.statusbar.notification.VisualStabilityManager; 
import com.android.systemui.statusbar.notification.collection.init.NewNotifPipeline;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

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

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

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

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

import com.android.systemui.statusbar.phone.CollapsedStatusBarFragment;
@@ -277,7 +276,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            NotificationGutsManager notificationGutsManager,

            NotificationLogger notificationLogger,

            NotificationEntryManager notificationEntryManager,

            NotificationRowContentBinder notificationRowContentBinder,

            NotificationInterruptionStateProvider notificationInterruptionStateProvider,

            NotificationViewHierarchyManager notificationViewHierarchyManager,

            KeyguardViewMediator keyguardViewMediator,
@@ -365,7 +363,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                notificationGutsManager,

                notificationLogger,

                notificationEntryManager,

                notificationRowContentBinder,

                notificationInterruptionStateProvider,

                notificationViewHierarchyManager,

                keyguardViewMediator,

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java

+0 −3
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ import com.android.systemui.statusbar.notification.VisualStabilityManager; 
import com.android.systemui.statusbar.notification.collection.init.NewNotifPipeline;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

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

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

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

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

import com.android.systemui.statusbar.phone.DozeParameters;
@@ -147,7 +146,6 @@ public class CarStatusBarModule { 
            NotificationGutsManager notificationGutsManager,

            NotificationLogger notificationLogger,

            NotificationEntryManager notificationEntryManager,

            NotificationRowContentBinder notificationRowContentBinder,

            NotificationInterruptionStateProvider notificationInterruptionStateProvider,

            NotificationViewHierarchyManager notificationViewHierarchyManager,

            KeyguardViewMediator keyguardViewMediator,
@@ -234,7 +232,6 @@ public class CarStatusBarModule { 
                notificationGutsManager,

                notificationLogger,

                notificationEntryManager,

                notificationRowContentBinder,

                notificationInterruptionStateProvider,

                notificationViewHierarchyManager,

                keyguardViewMediator,

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

+1 −9
Original line number Diff line number Diff line
@@ -584,15 +584,7 @@ public class NotificationRemoteInputManager implements Dumpable { 


    public void bindRow(ExpandableNotificationRow row) {

        row.setRemoteInputController(mRemoteInputController);

    }



    /**

     * Return on-click handler for notification remote views

     *

     * @return on-click handler

     */

    public RemoteViews.OnClickHandler getRemoteViewsOnClickHandler() {

        return mOnClickHandler;

        row.setRemoteViewClickHandler(mOnClickHandler);

    }



    @VisibleForTesting

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

+1 −3
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.systemui.statusbar; 


import android.content.Context;



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



import javax.inject.Singleton;



import dagger.Module;
@@ -28,7 +26,7 @@ import dagger.Provides; 
/**

 * Dagger Module providing common dependencies of StatusBar.

 */

@Module(includes = {NotificationRowModule.class})

@Module

public class StatusBarDependenciesModule {

    /**

     * Provides our instance of CommandQueue which is considered optional.

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

+19 −27
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ import com.android.systemui.statusbar.notification.NotificationClicker; 
import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

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

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

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

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

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

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

import com.android.systemui.statusbar.phone.KeyguardBypassController;
@@ -65,7 +65,6 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { 
            Dependency.get(NotificationInterruptionStateProvider.class);



    private final Context mContext;

    private final NotificationRowContentBinder mRowContentBinder;

    private final NotificationMessagingUtil mMessagingUtil;

    private final ExpandableNotificationRow.ExpansionLogger mExpansionLogger =

            this::logNotificationExpansion;
@@ -77,7 +76,7 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { 
    private NotificationPresenter mPresenter;

    private NotificationListContainer mListContainer;

    private HeadsUpManager mHeadsUpManager;

    private NotificationRowContentBinder.InflationCallback mInflationCallback;

    private NotificationContentInflater.InflationCallback mInflationCallback;

    private ExpandableNotificationRow.OnAppOpsClickListener mOnAppOpsClickListener;

    private BindRowCallback mBindRowCallback;

    private NotificationClicker mNotificationClicker;
@@ -85,13 +84,11 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { 


    public NotificationRowBinderImpl(

            Context context,

            NotificationRowContentBinder rowContentBinder,

            boolean allowLongPress,

            KeyguardBypassController keyguardBypassController,

            StatusBarStateController statusBarStateController,

            NotificationLogger logger) {

        mContext = context;

        mRowContentBinder = rowContentBinder;

        mMessagingUtil = new NotificationMessagingUtil(context);

        mAllowLongPress = allowLongPress;

        mKeyguardBypassController = keyguardBypassController;
@@ -120,7 +117,7 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { 
        mOnAppOpsClickListener = mGutsManager::openGuts;

    }



    public void setInflationCallback(NotificationRowContentBinder.InflationCallback callback) {

    public void setInflationCallback(NotificationContentInflater.InflationCallback callback) {

        mInflationCallback = callback;

    }
@@ -159,6 +156,19 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { 
    private void bindRow(NotificationEntry entry, PackageManager pmUser,

            StatusBarNotification sbn, ExpandableNotificationRow row,

            Runnable onDismissRunnable) {

        row.setExpansionLogger(mExpansionLogger, entry.getSbn().getKey());

        row.setBypassController(mKeyguardBypassController);

        row.setStatusBarStateController(mStatusBarStateController);

        row.setGroupManager(mGroupManager);

        row.setHeadsUpManager(mHeadsUpManager);

        row.setOnExpandClickListener(mPresenter);

        row.setInflationCallback(mInflationCallback);

        if (mAllowLongPress) {

            row.setLongPressListener(mGutsManager::openGuts);

        }

        mListContainer.bindRow(row);

        getRemoteInputManager().bindRow(row);



        // Get the app name.

        // Note that Notification.Builder#bindHeaderAppName has similar logic

        // but since this field is used in the guts, it must be accurate.
@@ -176,33 +186,15 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { 
        } catch (PackageManager.NameNotFoundException e) {

            // Do nothing

        }



        row.initialize(

                appname,

                sbn.getKey(),

                mExpansionLogger,

                mKeyguardBypassController,

                mGroupManager,

                mHeadsUpManager,

                mRowContentBinder,

                mPresenter);



        // TODO: Either move these into ExpandableNotificationRow#initialize or out of row entirely

        row.setStatusBarStateController(mStatusBarStateController);

        row.setInflationCallback(mInflationCallback);

        row.setAppOpsOnClickListener(mOnAppOpsClickListener);

        if (mAllowLongPress) {

            row.setLongPressListener(mGutsManager::openGuts);

        }

        mListContainer.bindRow(row);

        getRemoteInputManager().bindRow(row);



        row.setAppName(appname);

        row.setOnDismissRunnable(onDismissRunnable);

        row.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);

        if (ENABLE_REMOTE_INPUT) {

            row.setDescendantFocusability(ViewGroup.FOCUS_BEFORE_DESCENDANTS);

        }



        row.setAppOpsOnClickListener(mOnAppOpsClickListener);



        mBindRowCallback.onBindRow(entry, pmUser, sbn, row);

    }