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

Merge "Update the Lottie images for Accessibility features." into sc-dev am: 909e3bbccf

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999190

Change-Id: I556deb4f2a13894af669750d4d77214c52ed6cfc
This commit is contained in:
PETER LIANG
2021-06-18 08:46:53 +00:00
committed by Automerger Merge Worker
parent 159b877d6c 909e3bbccf
commit 07300f7a0f
7 changed files with 13480 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-nodpi/accessibility_timeout.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
res/drawable/extra_dim_banner.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 123 KiB

BIN
res/raw/accessibility_timeout.mp4
View File

Binary file not shown.

10617
res/raw/accessibility_timeout_banner.json Normal file
View File

File diff suppressed because it is too large Load Diff

2859
res/raw/extra_dim_banner.json Normal file
View File

File diff suppressed because it is too large Load Diff

10
res/xml/accessibility_control_timeout_settings.xml
View File

@@ -21,13 +21,9 @@
android:title="@string/accessibility_control_timeout_preference_title"
android:persistent="false" >
<com.android.settings.widget.VideoPreference
android:key="accessibility_control_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.settingslib.widget.IllustrationPreference
android:key="accessibility_control_timeout_banner"
settings:lottie_rawRes="@raw/accessibility_timeout_banner"/>
<com.android.settingslib.widget.RadioButtonPreference
android:key="accessibility_control_timeout_default"

2
src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
View File

@@ -62,7 +62,7 @@ public class ToggleReduceBrightColorsPreferenceFragment extends ToggleFeaturePre
mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
.authority(getPrefContext().getPackageName())
.appendPath(String.valueOf(R.drawable.extra_dim_banner))
.appendPath(String.valueOf(R.raw.extra_dim_banner))
.build();
mComponentName = AccessibilityShortcutController.REDUCE_BRIGHT_COLORS_COMPONENT_NAME;
mPackageName = getText(R.string.reduce_bright_colors_preference_title);