[Catalyst] Simplify KeyValueStore API calls

NO_IFTTT=Catalyst only

Bug: 325144964
Flag: com.android.settings.flags.catalyst
Test: atest
Change-Id: I518b9c861eac6d515dfc7f0ac2d028f9395e06a1

src/com/android/settings/network/AirplaneModePreference.kt

@@ -152,7 +152,7 @@ class AirplaneModePreference :
         data: Intent?,
     ): Boolean {
         if (requestCode == REQUEST_CODE_EXIT_ECM && resultCode == Activity.RESULT_OK) {
-            storage(context).setValue(KEY, Boolean::class.javaObjectType, true)
+            storage(context).setBoolean(KEY, true)
         }
         return true
     }

tests/robotests/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceTest.kt

@@ -72,6 +72,6 @@ class VibrationMainSwitchPreferenceTest {
         preference.createAndBindWidget(context)
 
     private fun setVibrateOn(enabled: Boolean?) =
-        preference.storage(context).setValue(VIBRATE_ON, Boolean::class.javaObjectType, enabled)
+        preference.storage(context).setBoolean(VIBRATE_ON, enabled)
 }
 // LINT.ThenChange(VibrationMainSwitchPreferenceControllerTest.java)

tests/robotests/src/com/android/settings/connecteddevice/BluetoothMainSwitchPreferenceTest.kt

@@ -29,21 +29,17 @@ import org.junit.runner.RunWith
 import org.mockito.kotlin.spy
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
-import org.robolectric.RuntimeEnvironment
 
 @RunWith(AndroidJUnit4::class)
 class BluetoothMainSwitchPreferenceTest {
-    @get:Rule
+    @get:Rule val setFlagsRule = SetFlagsRule()
-    val setFlagsRule = SetFlagsRule()
     private val context: Context = ApplicationProvider.getApplicationContext()
     private lateinit var bluetoothAdapter: BluetoothAdapter
     private lateinit var bluetoothMainSwitchPreference: BluetoothMainSwitchPreference
 
     @Before
     fun setUp() {
-        bluetoothAdapter = spy(
+        bluetoothAdapter = spy(BluetoothAdapter.getDefaultAdapter())
-            BluetoothAdapter.getDefaultAdapter()
-        )
         whenever(bluetoothAdapter.state).thenReturn(BluetoothAdapter.STATE_ON)
         bluetoothMainSwitchPreference = BluetoothMainSwitchPreference(bluetoothAdapter)
     }
@@ -62,19 +58,19 @@ class BluetoothMainSwitchPreferenceTest {
 
     @Test
     fun storageSetOff_turnOff() {
-        bluetoothMainSwitchPreference.storage(context).setValue(
+        bluetoothMainSwitchPreference
-            bluetoothMainSwitchPreference.key, Boolean::class.javaObjectType, false
+            .storage(context)
-        )
+            .setBoolean(bluetoothMainSwitchPreference.key, false)
 
         verify(bluetoothAdapter).disable()
     }
 
     @Test
     fun storageSetOn_turnOn() {
-        bluetoothMainSwitchPreference.storage(context).setValue(
+        bluetoothMainSwitchPreference
-            bluetoothMainSwitchPreference.key, Boolean::class.javaObjectType, true
+            .storage(context)
-        )
+            .setBoolean(bluetoothMainSwitchPreference.key, true)
 
         verify(bluetoothAdapter).enable()
     }
-}
+}

tests/robotests/src/com/android/settings/display/BatteryPercentageSwitchPreferenceTest.kt

