Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc1a52a2 authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Simplify KeyValueStore API calls 

NO_IFTTT=Catalyst only

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

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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+9 −13
Original line number Diff line number Diff line
@@ -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

    val setFlagsRule = SetFlagsRule()

    @get:Rule 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.getDefaultAdapter()

        )

        bluetoothAdapter = spy(BluetoothAdapter.getDefaultAdapter())

        whenever(bluetoothAdapter.state).thenReturn(BluetoothAdapter.STATE_ON)

        bluetoothMainSwitchPreference = BluetoothMainSwitchPreference(bluetoothAdapter)

    }
@@ -62,18 +58,18 @@ class BluetoothMainSwitchPreferenceTest { 


    @Test

    fun storageSetOff_turnOff() {

        bluetoothMainSwitchPreference.storage(context).setValue(

            bluetoothMainSwitchPreference.key, Boolean::class.javaObjectType, false

        )

        bluetoothMainSwitchPreference

            .storage(context)

            .setBoolean(bluetoothMainSwitchPreference.key, false)



        verify(bluetoothAdapter).disable()

    }



    @Test

    fun storageSetOn_turnOn() {

        bluetoothMainSwitchPreference.storage(context).setValue(

            bluetoothMainSwitchPreference.key, Boolean::class.javaObjectType, true

        )

        bluetoothMainSwitchPreference

            .storage(context)

            .setBoolean(bluetoothMainSwitchPreference.key, true)



        verify(bluetoothAdapter).enable()

    }

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

+1 −4
Original line number Diff line number Diff line
@@ -117,11 +117,8 @@ class BatteryPercentageSwitchPreferenceTest { 
        batteryPercentageSwitchPreference.createAndBindWidget(context)



    private fun showBatteryPercentage(on: Boolean) =

        batteryPercentageSwitchPreference

            .storage(context)

            .setValue(

        batteryPercentageSwitchPreference.storage(context).setBoolean(

                Settings.System.SHOW_BATTERY_PERCENT,

                Boolean::class.javaObjectType,

                on,

            )

}

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

+2 −6
Original line number Diff line number Diff line
@@ -75,18 +75,14 @@ class BatterySaverPreferenceTest { 


    @Test

    fun storeSetOn_setPowerSaveMode() {

        batterySaverPreference

            .storage(context)

            .setValue(batterySaverPreference.key, Boolean::class.javaObjectType, true)

        batterySaverPreference.storage(context).setBoolean(batterySaverPreference.key, true)



        verify(powerManager).setPowerSaveModeEnabled(true)

    }



    @Test

    fun storeSetOff_unsetPowerSaveMode() {

        batterySaverPreference

            .storage(context)

            .setValue(batterySaverPreference.key, Boolean::class.javaObjectType, false)

        batterySaverPreference.storage(context).setBoolean(batterySaverPreference.key, false)



        verify(powerManager).setPowerSaveModeEnabled(false)

    }