Merge "Make Accessibility settings a SUW suggestion" into oc-dr1-dev am: 2b836b0c0c
am: 3346d456f9
Change-Id: I620fb411d5a69b71b321371e494d3db1b8e7b4cf
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3c13d25..cbf1eae 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1435,6 +1435,7 @@
</activity>
<activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"
+ android:icon="@drawable/ic_accessibility_suggestion"
android:label="@string/vision_settings_title"
android:theme="@style/SetupWizardAccessibilityTheme"
android:taskAffinity="com.android.wizard" >
@@ -1442,6 +1443,12 @@
<action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="com.android.settings.suggested.category.DISPLAY_SETTINGS" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.title"
+ android:resource="@string/vision_settings_suggestion_title" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
diff --git a/res/drawable/ic_accessibility_suggestion.xml b/res/drawable/ic_accessibility_suggestion.xml
new file mode 100644
index 0000000..e21bd9f
--- /dev/null
+++ b/res/drawable/ic_accessibility_suggestion.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2017 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#ff767c81"
+ android:pathData="M9,4v3h5v12h3L17,7h5L22,4L9,4zM3,12h3v7h3v-7h3L12,9L3,9v3z"/>
+</vector>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 14d36f5..ec7183a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4212,6 +4212,8 @@
<string name="vision_settings_title">Vision Settings</string>
<!-- Settings description for a brief version of Vision-Related Accessibility Settings. Tells the user that they can adjust these settings now to help them through the remainder of the Setup Wizard and that they can later be changed in Settings. Displayed in Setup Wizard only. [CHAR LIMIT=none] -->
<string name="vision_settings_description">You can customize this device to fit your needs. These accessibility features can be changed later in Settings.</string>
+ <!-- Label for suggested action which will allow the user to change the font size and other accessibility settings. [CHAR LIMIT=40] -->
+ <string name="vision_settings_suggestion_title">Increase font size</string>
<!-- Title for the accessibility preference category of screen reader services and settings. [CHAR LIMIT=50] -->
<string name="screen_reader_category_title">Screen readers</string>
<!-- Title for the accessibility preference category of audio services and settings. [CHAR LIMIT=50] -->