@@ -117,11 +117,8 @@ class BatteryPercentageSwitchPreferenceTest {
         batteryPercentageSwitchPreference.createAndBindWidget(context)
 
     private fun showBatteryPercentage(on: Boolean) =
-        batteryPercentageSwitchPreference
+        batteryPercentageSwitchPreference.storage(context).setBoolean(
-            .storage(context)
-            .setValue(
                 Settings.System.SHOW_BATTERY_PERCENT,
-                Boolean::class.javaObjectType,
                 on,
             )
 }

tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverPreferenceTest.kt

@@ -75,18 +75,14 @@ class BatterySaverPreferenceTest {
 
     @Test
     fun storeSetOn_setPowerSaveMode() {
-        batterySaverPreference
+        batterySaverPreference.storage(context).setBoolean(batterySaverPreference.key, true)
-            .storage(context)
-            .setValue(batterySaverPreference.key, Boolean::class.javaObjectType, true)
 
         verify(powerManager).setPowerSaveModeEnabled(true)
     }
 
     @Test
     fun storeSetOff_unsetPowerSaveMode() {
-        batterySaverPreference
+        batterySaverPreference.storage(context).setBoolean(batterySaverPreference.key, false)
-            .storage(context)
-            .setValue(batterySaverPreference.key, Boolean::class.javaObjectType, false)
 
         verify(powerManager).setPowerSaveModeEnabled(false)
     }

tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceTest.kt

@@ -96,11 +96,11 @@ class AdaptiveConnectivityTogglePreferenceTest {
     private fun setAdaptiveConnectivityEnabled(enabled: Boolean) =
         adaptiveConnectivityTogglePreference
             .storage(context)
-            .setValue(ADAPTIVE_CONNECTIVITY_ENABLED, Boolean::class.javaObjectType, enabled)
+            .setBoolean(ADAPTIVE_CONNECTIVITY_ENABLED, enabled)
 
     private fun getAdaptiveConnectivityEnabled() =
         adaptiveConnectivityTogglePreference
             .storage(context)
-            .getValue(ADAPTIVE_CONNECTIVITY_ENABLED, Boolean::class.javaObjectType)
+            .getBoolean(ADAPTIVE_CONNECTIVITY_ENABLED)
 }
 // LINT.ThenChange(AdaptiveConnectivityTogglePreferenceControllerTest.java)

tests/robotests/src/com/android/settings/network/AirplaneModePreferenceTest.kt

@@ -88,9 +88,7 @@ class AirplaneModePreferenceTest {
         SettingsGlobalStore.get(context).setInt(Settings.Global.AIRPLANE_MODE_ON, 1)
 
         val getValue =
-            airplaneModePreference
+            airplaneModePreference.storage(context).getBoolean(AirplaneModePreference.KEY)
-                .storage(context)
-                .getValue(AirplaneModePreference.KEY, Boolean::class.javaObjectType)
 
         assertThat(getValue).isTrue()
     }
@@ -100,9 +98,7 @@ class AirplaneModePreferenceTest {
         SettingsGlobalStore.get(context).setInt(Settings.Global.AIRPLANE_MODE_ON, 0)
 
         val getValue =
-            airplaneModePreference
+            airplaneModePreference.storage(context).getBoolean(AirplaneModePreference.KEY)
-                .storage(context)
-                .getValue(AirplaneModePreference.KEY, Boolean::class.javaObjectType)
 
         assertThat(getValue).isFalse()
     }

tests/unit/src/com/android/settings/wifi/WifiSwitchPreferenceTest.kt

@@ -49,9 +49,7 @@ class WifiSwitchPreferenceTest {
     fun getValue_defaultOn_returnOn() {
         mockWifiManager.stub { on { isWifiEnabled } doReturn true }
 
-        val getValue = wifiSwitchPreference
+        val getValue = wifiSwitchPreference.storage(context).getBoolean(WifiSwitchPreference.KEY)
-            .storage(context)
-            .getValue(WifiSwitchPreference.KEY, Boolean::class.javaObjectType)
 
         assertThat(getValue).isTrue()
     }
@@ -60,9 +58,7 @@ class WifiSwitchPreferenceTest {
     fun getValue_defaultOff_returnOff() {
         mockWifiManager.stub { on { isWifiEnabled } doReturn false }
 
-        val getValue = wifiSwitchPreference
+        val getValue = wifiSwitchPreference.storage(context).getBoolean(WifiSwitchPreference.KEY)
-            .storage(context)
-            .getValue(WifiSwitchPreference.KEY, Boolean::class.javaObjectType)
 
         assertThat(getValue).isFalse()
     }
@@ -87,4 +83,4 @@ class WifiSwitchPreferenceTest {
 
     private fun getSwitchPreference(): SwitchPreferenceCompat =
         wifiSwitchPreference.createAndBindWidget(context)
-}
+}