PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove backing fields for ColorAndMotionScreen" into main

Browse Source
This commit is contained in:
Chun-Ku Lin
2024-10-22 13:30:44 +00:00
committed by Android (Google) Code Review
parent 7f076bb3c4 b05a1aa543
commit 7446c0fa22
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/accessibility/ColorAndMotionScreen.kt
View File

@@ -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"
} }

4
tests/robotests/src/com/android/settings/accessibility/ColorAndMotionScreenTest.kt
View File

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