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

Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1

Browse Source 
am: dfae7fe0e0

Change-Id: I14b955b57ebafbc99a656270c967cd3a7c5417e9
This commit is contained in:
Leon Liao
2019-05-16 07:50:37 -07:00
committed by android-build-merger
parent 79ecab0822 dfae7fe0e0
commit 9eda4b017e
10 changed files with 38 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/values/arrays.xml
View File

@@ -674,15 +674,6 @@
<item>Accessibility volume</item>
</string-array>
<!-- Keys for the list of accessibility timeouts xml. -->
<string-array name="accessibility_timeout_content_selector_keys" translatable="false">
<item>accessibility_content_timeout_default</item>
<item>accessibility_content_timeout_10secs</item>
<item>accessibility_content_timeout_30secs</item>
<item>accessibility_content_timeout_1min</item>
<item>accessibility_content_timeout_2mins</item>
</string-array>
<!-- Keys for the list of accessibility timeouts xml. -->
<string-array name="accessibility_timeout_control_selector_keys" translatable="false">
<item>accessibility_control_timeout_default</item>

6
res/values/strings.xml
View File

@@ -4893,12 +4893,10 @@
<string name="accessibility_timeout_1min">1 minute</string>
<!-- Option heading to leave the timeout requirement for accessibility users at 2 mins. [CHAR LIMIT=35] -->
<string name="accessibility_timeout_2mins">2 minutes</string>
<!-- Title for accessibility preference to accessibility timeout. [CHAR LIMIT=35] -->
<string name="accessibility_content_timeout_preference_title">Time to read</string>
<!-- Title for accessibility settings timeout item. [CHAR LIMIT=43] -->
<string name="accessibility_setting_item_control_timeout_title">Time to take action (Accessibility timeout)</string>
<!-- Title for accessibility preference to accessibility timeout. [CHAR LIMIT=35] -->
<string name="accessibility_control_timeout_preference_title">Time to take action</string>
<!-- Descriptive text for accessibility preference to accessibility content timeout. [CHAR LIMIT=NONE] -->
<string name="accessibility_content_timeout_preference_summary">Choose how long to show messages that you need to read, but are visible only temporarily.\n\nNot all apps support this setting.</string>
<!-- Descriptive text for accessibility preference to accessibility control timeout. [CHAR LIMIT=NONE] -->
<string name="accessibility_control_timeout_preference_summary">Choose how long to show messages that ask you to take action, but are visible only temporarily.\n\nNot all apps support this setting.</string>

63
res/xml/accessibility_content_timeout_settings.xml
View File

@@ -1,63 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2018 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:key="accessibility_content_timeout_preference"
android:title="@string/accessibility_content_timeout_preference_title"
android:persistent="false" >
<com.android.settings.widget.VideoPreference
android:key="accessibility_content_timeout_video"
android:title="@string/summary_placeholder"
settings:animation="@raw/accessibility_timeout"
settings:preview="@drawable/accessibility_timeout"
settings:controller="com.android.settings.widget.VideoPreferenceController"
android:persistent="false" />
<com.android.settings.widget.RadioButtonPreference
android:key="accessibility_content_timeout_default"
android:title="@string/accessibility_timeout_default"
settings:allowDividerAbove="true"
android:persistent="false" />
<com.android.settings.widget.RadioButtonPreference
android:key="accessibility_content_timeout_10secs"
android:title="@string/accessibility_timeout_10secs"
android:persistent="false" />
<com.android.settings.widget.RadioButtonPreference
android:key="accessibility_content_timeout_30secs"
android:title="@string/accessibility_timeout_30secs"
android:persistent="false" />
<com.android.settings.widget.RadioButtonPreference
android:key="accessibility_content_timeout_1min"
android:title="@string/accessibility_timeout_1min"
android:persistent="false" />
<com.android.settings.widget.RadioButtonPreference
android:key="accessibility_content_timeout_2mins"
android:title="@string/accessibility_timeout_2mins"
android:persistent="false" />
<com.android.settingslib.widget.FooterPreference
android:title="@string/accessibility_content_timeout_preference_summary"
android:selectable="false" />
</PreferenceScreen>

8
res/xml/accessibility_settings.xml
View File

@@ -77,12 +77,6 @@
android:key="toggle_disable_animations"
android:title="@string/accessibility_disable_animations" />
<Preference
android:fragment="com.android.settings.accessibility.AccessibilityContentTimeoutPreferenceFragment"
android:key="accessibility_content_timeout_preference_fragment"
android:title="@string/accessibility_content_timeout_preference_title"
android:persistent="false" />
</PreferenceCategory>
<PreferenceCategory
@@ -115,7 +109,7 @@
<Preference
android:fragment="com.android.settings.accessibility.AccessibilityControlTimeoutPreferenceFragment"
android:key="accessibility_control_timeout_preference_fragment"
android:title="@string/accessibility_control_timeout_preference_title"
android:title="@string/accessibility_setting_item_control_timeout_title"
android:persistent="false" />
<Preference