Merge "Sync clean up for Spatial audio classes from tm-dev to master"

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

@@ -39,8 +39,9 @@ public class SpatialAudioParentPreferenceController extends BasePreferenceContro
         super(context, key);
         AudioManager audioManager = context.getSystemService(AudioManager.class);
         mSpatializer = audioManager.getSpatializer();
-        mSpatialAudioPreferenceController = new SpatialAudioPreferenceController(context);
+        mSpatialAudioPreferenceController = new SpatialAudioPreferenceController(context, "unused");
-        mSpatialAudioWiredHeadphonesController = new SpatialAudioWiredHeadphonesController(context);
+        mSpatialAudioWiredHeadphonesController = new SpatialAudioWiredHeadphonesController(context,
+                "unused");
     }
 
     @Override

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

@@ -32,18 +32,12 @@ import com.android.settings.core.TogglePreferenceController;
  */
 public class SpatialAudioPreferenceController extends TogglePreferenceController {
 
-    private static final String KEY_SPATIAL_AUDIO = "spatial_audio";
-
     private final Spatializer mSpatializer;
     @VisibleForTesting
     final AudioDeviceAttributes mSpeaker = new AudioDeviceAttributes(
             AudioDeviceAttributes.ROLE_OUTPUT, AudioDeviceInfo.TYPE_BUILTIN_SPEAKER, ""
     );
 
-    public SpatialAudioPreferenceController(Context context) {
-        this(context, KEY_SPATIAL_AUDIO);
-    }
-
     public SpatialAudioPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
         AudioManager audioManager = context.getSystemService(AudioManager.class);

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

@@ -17,17 +17,12 @@
 package com.android.settings.notification;
 
 import android.app.settings.SettingsEnums;
-import android.content.Context;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.search.SearchIndexable;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Spatial audio settings located in the sound menu
  */
@@ -51,19 +46,6 @@ public class SpatialAudioSettings extends DashboardFragment {
         return TAG;
     }
 
-    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
-        final List<AbstractPreferenceController> controllers = new ArrayList<>();
-        controllers.add(new SpatialAudioPreferenceController(context));
-        controllers.add(new SpatialAudioWiredHeadphonesController(context));
-        return controllers;
-    }
-
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.spatial_audio_settings) {
+            new BaseSearchIndexProvider(R.xml.spatial_audio_settings);
-                @Override
-                public List<AbstractPreferenceController> createPreferenceControllers(
-                        Context context) {
-                    return buildPreferenceControllers(context);
-                }
-            };
 }

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

@@ -32,19 +32,12 @@ import com.android.settings.core.TogglePreferenceController;
  */
 public class SpatialAudioWiredHeadphonesController extends TogglePreferenceController {
 
-    private static final String KEY_SPATIAL_AUDIO_WIRED_HEADPHONES =
-            "spatial_audio_wired_headphones";
-
     private final Spatializer mSpatializer;
     @VisibleForTesting
     final AudioDeviceAttributes mWiredHeadphones = new AudioDeviceAttributes(
             AudioDeviceAttributes.ROLE_OUTPUT, AudioDeviceInfo.TYPE_WIRED_HEADPHONES, ""
     );
 
-    public SpatialAudioWiredHeadphonesController(Context context) {
-        this(context, KEY_SPATIAL_AUDIO_WIRED_HEADPHONES);
-    }
-
     public SpatialAudioWiredHeadphonesController(Context context, String preferenceKey) {
         super(context, preferenceKey);
         AudioManager audioManager = context.getSystemService(AudioManager.class);

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

@@ -31,7 +31,6 @@ import android.media.Spatializer;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -42,7 +41,7 @@ public class SpatialAudioParentPreferenceControllerTest {
 
     private static final String KEY = "spatial_audio_summary";
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    @Mock
     private Context mContext;
     @Mock
     private AudioManager mAudioManager;

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

@@ -56,7 +56,7 @@ public class SpatialAudioPreferenceControllerTest {
         mContext = spy(RuntimeEnvironment.application);
         when(mContext.getSystemService(AudioManager.class)).thenReturn(mAudioManager);
         when(mAudioManager.getSpatializer()).thenReturn(mSpatializer);
-        mController = new SpatialAudioPreferenceController(mContext);
+        mController = new SpatialAudioPreferenceController(mContext, "unused");
     }
 
     @Test

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

@@ -56,7 +56,7 @@ public class SpatialAudioWiredHeadphonesPreferenceControllerTest {
         mContext = spy(RuntimeEnvironment.application);
         when(mContext.getSystemService(AudioManager.class)).thenReturn(mAudioManager);
         when(mAudioManager.getSpatializer()).thenReturn(mSpatializer);
-        mController = new SpatialAudioWiredHeadphonesController(mContext);
+        mController = new SpatialAudioWiredHeadphonesController(mContext, "unused");
     }
 
     @Test