Merge "[catalyst] migrate media controls settings" into main

tests/robotests/src/com/android/settings/sound/MediaControlsParentPreferenceControllerTest.java

@@ -38,7 +38,7 @@ import org.robolectric.RuntimeEnvironment;
 @RunWith(RobolectricTestRunner.class)
 public class MediaControlsParentPreferenceControllerTest {
 
-    private static final String KEY = "media_controls_summary";
+    private static final String KEY = "media_controls";
 
     private Context mContext;
     private int mOriginalQs;

tests/unit/src/com/android/settings/sound/MediaControlsLockScreenPreferenceControllerTest.java

@@ -32,6 +32,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+// LINT.IfChange
 @RunWith(AndroidJUnit4.class)
 public class MediaControlsLockScreenPreferenceControllerTest {
 
@@ -87,3 +88,4 @@ public class MediaControlsLockScreenPreferenceControllerTest {
                 Settings.Secure.MEDIA_CONTROLS_LOCK_SCREEN, -1)).isEqualTo(1);
     }
 }
+// LINT.ThenChange(MediaControlsLockScreenSwitchPreferenceTest.kt)

tests/unit/src/com/android/settings/sound/MediaControlsLockScreenSwitchPreferenceTest.kt

@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.sound
+
+import android.content.Context
+
+import androidx.preference.SwitchPreferenceCompat
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import com.android.settingslib.preference.createAndBindWidget
+import com.google.common.truth.Truth.assertThat
+
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+// LINT.IfChange
+@RunWith(AndroidJUnit4::class)
+class MediaControlsLockScreenSwitchPreferenceTest {
+    private val appContext: Context = ApplicationProvider.getApplicationContext()
+    private var originalValue: Boolean? = null
+    private val key = MediaControlsLockscreenSwitchPreference.KEY
+
+    private val preference = MediaControlsLockscreenSwitchPreference()
+
+    @Before
+    fun setUp() {
+        originalValue = preference.storage(appContext).getBoolean(key)
+    }
+
+    @After
+    fun tearDown() {
+        preference.storage(appContext).setBoolean(key, originalValue)
+    }
+
+    @Test
+    fun mediaControlsLockScreenDefaultValue_isChecked() {
+        preference.storage(appContext).setBoolean(key, null)
+
+        val switchPreference = getSwitchPreferenceCompat()
+
+        assertThat(switchPreference.isChecked).isTrue()
+    }
+
+    @Test
+    fun mediaControlsLockScreenEnabled_switchPreferenceIsChecked() {
+        setMediaControlsLockScreenEnabled(true)
+
+        val switchPreference = getSwitchPreferenceCompat()
+
+        assertThat(switchPreference.isChecked).isTrue()
+    }
+
+    @Test
+    fun mediaControlsLockScreenDisabled_switchPreferenceIsNotChecked() {
+        setMediaControlsLockScreenEnabled(false)
+
+        val switchPreference = getSwitchPreferenceCompat()
+
+        assertThat(switchPreference.isChecked).isFalse()
+    }
+
+    @Test
+    fun click_defaultMediaControlsLockScreenEnabled_turnOff() {
+        setMediaControlsLockScreenEnabled(true)
+
+        val switchPreference = getSwitchPreferenceCompat().apply { performClick() }
+
+        assertThat(switchPreference.isChecked).isFalse()
+    }
+
+    @Test
+    fun click_defaultMediaControlsLockScreenDisabled_turnOn() {
+        setMediaControlsLockScreenEnabled(false)
+
+        val switchPreference = getSwitchPreferenceCompat().apply { performClick() }
+
+        assertThat(switchPreference.isChecked).isTrue()
+    }
+
+    private fun getSwitchPreferenceCompat(): SwitchPreferenceCompat =
+        preference.createAndBindWidget(appContext)
+
+
+    private fun setMediaControlsLockScreenEnabled(value: Boolean) =
+        preference.storage(appContext).setBoolean(key, value)
+}
+// LINT.ThenChange(MediaControlsLockScreenPreferenceControllerTest.java)

tests/unit/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java

@@ -34,6 +34,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+// LINT.IfChange
 @RunWith(AndroidJUnit4.class)
 public class MediaControlsPreferenceControllerTest {
 
@@ -88,3 +89,4 @@ public class MediaControlsPreferenceControllerTest {
                 Settings.Secure.MEDIA_CONTROLS_RESUME, -1)).isEqualTo(1);
     }
 }
+// LINT.ThenChange(MediaControlsSwitchPreferenceTest.kt)

tests/unit/src/com/android/settings/sound/MediaControlsSwitchPreferenceTest.kt

@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.sound
+
+import android.content.Context
+
+import androidx.preference.SwitchPreferenceCompat
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import com.android.settingslib.datastore.SettingsSecureStore
+import com.android.settingslib.preference.createAndBindWidget
+import com.google.common.truth.Truth.assertThat
+
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+// LINT.IfChange
+@RunWith(AndroidJUnit4::class)
+class MediaControlsSwitchPreferenceTest {
+    private val appContext: Context = ApplicationProvider.getApplicationContext()
+    private var originalValue: Boolean? = null
+    private val store = MediaControlsScreen.MediaControlsStore(SettingsSecureStore.get(appContext))
+    private val key = MediaControlsSwitchPreference.KEY
+
+    private val preference = MediaControlsSwitchPreference(store)
+
+    @Before
+    fun setUp() {
+        originalValue = preference.storage(appContext).getBoolean(key)
+    }
+
+    @After
+    fun tearDown() {
+        preference.storage(appContext).setBoolean(key, originalValue)
+    }
+
+    @Test
+    fun mediaControlsLockScreenDefaultValue_isChecked() {
+        preference.storage(appContext).setBoolean(key, null)
+
+        val switchPreference = getSwitchPreferenceCompat()
+
+        assertThat(switchPreference.isChecked).isTrue()
+    }
+
+    @Test
+    fun mediaControlsLockScreenEnabled_switchPreferenceIsChecked() {
+        setMediaControlsResumeEnabled(true)
+
+        val switchPreference = getSwitchPreferenceCompat()
+
+        assertThat(switchPreference.isChecked).isTrue()
+    }
+
+    @Test
+    fun mediaControlsLockScreenDisabled_switchPreferenceIsNotChecked() {
+        setMediaControlsResumeEnabled(false)
+
+        val switchPreference = getSwitchPreferenceCompat()
+
+        assertThat(switchPreference.isChecked).isFalse()
+    }
+
+    @Test
+    fun click_defaultMediaControlsLockScreenEnabled_turnOff() {
+        setMediaControlsResumeEnabled(true)
+
+        val switchPreference = getSwitchPreferenceCompat().apply { performClick() }
+
+        assertThat(switchPreference.isChecked).isFalse()
+    }
+
+    @Test
+    fun click_defaultMediaControlsLockScreenDisabled_turnOn() {
+        setMediaControlsResumeEnabled(false)
+
+        val switchPreference = getSwitchPreferenceCompat().apply { performClick() }
+
+        assertThat(switchPreference.isChecked).isTrue()
+    }
+
+    private fun getSwitchPreferenceCompat(): SwitchPreferenceCompat =
+        preference.createAndBindWidget(appContext)
+
+
+    private fun setMediaControlsResumeEnabled(value: Boolean) =
+        preference.storage(appContext).setBoolean(key, value)
+}
+// LINT.ThenChange(MediaControlsPreferenceControllerTest.java)