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

[Catalyst] Update ColorAndMotionScreen

Browse Source 
Add icon and launch intent for ColorAndMotionScreen, also update the
entrypoint preference key to make it identical with screen key.

Bug: 373451690
Flag: com.android.settings.flags.catalyst_accessibility_color_and_motion
Test: atest
Change-Id: I1040d6fa5e8c89ddb6117a4b7671fd22c5a96578
This commit is contained in:
Jacky Wang
2024-11-23 12:57:15 +08:00
parent 50bbcbbcb7
commit 1413f7428c
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/accessibility_settings.xml
View File

@@ -47,7 +47,7 @@
<Preference <Preference
android:fragment="com.android.settings.accessibility.ColorAndMotionFragment" android:fragment="com.android.settings.accessibility.ColorAndMotionFragment"
android:key="color_and_motion" android:key="accessibility_color_and_motion"
android:icon="@drawable/ic_color_and_motion" android:icon="@drawable/ic_color_and_motion"
android:persistent="false" android:persistent="false"
android:title="@string/accessibility_color_and_motion_title" android:title="@string/accessibility_color_and_motion_title"

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

@@ -18,7 +18,10 @@ package com.android.settings.accessibility
import android.content.Context import android.content.Context
import com.android.settings.R import com.android.settings.R
import com.android.settings.Settings.ColorAndMotionActivity
import com.android.settings.flags.Flags import com.android.settings.flags.Flags
import com.android.settings.utils.makeLaunchIntent
import com.android.settingslib.metadata.PreferenceMetadata
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
@@ -31,16 +34,23 @@ class ColorAndMotionScreen : PreferenceScreenCreator {
override val title: Int override val title: Int
get() = R.string.accessibility_color_and_motion_title get() = R.string.accessibility_color_and_motion_title
override val icon: Int
get() = R.drawable.ic_color_and_motion
override fun isFlagEnabled(context: Context) = Flags.catalystAccessibilityColorAndMotion() override fun isFlagEnabled(context: Context) = Flags.catalystAccessibilityColorAndMotion()
override fun hasCompleteHierarchy(): Boolean = false override fun hasCompleteHierarchy(): Boolean = false
override fun fragmentClass() = ColorAndMotionFragment::class.java override fun fragmentClass() = ColorAndMotionFragment::class.java
override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) { override fun getPreferenceHierarchy(context: Context) =
+RemoveAnimationsPreference(); preferenceHierarchy(this) {
+RemoveAnimationsPreference()
} }
override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =
makeLaunchIntent(context, ColorAndMotionActivity::class.java, metadata?.key)
companion object { companion object {
const val KEY = "accessibility_color_and_motion" const val KEY = "accessibility_color_and_motion"
} }