[Catalyst] Vibration and haptics main switch migration

- Migrate "Use Vibration & haptics" main toggle in
  vibration settings screen.

- Add screen for VibrationScreen dashboard fragment

NO_IFTTT=introducing preference metadata files, no change in preference
controllers required.

Bug: 368360218
Flag: com.android.settings.flags.catalyst_vibration_intensity_screen
Test: VibrationIntensityScreenTest
      VibrationScreenTest
      VibrationMainSwitchPreferenceTest
Change-Id: I1dee7fdd59e093bd2dd12204554fe5198e7b76b4
This commit is contained in:
Lais Andrade
2024-11-20 12:13:24 +00:00
parent c1e4b09f9a
commit 08a7f6a5e7
13 changed files with 432 additions and 4 deletions

View File

@@ -15,15 +15,40 @@
*/
package com.android.settings.accessibility
import android.content.Context
import android.content.ContextWrapper
import android.content.res.Resources
import android.os.Vibrator
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.flags.Flags
import com.android.settings.R
import com.android.settingslib.preference.CatalystScreenTestCase
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.mock
import org.mockito.kotlin.spy
import org.mockito.kotlin.stub
// LINT.IfChange
@RunWith(AndroidJUnit4::class)
class VibrationIntensityScreenTest : CatalystScreenTestCase() {
private lateinit var vibrator: Vibrator
private val resourcesSpy: Resources =
spy((ApplicationProvider.getApplicationContext() as Context).resources)
private val context: Context =
object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
override fun getSystemService(name: String): Any? =
when {
name == getSystemServiceName(Vibrator::class.java) -> vibrator
else -> super.getSystemService(name)
}
override fun getResources(): Resources = resourcesSpy
}
override val preferenceScreenCreator = VibrationIntensityScreen()
@@ -34,4 +59,33 @@ class VibrationIntensityScreenTest : CatalystScreenTestCase() {
fun key() {
assertThat(preferenceScreenCreator.key).isEqualTo(VibrationIntensityScreen.KEY)
}
@Test
fun isAvailable_noVibrator_unavailable() {
vibrator = mock { on { hasVibrator() } doReturn false }
resourcesSpy.stub {
on { getInteger(R.integer.config_vibration_supported_intensity_levels) } doReturn 3
}
assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()
}
@Test
fun isAvailable_hasVibratorAndSingleIntensityLevel_unavailable() {
vibrator = mock { on { hasVibrator() } doReturn true }
resourcesSpy.stub {
on { getInteger(R.integer.config_vibration_supported_intensity_levels) } doReturn 1
}
assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()
}
@Test
fun isAvailable_hasVibratorAndMultipleIntensityLevels_available() {
vibrator = mock { on { hasVibrator() } doReturn true }
resourcesSpy.stub {
on { getInteger(R.integer.config_vibration_supported_intensity_levels) } doReturn 2
}
assertThat(preferenceScreenCreator.isAvailable(context)).isTrue()
}
}
// LINT.ThenChange(VibrationPreferenceControllerTest.java)

View File

@@ -41,6 +41,7 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
/** Tests for {@link VibrationMainSwitchPreferenceController}. */
// LINT.IfChange
@RunWith(RobolectricTestRunner.class)
public class VibrationMainSwitchPreferenceControllerTest {
@@ -104,3 +105,4 @@ public class VibrationMainSwitchPreferenceControllerTest {
return Settings.System.getInt(mContext.getContentResolver(), settingKey);
}
}
// LINT.ThenChange(VibrationMainSwitchPreferenceTest.kt)

View File

