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

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

Remove backing fields for ColorAndMotionScreen 

Bug: 373451690
Flag: EXEMPT refactor
Test: atest
Change-Id: I371bd221b6079c9816725e5253e110eef423fc5e
parent b34562ef

src/com/android/settings/accessibility/ColorAndMotionScreen.kt

+7 −5
Original line number Original line Diff line number Diff line
@@ -17,16 +17,19 @@ 
package com.android.settings.accessibility

package com.android.settings.accessibility





import android.content.Context

import android.content.Context

import com.android.settings.flags.Flags

import com.android.settings.R

import com.android.settings.R

import com.android.settings.flags.Flags

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.preference.PreferenceScreenCreator

import com.android.settingslib.preference.PreferenceScreenCreator





@ProvidePreferenceScreen

@ProvidePreferenceScreen

class ColorAndMotionScreen : PreferenceScreenCreator {

class ColorAndMotionScreen : PreferenceScreenCreator {

    override val key: String = KEY

    override val key: String

    override val title: Int = R.string.accessibility_color_and_motion_title

        get() = KEY



    override val title: Int

        get() = R.string.accessibility_color_and_motion_title





    override fun isFlagEnabled(context: Context) = Flags.catalystAccessibilityColorAndMotion()

    override fun isFlagEnabled(context: Context) = Flags.catalystAccessibilityColorAndMotion()
@@ -36,7 +39,6 @@ class ColorAndMotionScreen : PreferenceScreenCreator { 




    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}

    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}







    companion object {

    companion object {

        const val KEY = "accessibility_color_and_motion"

        const val KEY = "accessibility_color_and_motion"

    }

    }

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -27,7 +27,9 @@ import org.junit.runner.RunWith 
@RunWith(AndroidJUnit4::class)

@RunWith(AndroidJUnit4::class)

class ColorAndMotionScreenTest : CatalystScreenTestCase() {

class ColorAndMotionScreenTest : CatalystScreenTestCase() {

    override val preferenceScreenCreator: PreferenceScreenCreator = ColorAndMotionScreen()

    override val preferenceScreenCreator: PreferenceScreenCreator = ColorAndMotionScreen()

    override val flagName: String = Flags.FLAG_CATALYST_ACCESSIBILITY_COLOR_AND_MOTION



    override val flagName: String

        get() = Flags.FLAG_CATALYST_ACCESSIBILITY_COLOR_AND_MOTION





    override fun migration() {}

    override fun migration() {}