Merge "Remove Dependency#get calls from NotificationGutsManager" into tm-qpr-dev am: c7549f0052 am: ffabe54b37
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21049859 Change-Id: Ie72e33ea540b598da12677c4787ae8eba7f84c6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dave Mankoff
@@ -16,27 +16,15 @@
|
||||
|
||||
package com.android.systemui.statusbar.notification.dagger;
|
||||
|
||||
import android.app.INotificationManager;
|
||||
import android.content.Context;
|
||||
import android.content.pm.LauncherApps;
|
||||
import android.content.pm.ShortcutManager;
|
||||
import android.os.Handler;
|
||||
import android.view.accessibility.AccessibilityManager;
|
||||
|
||||
import com.android.internal.logging.UiEventLogger;
|
||||
import com.android.systemui.R;
|
||||
import com.android.systemui.dagger.SysUISingleton;
|
||||
import com.android.systemui.dagger.qualifiers.Background;
|
||||
import com.android.systemui.dagger.qualifiers.Main;
|
||||
import com.android.systemui.dagger.qualifiers.UiBackground;
|
||||
import com.android.systemui.people.widget.PeopleSpaceWidgetManager;
|
||||
import com.android.systemui.plugins.statusbar.StatusBarStateController;
|
||||
import com.android.systemui.settings.UserContextProvider;
|
||||
import com.android.systemui.shade.ShadeController;
|
||||
import com.android.systemui.shade.ShadeEventsModule;
|
||||
import com.android.systemui.shade.ShadeExpansionStateManager;
|
||||
import com.android.systemui.statusbar.NotificationListener;
|
||||
import com.android.systemui.statusbar.notification.AssistantFeedbackController;
|
||||
import com.android.systemui.statusbar.notification.VisibilityLocationProvider;
|
||||
import com.android.systemui.statusbar.notification.collection.NotifInflaterImpl;
|
||||
import com.android.systemui.statusbar.notification.collection.NotifLiveDataStore;
|
||||
@@ -50,7 +38,6 @@ import com.android.systemui.statusbar.notification.collection.inflation.BindEven
|
||||
import com.android.systemui.statusbar.notification.collection.inflation.NotifInflater;
|
||||
import com.android.systemui.statusbar.notification.collection.inflation.OnUserInteractionCallbackImpl;
|
||||
import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection;
|
||||
import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider;
|
||||
import com.android.systemui.statusbar.notification.collection.provider.NotificationVisibilityProviderImpl;
|
||||
import com.android.systemui.statusbar.notification.collection.provider.SeenNotificationsProviderModule;
|
||||
import com.android.systemui.statusbar.notification.collection.provider.VisibilityLocationProviderDelegator;
|
||||
@@ -72,22 +59,17 @@ import com.android.systemui.statusbar.notification.interruption.NotificationInte
|
||||
import com.android.systemui.statusbar.notification.logging.NotificationLogger;
|
||||
import com.android.systemui.statusbar.notification.logging.NotificationPanelLogger;
|
||||
import com.android.systemui.statusbar.notification.logging.NotificationPanelLoggerImpl;
|
||||
import com.android.systemui.statusbar.notification.row.ChannelEditorDialogController;
|
||||
import com.android.systemui.statusbar.notification.row.NotificationGutsManager;
|
||||
import com.android.systemui.statusbar.notification.row.OnUserInteractionCallback;
|
||||
import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager;
|
||||
import com.android.systemui.statusbar.notification.stack.StackScrollAlgorithm;
|
||||
import com.android.systemui.statusbar.phone.CentralSurfaces;
|
||||
import com.android.systemui.statusbar.phone.KeyguardBypassController;
|
||||
import com.android.systemui.wmshell.BubblesManager;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.Executor;
|
||||
|
||||
import javax.inject.Provider;
|
||||
|
||||
import dagger.Binds;
|
||||
import dagger.Lazy;
|
||||
import dagger.Module;
|
||||
import dagger.Provides;
|
||||
|
||||
@@ -109,48 +91,6 @@ public interface NotificationsModule {
|
||||
@Binds
|
||||
StackScrollAlgorithm.BypassController bindBypassController(KeyguardBypassController impl);
|
||||
|
||||
/** Provides an instance of {@link NotificationGutsManager} */
|
||||
@SysUISingleton
|
||||
@Provides
|
||||
static NotificationGutsManager provideNotificationGutsManager(
|
||||
Context context,
|
||||
Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy,
|
||||
@Main Handler mainHandler,
|
||||
@Background Handler bgHandler,
|
||||
AccessibilityManager accessibilityManager,
|
||||
HighPriorityProvider highPriorityProvider,
|
||||
INotificationManager notificationManager,
|
||||
PeopleSpaceWidgetManager peopleSpaceWidgetManager,
|
||||
LauncherApps launcherApps,
|
||||
ShortcutManager shortcutManager,
|
||||
ChannelEditorDialogController channelEditorDialogController,
|
||||
UserContextProvider contextTracker,
|
||||
AssistantFeedbackController assistantFeedbackController,
|
||||
Optional<BubblesManager> bubblesManagerOptional,
|
||||
UiEventLogger uiEventLogger,
|
||||
OnUserInteractionCallback onUserInteractionCallback,
|
||||
ShadeController shadeController) {
|
||||
return new NotificationGutsManager(
|
||||
context,
|
||||
centralSurfacesOptionalLazy,
|
||||
mainHandler,
|
||||
bgHandler,
|
||||
accessibilityManager,
|
||||
highPriorityProvider,
|
||||
notificationManager,
|
||||
peopleSpaceWidgetManager,
|
||||
launcherApps,
|
||||
shortcutManager,
|
||||
channelEditorDialogController,
|
||||
contextTracker,
|
||||
assistantFeedbackController,
|
||||
bubblesManagerOptional,
|
||||
uiEventLogger,
|
||||
onUserInteractionCallback,
|
||||
shadeController
|
||||
);
|
||||
}
|
||||
|
||||
/** Provides an instance of {@link NotifGutsViewManager} */
|
||||
@Binds
|
||||
NotifGutsViewManager bindNotifGutsViewManager(NotificationGutsManager notificationGutsManager);
|
||||
|
||||
@@ -44,12 +44,10 @@ import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.UiEventLogger;
|
||||
import com.android.internal.logging.nano.MetricsProto;
|
||||
import com.android.settingslib.notification.ConversationIconFactory;
|
||||
import com.android.systemui.Dependency;
|
||||
import com.android.systemui.Dumpable;
|
||||
import com.android.systemui.R;
|
||||
import com.android.systemui.dagger.SysUISingleton;
|
||||
import com.android.systemui.dagger.qualifiers.Background;
|
||||
import com.android.systemui.dagger.qualifiers.Main;
|
||||
import com.android.systemui.dump.DumpManager;
|
||||
import com.android.systemui.people.widget.PeopleSpaceWidgetManager;
|
||||
import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;
|
||||
import com.android.systemui.plugins.statusbar.StatusBarStateController;
|
||||
@@ -65,28 +63,29 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry;
|
||||
import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider;
|
||||
import com.android.systemui.statusbar.notification.collection.render.NotifGutsViewListener;
|
||||
import com.android.systemui.statusbar.notification.collection.render.NotifGutsViewManager;
|
||||
import com.android.systemui.statusbar.notification.dagger.NotificationsModule;
|
||||
import com.android.systemui.statusbar.notification.stack.NotificationListContainer;
|
||||
import com.android.systemui.statusbar.phone.CentralSurfaces;
|
||||
import com.android.systemui.statusbar.policy.DeviceProvisionedController;
|
||||
import com.android.systemui.wmshell.BubblesManager;
|
||||
|
||||
import java.io.PrintWriter;
|
||||
import java.util.Optional;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.Lazy;
|
||||
|
||||
/**
|
||||
* Handles various NotificationGuts related tasks, such as binding guts to a row, opening and
|
||||
* closing guts, and keeping track of the currently exposed notification guts.
|
||||
*/
|
||||
@SysUISingleton
|
||||
public class NotificationGutsManager implements NotifGutsViewManager {
|
||||
private static final String TAG = "NotificationGutsManager";
|
||||
|
||||
// Must match constant in Settings. Used to highlight preferences when linking to Settings.
|
||||
private static final String EXTRA_FRAGMENT_ARG_KEY = ":settings:fragment_args_key";
|
||||
|
||||
private final MetricsLogger mMetricsLogger = Dependency.get(MetricsLogger.class);
|
||||
private final MetricsLogger mMetricsLogger;
|
||||
private final Context mContext;
|
||||
private final AccessibilityManager mAccessibilityManager;
|
||||
private final HighPriorityProvider mHighPriorityProvider;
|
||||
@@ -94,12 +93,9 @@ public class NotificationGutsManager implements NotifGutsViewManager {
|
||||
private final OnUserInteractionCallback mOnUserInteractionCallback;
|
||||
|
||||
// Dependencies:
|
||||
private final NotificationLockscreenUserManager mLockscreenUserManager =
|
||||
Dependency.get(NotificationLockscreenUserManager.class);
|
||||
private final StatusBarStateController mStatusBarStateController =
|
||||
Dependency.get(StatusBarStateController.class);
|
||||
private final DeviceProvisionedController mDeviceProvisionedController =
|
||||
Dependency.get(DeviceProvisionedController.class);
|
||||
private final NotificationLockscreenUserManager mLockscreenUserManager;
|
||||
private final StatusBarStateController mStatusBarStateController;
|
||||
private final DeviceProvisionedController mDeviceProvisionedController;
|
||||
private final AssistantFeedbackController mAssistantFeedbackController;
|
||||
|
||||
// which notification is currently being longpress-examined by the user
|
||||
@@ -124,9 +120,7 @@ public class NotificationGutsManager implements NotifGutsViewManager {
|
||||
private final ShadeController mShadeController;
|
||||
private NotifGutsViewListener mGutsListener;
|
||||
|
||||
/**
|
||||
* Injected constructor. See {@link NotificationsModule}.
|
||||
*/
|
||||
@Inject
|
||||
public NotificationGutsManager(Context context,
|
||||
Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy,
|
||||
@Main Handler mainHandler,
|
||||
@@ -143,7 +137,11 @@ public class NotificationGutsManager implements NotifGutsViewManager {
|
||||
Optional<BubblesManager> bubblesManagerOptional,
|
||||
UiEventLogger uiEventLogger,
|
||||
OnUserInteractionCallback onUserInteractionCallback,
|
||||
ShadeController shadeController) {
|
||||
ShadeController shadeController,
|
||||
NotificationLockscreenUserManager notificationLockscreenUserManager,
|
||||
StatusBarStateController statusBarStateController,
|
||||
DeviceProvisionedController deviceProvisionedController,
|
||||
MetricsLogger metricsLogger) {
|
||||
mContext = context;
|
||||
mCentralSurfacesOptionalLazy = centralSurfacesOptionalLazy;
|
||||
mMainHandler = mainHandler;
|
||||
@@ -161,6 +159,10 @@ public class NotificationGutsManager implements NotifGutsViewManager {
|
||||
mUiEventLogger = uiEventLogger;
|
||||
mOnUserInteractionCallback = onUserInteractionCallback;
|
||||
mShadeController = shadeController;
|
||||
mLockscreenUserManager = notificationLockscreenUserManager;
|
||||
mStatusBarStateController = statusBarStateController;
|
||||
mDeviceProvisionedController = deviceProvisionedController;
|
||||
mMetricsLogger = metricsLogger;
|
||||
}
|
||||
|
||||
public void setUpWithPresenter(NotificationPresenter presenter,
|
||||
@@ -372,7 +374,8 @@ public class NotificationGutsManager implements NotifGutsViewManager {
|
||||
mDeviceProvisionedController.isDeviceProvisioned(),
|
||||
row.getIsNonblockable(),
|
||||
mHighPriorityProvider.isHighPriority(row.getEntry()),
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -204,10 +204,11 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
|
||||
boolean isDeviceProvisioned,
|
||||
boolean isNonblockable,
|
||||
boolean wasShownHighPriority,
|
||||
AssistantFeedbackController assistantFeedbackController)
|
||||
AssistantFeedbackController assistantFeedbackController,
|
||||
MetricsLogger metricsLogger)
|
||||
throws RemoteException {
|
||||
mINotificationManager = iNotificationManager;
|
||||
mMetricsLogger = Dependency.get(MetricsLogger.class);
|
||||
mMetricsLogger = metricsLogger;
|
||||
mOnUserInteractionCallback = onUserInteractionCallback;
|
||||
mChannelEditorDialogController = channelEditorDialogController;
|
||||
mAssistantFeedbackController = assistantFeedbackController;
|
||||
|
||||
@@ -66,9 +66,9 @@ import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.UiEventLogger;
|
||||
import com.android.internal.logging.testing.UiEventLoggerFake;
|
||||
import com.android.systemui.SysuiTestCase;
|
||||
import com.android.systemui.dump.DumpManager;
|
||||
import com.android.systemui.people.widget.PeopleSpaceWidgetManager;
|
||||
import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;
|
||||
import com.android.systemui.plugins.statusbar.StatusBarStateController;
|
||||
import com.android.systemui.settings.UserContextProvider;
|
||||
import com.android.systemui.shade.ShadeController;
|
||||
import com.android.systemui.statusbar.NotificationLockscreenUserManager;
|
||||
@@ -133,18 +133,13 @@ public class NotificationGutsManagerTest extends SysuiTestCase {
|
||||
@Mock private ShadeController mShadeController;
|
||||
@Mock private PeopleSpaceWidgetManager mPeopleSpaceWidgetManager;
|
||||
@Mock private AssistantFeedbackController mAssistantFeedbackController;
|
||||
@Mock private NotificationLockscreenUserManager mNotificationLockscreenUserManager;
|
||||
@Mock private StatusBarStateController mStatusBarStateController;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mTestableLooper = TestableLooper.get(this);
|
||||
allowTestableLooperAsMainThread();
|
||||
mDependency.injectTestDependency(DeviceProvisionedController.class,
|
||||
mDeviceProvisionedController);
|
||||
mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger);
|
||||
mDependency.injectTestDependency(
|
||||
OnUserInteractionCallback.class,
|
||||
mOnUserInteractionCallback);
|
||||
mDependency.injectMockDependency(NotificationLockscreenUserManager.class);
|
||||
mHandler = Handler.createAsync(mTestableLooper.getLooper());
|
||||
mHelper = new NotificationTestHelper(mContext, mDependency, TestableLooper.get(this));
|
||||
when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(false);
|
||||
@@ -155,7 +150,11 @@ public class NotificationGutsManagerTest extends SysuiTestCase {
|
||||
mPeopleSpaceWidgetManager, mLauncherApps, mShortcutManager,
|
||||
mChannelEditorDialogController, mContextTracker, mAssistantFeedbackController,
|
||||
Optional.of(mBubblesManager), new UiEventLoggerFake(), mOnUserInteractionCallback,
|
||||
mShadeController);
|
||||
mShadeController,
|
||||
mNotificationLockscreenUserManager,
|
||||
mStatusBarStateController,
|
||||
mDeviceProvisionedController,
|
||||
mMetricsLogger);
|
||||
mGutsManager.setUpWithPresenter(mPresenter, mNotificationListContainer,
|
||||
mOnSettingsClickListener);
|
||||
mGutsManager.setNotificationActivityStarter(mNotificationActivityStarter);
|
||||
@@ -372,7 +371,8 @@ public class NotificationGutsManagerTest extends SysuiTestCase {
|
||||
eq(false),
|
||||
eq(false),
|
||||
eq(true), /* wasShownHighPriority */
|
||||
eq(mAssistantFeedbackController));
|
||||
eq(mAssistantFeedbackController),
|
||||
any(MetricsLogger.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -406,7 +406,8 @@ public class NotificationGutsManagerTest extends SysuiTestCase {
|
||||
eq(true),
|
||||
eq(false),
|
||||
eq(false), /* wasShownHighPriority */
|
||||
eq(mAssistantFeedbackController));
|
||||
eq(mAssistantFeedbackController),
|
||||
any(MetricsLogger.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -438,7 +439,8 @@ public class NotificationGutsManagerTest extends SysuiTestCase {
|
||||
eq(false),
|
||||
eq(false),
|
||||
eq(false), /* wasShownHighPriority */
|
||||
eq(mAssistantFeedbackController));
|
||||
eq(mAssistantFeedbackController),
|
||||
any(MetricsLogger.class));
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -130,7 +130,6 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
mContext.addMockSystemService(TelecomManager.class, mTelecomManager);
|
||||
|
||||
mDependency.injectTestDependency(Dependency.BG_LOOPER, mTestableLooper.getLooper());
|
||||
mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger);
|
||||
// Inflate the layout
|
||||
final LayoutInflater layoutInflater = LayoutInflater.from(mContext);
|
||||
mNotificationInfo = (NotificationInfo) layoutInflater.inflate(R.layout.notification_info,
|
||||
@@ -194,7 +193,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final TextView textView = mNotificationInfo.findViewById(R.id.pkg_name);
|
||||
assertTrue(textView.getText().toString().contains("App Name"));
|
||||
assertEquals(VISIBLE, mNotificationInfo.findViewById(R.id.header).getVisibility());
|
||||
@@ -220,7 +220,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final ImageView iconView = mNotificationInfo.findViewById(R.id.pkg_icon);
|
||||
assertEquals(iconDrawable, iconView.getDrawable());
|
||||
}
|
||||
@@ -242,7 +243,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final TextView nameView = mNotificationInfo.findViewById(R.id.delegate_name);
|
||||
assertEquals(GONE, nameView.getVisibility());
|
||||
}
|
||||
@@ -273,7 +275,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final TextView nameView = mNotificationInfo.findViewById(R.id.delegate_name);
|
||||
assertEquals(VISIBLE, nameView.getVisibility());
|
||||
assertTrue(nameView.getText().toString().contains("Proxied"));
|
||||
@@ -296,7 +299,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final TextView groupNameView = mNotificationInfo.findViewById(R.id.group_name);
|
||||
assertEquals(GONE, groupNameView.getVisibility());
|
||||
}
|
||||
@@ -324,7 +328,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final TextView groupNameView = mNotificationInfo.findViewById(R.id.group_name);
|
||||
assertEquals(View.VISIBLE, groupNameView.getVisibility());
|
||||
assertEquals("Test Group Name", groupNameView.getText());
|
||||
@@ -347,7 +352,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final TextView textView = mNotificationInfo.findViewById(R.id.channel_name);
|
||||
assertEquals(TEST_CHANNEL_NAME, textView.getText());
|
||||
}
|
||||
@@ -369,7 +375,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final TextView textView = mNotificationInfo.findViewById(R.id.channel_name);
|
||||
assertEquals(GONE, textView.getVisibility());
|
||||
}
|
||||
@@ -395,7 +402,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final TextView textView = mNotificationInfo.findViewById(R.id.channel_name);
|
||||
assertEquals(VISIBLE, textView.getVisibility());
|
||||
}
|
||||
@@ -417,7 +425,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final TextView textView = mNotificationInfo.findViewById(R.id.channel_name);
|
||||
assertEquals(VISIBLE, textView.getVisibility());
|
||||
}
|
||||
@@ -443,7 +452,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
final View settingsButton = mNotificationInfo.findViewById(R.id.info);
|
||||
settingsButton.performClick();
|
||||
@@ -468,7 +478,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final View settingsButton = mNotificationInfo.findViewById(R.id.info);
|
||||
assertTrue(settingsButton.getVisibility() != View.VISIBLE);
|
||||
}
|
||||
@@ -493,7 +504,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
false,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final View settingsButton = mNotificationInfo.findViewById(R.id.info);
|
||||
assertTrue(settingsButton.getVisibility() != View.VISIBLE);
|
||||
}
|
||||
@@ -515,7 +527,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
mNotificationInfo.bindNotification(
|
||||
mMockPackageManager,
|
||||
mMockINotificationManager,
|
||||
@@ -531,7 +544,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final View settingsButton = mNotificationInfo.findViewById(R.id.info);
|
||||
assertEquals(View.VISIBLE, settingsButton.getVisibility());
|
||||
}
|
||||
@@ -556,7 +570,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.findViewById(R.id.info).performClick();
|
||||
// Verify that listener was triggered.
|
||||
@@ -582,7 +597,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final TextView channelNameView =
|
||||
mNotificationInfo.findViewById(R.id.channel_name);
|
||||
assertEquals(GONE, channelNameView.getVisibility());
|
||||
@@ -606,7 +622,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
assertEquals(GONE, mNotificationInfo.findViewById(
|
||||
R.id.interruptiveness_settings).getVisibility());
|
||||
assertEquals(VISIBLE, mNotificationInfo.findViewById(
|
||||
@@ -630,7 +647,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final TextView view = mNotificationInfo.findViewById(R.id.non_configurable_text);
|
||||
assertEquals(View.VISIBLE, view.getVisibility());
|
||||
assertEquals(mContext.getString(R.string.notification_unblockable_desc),
|
||||
@@ -673,7 +691,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
final TextView view = mNotificationInfo.findViewById(R.id.non_configurable_call_text);
|
||||
assertEquals(View.VISIBLE, view.getVisibility());
|
||||
assertEquals(mContext.getString(R.string.notification_unblockable_call_desc),
|
||||
@@ -716,7 +735,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
assertEquals(GONE,
|
||||
mNotificationInfo.findViewById(R.id.non_configurable_call_text).getVisibility());
|
||||
assertEquals(VISIBLE,
|
||||
@@ -743,7 +763,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
assertEquals(VISIBLE, mNotificationInfo.findViewById(R.id.automatic).getVisibility());
|
||||
assertEquals(VISIBLE, mNotificationInfo.findViewById(R.id.automatic_summary).getVisibility());
|
||||
}
|
||||
@@ -765,7 +786,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
assertEquals(GONE, mNotificationInfo.findViewById(R.id.automatic).getVisibility());
|
||||
assertEquals(GONE, mNotificationInfo.findViewById(R.id.automatic_summary).getVisibility());
|
||||
}
|
||||
@@ -789,7 +811,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
assertTrue(mNotificationInfo.findViewById(R.id.automatic).isSelected());
|
||||
}
|
||||
|
||||
@@ -810,7 +833,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
assertTrue(mNotificationInfo.findViewById(R.id.alert).isSelected());
|
||||
}
|
||||
|
||||
@@ -831,7 +855,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
assertTrue(mNotificationInfo.findViewById(R.id.silence).isSelected());
|
||||
}
|
||||
|
||||
@@ -852,7 +877,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
mTestableLooper.processAllMessages();
|
||||
verify(mMockINotificationManager, never()).updateNotificationChannelForPackage(
|
||||
anyString(), eq(TEST_UID), any());
|
||||
@@ -875,7 +901,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
assertEquals(1, mUiEventLogger.numLogs());
|
||||
assertEquals(NotificationControlsEvent.NOTIFICATION_CONTROLS_OPEN.getId(),
|
||||
mUiEventLogger.eventId(0));
|
||||
@@ -899,7 +926,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.findViewById(R.id.alert).performClick();
|
||||
mTestableLooper.processAllMessages();
|
||||
@@ -926,7 +954,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.findViewById(R.id.silence).performClick();
|
||||
mTestableLooper.processAllMessages();
|
||||
@@ -953,7 +982,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.findViewById(R.id.automatic).performClick();
|
||||
mTestableLooper.processAllMessages();
|
||||
@@ -981,7 +1011,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.handleCloseControls(true, false);
|
||||
mTestableLooper.processAllMessages();
|
||||
@@ -1008,7 +1039,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.handleCloseControls(true, false);
|
||||
mTestableLooper.processAllMessages();
|
||||
@@ -1043,7 +1075,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.handleCloseControls(true, false);
|
||||
|
||||
@@ -1071,7 +1104,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.findViewById(R.id.silence).performClick();
|
||||
mNotificationInfo.findViewById(R.id.done).performClick();
|
||||
@@ -1112,7 +1146,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.findViewById(R.id.alert).performClick();
|
||||
mNotificationInfo.findViewById(R.id.done).performClick();
|
||||
@@ -1149,7 +1184,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.findViewById(R.id.automatic).performClick();
|
||||
mNotificationInfo.findViewById(R.id.done).performClick();
|
||||
@@ -1181,7 +1217,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.findViewById(R.id.silence).performClick();
|
||||
mNotificationInfo.findViewById(R.id.done).performClick();
|
||||
@@ -1217,7 +1254,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
assertEquals(mContext.getString(R.string.inline_done_button),
|
||||
((TextView) mNotificationInfo.findViewById(R.id.done)).getText());
|
||||
@@ -1255,7 +1293,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.findViewById(R.id.silence).performClick();
|
||||
mNotificationInfo.handleCloseControls(false, false);
|
||||
@@ -1286,7 +1325,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
assertEquals(mContext.getString(R.string.inline_done_button),
|
||||
((TextView) mNotificationInfo.findViewById(R.id.done)).getText());
|
||||
@@ -1324,7 +1364,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.findViewById(R.id.silence).performClick();
|
||||
mNotificationInfo.findViewById(R.id.done).performClick();
|
||||
@@ -1353,7 +1394,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
assertEquals(mContext.getString(R.string.inline_done_button),
|
||||
((TextView) mNotificationInfo.findViewById(R.id.done)).getText());
|
||||
@@ -1384,7 +1426,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.findViewById(R.id.alert).performClick();
|
||||
mNotificationInfo.findViewById(R.id.done).performClick();
|
||||
@@ -1419,7 +1462,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.findViewById(R.id.alert).performClick();
|
||||
mNotificationInfo.findViewById(R.id.done).performClick();
|
||||
@@ -1452,7 +1496,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.findViewById(R.id.alert).performClick();
|
||||
mNotificationInfo.findViewById(R.id.done).performClick();
|
||||
@@ -1485,7 +1530,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
mNotificationInfo.findViewById(R.id.alert).performClick();
|
||||
|
||||
@@ -1511,7 +1557,8 @@ public class NotificationInfoTest extends SysuiTestCase {
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
mAssistantFeedbackController);
|
||||
mAssistantFeedbackController,
|
||||
mMetricsLogger);
|
||||
|
||||
assertFalse(mNotificationInfo.willBeRemoved());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user