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

Commit 7446c0fa authored by Chun-Ku Lin's avatar Chun-Ku Lin Committed by Android (Google) Code Review
Browse files

Merge "Remove backing fields for ColorAndMotionScreen" into main

parents 7f076bb3 b05a1aa5

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

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



import android.content.Context

import com.android.settings.flags.Flags

import com.android.settings.R

import com.android.settings.flags.Flags

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.preference.PreferenceScreenCreator



@ProvidePreferenceScreen

class ColorAndMotionScreen : PreferenceScreenCreator {

    override val key: String = KEY

    override val title: Int = R.string.accessibility_color_and_motion_title

    override val key: String

        get() = KEY



    override val title: Int

        get() = R.string.accessibility_color_and_motion_title



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


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





    companion object {

        const val KEY = "accessibility_color_and_motion"

    }

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

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

class ColorAndMotionScreenTest : CatalystScreenTestCase() {

    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() {}