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

Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5

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

Change-Id: If20ac2d389642d8de204c1b9e709b027bc22b3be
This commit is contained in:
PETER LIANG
2021-06-14 03:12:36 +00:00
committed by Automerger Merge Worker
parent 64d5b55607 a96c844df5
commit ec7f4821b2
7 changed files with 8632 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable/accessibility_color_inversion_banner.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 692 KiB

BIN
res/drawable/accessibility_magnification_banner.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 MiB

25
res/layout/preference_animated_image.xml
View File

@@ -15,30 +15,31 @@
limitations under the License. limitations under the License.
--> -->
<FrameLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/settingslib_illustration_height"
android:clipToPadding="false" android:gravity="center"
android:padding="@dimen/settingslib_illustration_padding"
android:orientation="vertical"
android:importantForAccessibility="noHideDescendants"> android:importantForAccessibility="noHideDescendants">
<ImageView <ImageView
android:id="@+id/animated_img" android:id="@+id/animated_img"
android:layout_width="match_parent" android:maxWidth="@dimen/settingslib_illustration_width"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center" android:layout_height="match_parent"
android:background="@drawable/protection_background"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:focusable="false"
android:clickable="false"
android:adjustViewBounds="true"/> android:adjustViewBounds="true"/>
<com.airbnb.lottie.LottieAnimationView <com.airbnb.lottie.LottieAnimationView
android:id="@+id/lottie_view" android:id="@+id/lottie_view"
android:layout_width="412dp" android:maxWidth="@dimen/settingslib_illustration_width"
android:layout_height="300dp" android:layout_width="wrap_content"
android:layout_gravity="center" android:layout_height="match_parent"
android:background="@drawable/protection_background" android:background="@drawable/protection_background"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:clipToOutline="true"/> android:clipToOutline="true"/>
</FrameLayout> </LinearLayout>

2888
res/raw/accessibility_color_inversion_banner.json Normal file
View File

File diff suppressed because it is too large Load Diff

5729
res/raw/accessibility_magnification_banner.json Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -80,7 +80,7 @@ public class ToggleColorInversionPreferenceFragment extends
mHtmlDescription = getText(R.string.accessibility_display_inversion_preference_subtitle); mHtmlDescription = getText(R.string.accessibility_display_inversion_preference_subtitle);
mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE) mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
.authority(getPrefContext().getPackageName()) .authority(getPrefContext().getPackageName())
.appendPath(String.valueOf(R.drawable.accessibility_color_inversion_banner)) .appendPath(String.valueOf(R.raw.accessibility_color_inversion_banner))
.build(); .build();
final List<String> enableServiceFeatureKeys = new ArrayList<>(/* initialCapacity= */ 1); final List<String> enableServiceFeatureKeys = new ArrayList<>(/* initialCapacity= */ 1);
enableServiceFeatureKeys.add(ENABLED); enableServiceFeatureKeys.add(ENABLED);

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

@@ -89,7 +89,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
mPackageName = getString(R.string.accessibility_screen_magnification_title); mPackageName = getString(R.string.accessibility_screen_magnification_title);
mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE) mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
.authority(getPrefContext().getPackageName()) .authority(getPrefContext().getPackageName())
.appendPath(String.valueOf(R.drawable.accessibility_magnification_banner)) .appendPath(String.valueOf(R.raw.accessibility_magnification_banner))
.build(); .build();
mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> { mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> {
removeDialog(DialogEnums.EDIT_SHORTCUT); removeDialog(DialogEnums.EDIT_SHORTCUT);