@@ -0,0 +1,77 @@
/*
* Copyright (C) 2024 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.accessibility
import android.content.Context
import android.provider.Settings.System.VIBRATE_ON
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settingslib.preference.createAndBindWidget
import com.android.settingslib.widget.MainSwitchPreference
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
// LINT.IfChange
@RunWith(AndroidJUnit4::class)
class VibrationMainSwitchPreferenceTest {
private val context: Context = ApplicationProvider.getApplicationContext()
private val preference = VibrationMainSwitchPreference()
@Test
fun checked_valueUnset_returnDefaultTrue() {
setVibrateOn(null)
assertThat(getMainSwitchPreference().isChecked).isTrue()
}
@Test
fun checked_valueEnabled_returnTrue() {
setVibrateOn(true)
assertThat(getMainSwitchPreference().isChecked).isTrue()
}
@Test
fun checked_valueDisabled_returnFalse() {
setVibrateOn(false)
assertThat(getMainSwitchPreference().isChecked).isFalse()
}
@Test
fun click_updatesCorrectly() {
setVibrateOn(null)
val widget = getMainSwitchPreference()
assertThat(widget.isChecked).isTrue()
widget.performClick()
assertThat(widget.isChecked).isFalse()
widget.performClick()
assertThat(widget.isChecked).isTrue()
}
private fun getMainSwitchPreference(): MainSwitchPreference =
preference.createAndBindWidget(context)
private fun setVibrateOn(enabled: Boolean?) =
preference.storage(context).setValue(VIBRATE_ON, Boolean::class.javaObjectType, enabled)
}
// LINT.ThenChange(VibrationMainSwitchPreferenceControllerTest.java)

View File

@@ -46,6 +46,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
// LINT.IfChange
@RunWith(RobolectricTestRunner.class)
public class VibrationPreferenceControllerTest {
private static final String PREFERENCE_KEY = "preference_key";
@@ -158,3 +159,7 @@ public class VibrationPreferenceControllerTest {
return controller;
}
}
// LINT.ThenChange(
// VibrationIntensityScreenTest.kt,
// VibrationScreenTest.kt,
// )

View File

@@ -0,0 +1,90 @@
/*
* Copyright (C) 2024 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.accessibility
import android.content.Context
import android.content.ContextWrapper
import android.content.res.Resources
import android.os.Vibrator
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.flags.Flags
import com.android.settings.R
import com.android.settingslib.preference.CatalystScreenTestCase
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.mock
import org.mockito.kotlin.spy
import org.mockito.kotlin.stub
// LINT.IfChange
@RunWith(AndroidJUnit4::class)
class VibrationScreenTest : CatalystScreenTestCase() {
private lateinit var vibrator: Vibrator
private val resourcesSpy: Resources =
spy((ApplicationProvider.getApplicationContext() as Context).resources)
private val context: Context =
object : ContextWrapper(ApplicationProvider.getApplicationContext()) {
override fun getSystemService(name: String): Any? =
when {
name == getSystemServiceName(Vibrator::class.java) -> vibrator
else -> super.getSystemService(name)
}
override fun getResources(): Resources = resourcesSpy
}
override val preferenceScreenCreator = VibrationScreen()
override val flagName: String
get() = Flags.FLAG_CATALYST_VIBRATION_INTENSITY_SCREEN
@Test
fun key() {
assertThat(preferenceScreenCreator.key).isEqualTo(VibrationScreen.KEY)
}
@Test
fun isAvailable_noVibrator_unavailable() {
vibrator = mock { on { hasVibrator() } doReturn false }
resourcesSpy.stub {
on { getInteger(R.integer.config_vibration_supported_intensity_levels) } doReturn 1
}
assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()
}
@Test
fun isAvailable_hasVibratorAndMultipleIntensityLevels_unavailable() {
vibrator = mock { on { hasVibrator() } doReturn true }
resourcesSpy.stub {
on { getInteger(R.integer.config_vibration_supported_intensity_levels) } doReturn 3
}
assertThat(preferenceScreenCreator.isAvailable(context)).isFalse()
}
@Test
fun isAvailable_hasVibratorAndSingleIntensityLevel_available() {
vibrator = mock { on { hasVibrator() } doReturn true }
resourcesSpy.stub {
on { getInteger(R.integer.config_vibration_supported_intensity_levels) } doReturn 1
}
assertThat(preferenceScreenCreator.isAvailable(context)).isTrue()
}
}
// LINT.ThenChange(VibrationPreferenceControllerTest.java)