Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev
* changes:
Update fingerprint/face enrollment to lock icon
Update fingerprint intro drawable
Remove SUW-specific fingerprint enroll description
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index dad5e0e..cce790b 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -159,6 +159,7 @@
android:key="notification_assistant"
android:order="23"
android:title="@string/notification_assistant_title"
- android:summary="@string/notification_assistant_summary"/>
+ android:summary="@string/notification_assistant_summary"
+ settings:controller="com.android.settings.notification.NotificationAssistantPreferenceController"/>
</PreferenceCategory>
</PreferenceScreen>
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index a41fab6..644d5cb 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -19,14 +19,11 @@
import android.app.Activity;
import android.app.Application;
import android.app.settings.SettingsEnums;
-import android.app.usage.IUsageStatsManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.os.ServiceManager;
import android.os.UserHandle;
-import android.os.UserManager;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
@@ -57,10 +54,11 @@
private static final int REQUEST_CODE = 200;
private static final String SELECTED_PREFERENCE_KEY = "selected_preference";
private static final String KEY_ADVANCED_CATEGORY = "configure_notifications_advanced";
- private static final String KEY_NAS = "notification_assistant";
private RingtonePreference mRequestPreference;
+ private NotificationAssistantPreferenceController mNotificationAssistantPreferenceController;
+
@Override
public int getMetricsCategory() {
return SettingsEnums.CONFIGURE_NOTIFICATION;
@@ -89,6 +87,16 @@
}
@Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+
+ mNotificationAssistantPreferenceController =
+ use(NotificationAssistantPreferenceController.class);
+ mNotificationAssistantPreferenceController.setFragment(this);
+ mNotificationAssistantPreferenceController.setBackend(new NotificationBackend());
+ }
+
+ @Override
protected boolean isParalleledControllers() {
return true;
}
@@ -105,9 +113,6 @@
}
});
- controllers.add(new NotificationAssistantPreferenceController(context,
- new NotificationBackend(), host, KEY_NAS));
-
controllers.add(new EmergencyBroadcastPreferenceController(context,
"app_and_notif_cell_broadcast_settings"));
diff --git a/src/com/android/settings/notification/NotificationAssistantPreferenceController.java b/src/com/android/settings/notification/NotificationAssistantPreferenceController.java
index a46f164..bdbc478 100644
--- a/src/com/android/settings/notification/NotificationAssistantPreferenceController.java
+++ b/src/com/android/settings/notification/NotificationAssistantPreferenceController.java
@@ -30,6 +30,8 @@
public class NotificationAssistantPreferenceController extends TogglePreferenceController {
private static final String TAG = "NASPreferenceController";
+ private static final String KEY_NAS = "notification_assistant";
+
private static final int AVAILABLE = 1;
private final UserManager mUserManager;
private Fragment mFragment;
@@ -38,11 +40,8 @@
@VisibleForTesting
protected NotificationBackend mNotificationBackend;
- public NotificationAssistantPreferenceController(Context context, NotificationBackend backend,
- Fragment fragment, String preferenceKey) {
- super(context, preferenceKey);
- mNotificationBackend = backend;
- mFragment = fragment;
+ public NotificationAssistantPreferenceController(Context context) {
+ super(context, KEY_NAS);
mUserManager = UserManager.get(context);
}
@@ -87,4 +86,13 @@
NotificationAssistantDialogFragment.newInstance(mFragment, cn);
dialogFragment.show(mFragment.getFragmentManager(), TAG);
}
+
+ public void setFragment(Fragment fragment) {
+ mFragment = fragment;
+ }
+
+ @VisibleForTesting
+ void setBackend(NotificationBackend backend) {
+ mNotificationBackend = backend;
+ }
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAssistantPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAssistantPreferenceControllerTest.java
index fe36615..d130711 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationAssistantPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationAssistantPreferenceControllerTest.java
@@ -79,8 +79,9 @@
when(mFragment.getFragmentManager()).thenReturn(mFragmentManager);
when(mFragmentManager.beginTransaction()).thenReturn(mFragmentTransaction);
when(mBackend.getDefaultNotificationAssistant()).thenReturn(mNASComponent);
- mPreferenceController = new NotificationAssistantPreferenceController(mContext,
- mBackend, mFragment, KEY);
+ mPreferenceController = new NotificationAssistantPreferenceController(mContext);
+ mPreferenceController.setBackend(mBackend);
+ mPreferenceController.setFragment(mFragment);
when(mUserManager.getProfileIds(eq(0), anyBoolean())).thenReturn(new int[] {0, 10});
when(mUserManager.getProfileIds(eq(20), anyBoolean())).thenReturn(new int[] {20});
}