Merge "Rename class"

src/com/android/settings/notification/AllowSoundPreferenceController.java

@@ -34,10 +34,10 @@ public class AllowSoundPreferenceController extends NotificationPreferenceContro
 
     private static final String TAG = "AllowSoundPrefContr";
     private static final String KEY_IMPORTANCE = "allow_sound";
-    private NotificationSettingsBase.ImportanceListener mImportanceListener;
+    private NotificationSettings.ImportanceListener mImportanceListener;
 
     public AllowSoundPreferenceController(Context context,
-            NotificationSettingsBase.ImportanceListener importanceListener,
+            NotificationSettings.ImportanceListener importanceListener,
             NotificationBackend backend) {
         super(context, backend);
         mImportanceListener = importanceListener;

src/com/android/settings/notification/AppBubbleNotificationSettings.java

@@ -30,7 +30,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @SearchIndexable
-public class AppBubbleNotificationSettings extends NotificationSettingsBase implements
+public class AppBubbleNotificationSettings extends NotificationSettings implements
         GlobalBubblePermissionObserverMixin.Listener {
     private static final String TAG = "AppBubNotiSettings";
     private GlobalBubblePermissionObserverMixin mObserverMixin;

src/com/android/settings/notification/AppNotificationSettings.java

@@ -34,7 +34,7 @@ import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 
 /** These settings are per app, so should not be returned in global search results. */
-public class AppNotificationSettings extends NotificationSettingsBase {
+public class AppNotificationSettings extends NotificationSettings {
     private static final String TAG = "AppNotificationSettings";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 

src/com/android/settings/notification/BlockPreferenceController.java

@@ -35,10 +35,10 @@ public class BlockPreferenceController extends NotificationPreferenceController
         implements PreferenceControllerMixin, SwitchBar.OnSwitchChangeListener {
 
     private static final String KEY_BLOCK = "block";
-    private NotificationSettingsBase.ImportanceListener mImportanceListener;
+    private NotificationSettings.ImportanceListener mImportanceListener;
 
     public BlockPreferenceController(Context context,
-            NotificationSettingsBase.ImportanceListener importanceListener,
+            NotificationSettings.ImportanceListener importanceListener,
             NotificationBackend backend) {
         super(context, backend);
         mImportanceListener = importanceListener;

src/com/android/settings/notification/ChannelNotificationSettings.java

@@ -35,7 +35,7 @@ import com.android.settingslib.core.AbstractPreferenceController;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ChannelNotificationSettings extends NotificationSettingsBase {
+public class ChannelNotificationSettings extends NotificationSettings {
     private static final String TAG = "ChannelSettings";
 
     @Override

src/com/android/settings/notification/HighImportancePreferenceController.java

@@ -31,10 +31,10 @@ public class HighImportancePreferenceController extends NotificationPreferenceCo
         implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener  {
 
     private static final String KEY_IMPORTANCE = "high_importance";
-    private NotificationSettingsBase.ImportanceListener mImportanceListener;
+    private NotificationSettings.ImportanceListener mImportanceListener;
 
     public HighImportancePreferenceController(Context context,
-            NotificationSettingsBase.ImportanceListener importanceListener,
+            NotificationSettings.ImportanceListener importanceListener,
             NotificationBackend backend) {
         super(context, backend);
         mImportanceListener = importanceListener;

src/com/android/settings/notification/ImportancePreferenceController.java

@@ -32,10 +32,10 @@ public class ImportancePreferenceController extends NotificationPreferenceContro
         implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener  {
 
     private static final String KEY_IMPORTANCE = "importance";
-    private NotificationSettingsBase.ImportanceListener mImportanceListener;
+    private NotificationSettings.ImportanceListener mImportanceListener;
 
     public ImportancePreferenceController(Context context,
-            NotificationSettingsBase.ImportanceListener importanceListener,
+            NotificationSettings.ImportanceListener importanceListener,
             NotificationBackend backend) {
         super(context, backend);
         mImportanceListener = importanceListener;

src/com/android/settings/notification/MinImportancePreferenceController.java

@@ -31,10 +31,10 @@ public class MinImportancePreferenceController extends NotificationPreferenceCon
         implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener  {
 
     private static final String KEY_IMPORTANCE = "min_importance";
-    private NotificationSettingsBase.ImportanceListener mImportanceListener;
+    private NotificationSettings.ImportanceListener mImportanceListener;
 
     public MinImportancePreferenceController(Context context,
-            NotificationSettingsBase.ImportanceListener importanceListener,
+            NotificationSettings.ImportanceListener importanceListener,
             NotificationBackend backend) {
         super(context, backend);
         mImportanceListener = importanceListener;

src/com/android/settings/notification/NotificationSettings.java

@@ -64,7 +64,7 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
-abstract public class NotificationSettingsBase extends DashboardFragment {
+abstract public class NotificationSettings extends DashboardFragment {
     private static final String TAG = "NotifiSettingsBase";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 

src/com/android/settings/notification/SoundPreferenceController.java

@@ -39,12 +39,12 @@ public class SoundPreferenceController extends NotificationPreferenceController
 
     private static final String KEY_SOUND = "ringtone";
     private final SettingsPreferenceFragment mFragment;
-    private final NotificationSettingsBase.ImportanceListener mListener;
+    private final NotificationSettings.ImportanceListener mListener;
     private NotificationSoundPreference mPreference;
     protected static final int CODE = 200;
 
     public SoundPreferenceController(Context context, SettingsPreferenceFragment hostFragment,
-            NotificationSettingsBase.ImportanceListener importanceListener,
+            NotificationSettings.ImportanceListener importanceListener,
             NotificationBackend backend) {
         super(context, backend);
         mFragment = hostFragment;

tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java

@@ -67,7 +67,7 @@ public class AllowSoundPreferenceControllerTest {
     private PreferenceScreen mScreen;
 
     @Mock
-    private NotificationSettingsBase.ImportanceListener mImportanceListener;
+    private NotificationSettings.ImportanceListener mImportanceListener;
 
     private AllowSoundPreferenceController mController;
 

tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java

@@ -68,7 +68,7 @@ public class BlockPreferenceControllerTest {
     private UserManager mUm;
 
     @Mock
-    private NotificationSettingsBase.ImportanceListener mImportanceListener;
+    private NotificationSettings.ImportanceListener mImportanceListener;
 
     private BlockPreferenceController mController;
     @Mock

tests/robotests/src/com/android/settings/notification/HighImportancePreferenceControllerTest.java

@@ -60,7 +60,7 @@ public class HighImportancePreferenceControllerTest {
     @Mock
     private NotificationBackend mBackend;
     @Mock
-    private NotificationSettingsBase.ImportanceListener mImportanceListener;
+    private NotificationSettings.ImportanceListener mImportanceListener;
     @Mock
     private UserManager mUm;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java

@@ -66,7 +66,7 @@ public class ImportancePreferenceControllerTest {
     @Mock
     private NotificationBackend mBackend;
     @Mock
-    private NotificationSettingsBase.ImportanceListener mImportanceListener;
+    private NotificationSettings.ImportanceListener mImportanceListener;
     @Mock
     private UserManager mUm;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/notification/MinImportancePreferenceControllerTest.java

@@ -60,7 +60,7 @@ public class MinImportancePreferenceControllerTest {
     @Mock
     private NotificationBackend mBackend;
     @Mock
-    private NotificationSettingsBase.ImportanceListener mImportanceListener;
+    private NotificationSettings.ImportanceListener mImportanceListener;
     @Mock
     private UserManager mUm;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java

@@ -79,7 +79,7 @@ public class SoundPreferenceControllerTest {
     @Mock
     private SettingsPreferenceFragment mFragment;
     @Mock
-    private NotificationSettingsBase.ImportanceListener mImportanceListener;
+    private NotificationSettings.ImportanceListener mImportanceListener;
 
     private SoundPreferenceController mController;