Merge "Add a cursor preference to Accessibility Settings"

res/xml/accessibility_cursor_settings.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/accessibility_screen_software_cursor_title"
+    settings:searchable="false">
+    <com.android.settings.widget.SettingsMainSwitchPreference
+        android:key="screen_software_cursor_preference_switch"
+        android:title="@string/accessibility_screen_software_cursor_title"
+        settings:controller="com.android.settings.accessibility.SoftwareCursorTogglePreferenceController"/>
+</PreferenceScreen>

res/xml/accessibility_settings.xml

@@ -102,6 +102,17 @@
             settings:keywords="@string/keywords_vibration"
             android:summary="@string/accessibility_vibration_settings_summary"/>
 
+        <!-- TODO(b/241023294): UX review of where Software Cursor feature should be positioned. -->
+        <Preference
+            android:key="software_cursor_preference_screen"
+            android:icon="@drawable/ic_accessibility_software_cursor"
+            android:fragment="com.android.settings.accessibility.CursorPreferenceFragment"
+            android:title="@string/accessibility_software_cursor_title"
+            settings:searchable="true"
+            settings:keywords="@string/keywords_software_cursor"
+            android:summary="@string/accessibility_software_cursor_summary"
+            settings:controller="com.android.settings.accessibility.SoftwareCursorPreferenceController"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory