From 1413f7428c6e1f8d2eb753fb647a3c75ea2cc6eb Mon Sep 17 00:00:00 2001
From: Jacky Wang <jiannan@google.com>
Date: Sat, 23 Nov 2024 12:57:15 +0800
Subject: [PATCH] [Catalyst] Update ColorAndMotionScreen

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
---
 res/xml/accessibility_settings.xml               |  2 +-
 .../accessibility/ColorAndMotionScreen.kt        | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index fcc5ce30a88..6703fafb218 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -47,7 +47,7 @@
 
         <Preference
             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:persistent="false"
             android:title="@string/accessibility_color_and_motion_title"
diff --git a/src/com/android/settings/accessibility/ColorAndMotionScreen.kt b/src/com/android/settings/accessibility/ColorAndMotionScreen.kt
index 6a6417cf0c8..2d5eb0f8ea1 100644
--- a/src/com/android/settings/accessibility/ColorAndMotionScreen.kt
+++ b/src/com/android/settings/accessibility/ColorAndMotionScreen.kt
@@ -18,7 +18,10 @@ package com.android.settings.accessibility
 
 import android.content.Context
 import com.android.settings.R
+import com.android.settings.Settings.ColorAndMotionActivity
 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.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
@@ -31,15 +34,22 @@ class ColorAndMotionScreen : PreferenceScreenCreator {
     override val title: Int
         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 hasCompleteHierarchy(): Boolean = false
 
     override fun fragmentClass() = ColorAndMotionFragment::class.java
 
-    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {
-        +RemoveAnimationsPreference();
-    }
+    override fun getPreferenceHierarchy(context: Context) =
+        preferenceHierarchy(this) {
+            +RemoveAnimationsPreference()
+        }
+
+    override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =
+        makeLaunchIntent(context, ColorAndMotionActivity::class.java, metadata?.key)
 
     companion object {
         const val KEY = "accessibility_color_and_motion"