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

Merge "Updates A11y Shortcut animations to not loop in code." into main

Browse Source
This commit is contained in:
Daniel Norman
2024-12-04 18:37:28 +00:00
committed by Android (Google) Code Review
parent 7403db7745 5862b31f21
commit 4a84a244b2
5 changed files with 1665 additions and 5612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2815
res/raw/accessibility_shortcut_type_2finger_doubletap.json
View File

File diff suppressed because it is too large Load Diff

1510
res/raw/accessibility_shortcut_type_fab.json
View File

File diff suppressed because it is too large Load Diff

2944
res/raw/accessibility_shortcut_type_tripletap.json
View File

File diff suppressed because it is too large Load Diff

4
src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java
View File

@@ -72,7 +72,6 @@ import com.android.settingslib.utils.StringUtil;
import com.android.settingslib.widget.LottieColorUtils;
import com.airbnb.lottie.LottieAnimationView;
import com.airbnb.lottie.LottieDrawable;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -335,7 +334,8 @@ public final class AccessibilityShortcutsTutorial {
result -> Log.w(TAG, "Invalid image raw resource id: " + imageRawRes,
result));
lottieView.setAnimation(imageRawRes);
lottieView.setRepeatCount(LottieDrawable.INFINITE);
// Follow the Motion Stoppable requirement by using a finite animation.
lottieView.setRepeatCount(0);
LottieColorUtils.applyDynamicColors(context, lottieView);
lottieView.playAnimation();

4
src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreference.java
View File

@@ -35,7 +35,6 @@ import com.android.settings.R;
import com.android.settingslib.widget.LottieColorUtils;
import com.airbnb.lottie.LottieAnimationView;
import com.airbnb.lottie.LottieDrawable;
/**
* A preference represents an accessibility shortcut option with a checkbox and a tutorial image
@@ -96,7 +95,8 @@ public class ShortcutOptionPreference extends CheckBoxPreference {
.getResourceEntryName(mIntroImageRawResId),
result));
imageView.setAnimation(mIntroImageRawResId);
imageView.setRepeatCount(LottieDrawable.INFINITE);
// Follow the Motion Stoppable requirement by using a finite animation.
imageView.setRepeatCount(0);
LottieColorUtils.applyDynamicColors(imageView.getContext(), imageView);
imageView.playAnimation();
} else {