Update R accessibility assets and strings (4/n)
- Color inversion preview
- Caption manager preview
- Dwell preview
Bug: 148837311
Test: Manual test
Change-Id: Ia637074c4282bbc51befc44efb0a4ff474f86b26
diff --git a/res/drawable/accessibility_captions.png b/res/drawable/accessibility_captions.png
new file mode 100644
index 0000000..5467386
--- /dev/null
+++ b/res/drawable/accessibility_captions.png
Binary files differ
diff --git a/res/drawable/accessibility_color_inversion_preview.png b/res/drawable/accessibility_color_inversion_preview.png
deleted file mode 100644
index 5c9f3ea..0000000
--- a/res/drawable/accessibility_color_inversion_preview.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/accessibility_dwell.png b/res/drawable/accessibility_dwell.png
new file mode 100644
index 0000000..b4f5598
--- /dev/null
+++ b/res/drawable/accessibility_dwell.png
Binary files differ
diff --git a/res/layout/color_inversion_preview.xml b/res/layout/accessibility_autoclick_preview.xml
similarity index 87%
rename from res/layout/color_inversion_preview.xml
rename to res/layout/accessibility_autoclick_preview.xml
index 18a0bb8..4fa3f8f 100644
--- a/res/layout/color_inversion_preview.xml
+++ b/res/layout/accessibility_autoclick_preview.xml
@@ -22,8 +22,9 @@
<ImageView
android:layout_width="match_parent"
- android:layout_height="@dimen/color_mode_preview_height"
+ android:layout_height="@dimen/autoclick_preview_height"
android:contentDescription="@null"
android:scaleType="fitCenter"
- android:src="@drawable/accessibility_color_inversion_preview"/>
+ android:src="@drawable/accessibility_dwell"/>
+
</FrameLayout>
diff --git a/res/layout/accessibility_captions_preview.xml b/res/layout/accessibility_captions_preview.xml
new file mode 100644
index 0000000..f3c0316
--- /dev/null
+++ b/res/layout/accessibility_captions_preview.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2020 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.
+ -->
+
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/captioning_preview_height"
+ android:contentDescription="@null"
+ android:scaleType="fitCenter"
+ android:src="@drawable/accessibility_captions" />
+
+</FrameLayout>
diff --git a/res/raw/accessibility_color_inversion.mp4 b/res/raw/accessibility_color_inversion.mp4
new file mode 100644
index 0000000..d28b9b4
--- /dev/null
+++ b/res/raw/accessibility_color_inversion.mp4
Binary files differ
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ef6b818..4ca9798 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -56,6 +56,8 @@
<dimen name="captioning_preview_height">200dp</dimen>
+ <dimen name="autoclick_preview_height">200dp</dimen>
+
<dimen name="color_mode_preview_height">320dp</dimen>
<dimen name="ring_progress_bar_thickness">4dp</dimen>
diff --git a/res/xml/accessibility_autoclick_settings.xml b/res/xml/accessibility_autoclick_settings.xml
index f126113..d387b58 100644
--- a/res/xml/accessibility_autoclick_settings.xml
+++ b/res/xml/accessibility_autoclick_settings.xml
@@ -19,6 +19,15 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/accessibility_autoclick_preference_title">
+ <com.android.settingslib.widget.LayoutPreference
+ android:key="accessibility_autoclick_preview"
+ android:layout="@layout/accessibility_autoclick_preview"
+ android:persistent="false"
+ android:selectable="false"
+ android:title="@string/summary_placeholder"
+ settings:allowDividerBelow="true"
+ settings:searchable="false" />
+
<com.android.settingslib.widget.RadioButtonPreference
android:key="accessibility_control_autoclick_default"
android:title="@string/accessibility_autoclick_default_title"
diff --git a/res/xml/accessibility_color_inversion_settings.xml b/res/xml/accessibility_color_inversion_settings.xml
index ba0d6fd..f44d41f 100644
--- a/res/xml/accessibility_color_inversion_settings.xml
+++ b/res/xml/accessibility_color_inversion_settings.xml
@@ -21,14 +21,14 @@
android:persistent="false"
android:title="@string/accessibility_display_inversion_preference_title">
- <com.android.settingslib.widget.LayoutPreference
+ <com.android.settings.widget.VideoPreference
android:key="color_inversion_preview"
- android:layout="@layout/color_inversion_preview"
android:persistent="false"
android:selectable="false"
android:title="@string/summary_placeholder"
- settings:allowDividerAbove="true"
settings:allowDividerBelow="true"
+ settings:animation="@raw/accessibility_color_inversion"
+ settings:controller="com.android.settings.widget.VideoPreferenceController"
settings:searchable="false" />
</PreferenceScreen>
diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml
index 2a709f2..7ae93b9 100644
--- a/res/xml/captioning_settings.xml
+++ b/res/xml/captioning_settings.xml
@@ -21,11 +21,21 @@
android:persistent="false"
android:title="@string/accessibility_captioning_title">
+ <com.android.settingslib.widget.LayoutPreference
+ android:key="captions_preview"
+ android:layout="@layout/accessibility_captions_preview"
+ android:persistent="false"
+ android:selectable="false"
+ android:title="@string/summary_placeholder"
+ settings:allowDividerBelow="true"
+ settings:searchable="false" />
+
<SwitchPreference
android:key="captioning_preference_switch"
android:persistent="false"
android:summary="@string/accessibility_caption_master_switch_summary"
- android:title="@string/accessibility_caption_master_switch_title" />
+ android:title="@string/accessibility_caption_master_switch_title"
+ settings:allowDividerAbove="true" />
<Preference
android:fragment="com.android.settings.accessibility.CaptionAppearanceFragment"
