RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp.
Includes some .java updates to automatically convert colors for lottie animation files. Fix: 261547883 Fix: 243905003 Fix: 243889447 Fix: 261544574 Test: launch cf_x86_64_tablet, open Settings > Accessibility Test: Open "Color & motion" > "Color inversion" Test: Open "Timing controls" > "Time to take action" Test: Open "Caption preferences" Test: Open "Magnification" > "Magnification shortcut" Test: Open "Accessibility shortcuts" > "Accessibility button and gesture", change options Test: Perform the above with both light and dark mode. Change-Id: I46b75b53feb8870d3154744e058eb898e6011725
This commit is contained in:
@@ -55,6 +55,7 @@ import androidx.core.content.ContextCompat;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.SubSettingLauncher;
|
||||
import com.android.settings.utils.AnnotationSpan;
|
||||
import com.android.settingslib.widget.LottieColorUtils;
|
||||
|
||||
import com.airbnb.lottie.LottieAnimationView;
|
||||
import com.airbnb.lottie.LottieDrawable;
|
||||
@@ -269,10 +270,11 @@ public class AccessibilityDialogUtils {
|
||||
setupShortcutWidgetWithImageResource(view, imageResId);
|
||||
}
|
||||
|
||||
private static void setupShortcutWidgetWithImageRawResource(View view, CharSequence titleText,
|
||||
private static void setupShortcutWidgetWithImageRawResource(Context context,
|
||||
View view, CharSequence titleText,
|
||||
CharSequence summaryText, @RawRes int imageRawResId) {
|
||||
setupShortcutWidgetWithTitleAndSummary(view, titleText, summaryText);
|
||||
setupShortcutWidgetWithImageRawResource(view, imageRawResId);
|
||||
setupShortcutWidgetWithImageRawResource(context, view, imageRawResId);
|
||||
}
|
||||
|
||||
private static void setupShortcutWidgetWithTitleAndSummary(View view, CharSequence titleText,
|
||||
@@ -296,7 +298,7 @@ public class AccessibilityDialogUtils {
|
||||
imageView.setImageResource(imageResId);
|
||||
}
|
||||
|
||||
private static void setupShortcutWidgetWithImageRawResource(View view,
|
||||
private static void setupShortcutWidgetWithImageRawResource(Context context, View view,
|
||||
@RawRes int imageRawResId) {
|
||||
final LottieAnimationView lottieView = view.findViewById(R.id.image);
|
||||
lottieView.setFailureListener(
|
||||
@@ -304,6 +306,7 @@ public class AccessibilityDialogUtils {
|
||||
result));
|
||||
lottieView.setAnimation(imageRawResId);
|
||||
lottieView.setRepeatCount(LottieDrawable.INFINITE);
|
||||
LottieColorUtils.applyDynamicColors(context, lottieView);
|
||||
lottieView.playAnimation();
|
||||
}
|
||||
|
||||
@@ -350,7 +353,7 @@ public class AccessibilityDialogUtils {
|
||||
final Object[] arguments = {3};
|
||||
summary = MessageFormat.format(summary, arguments);
|
||||
|
||||
setupShortcutWidgetWithImageRawResource(dialogView, title, summary,
|
||||
setupShortcutWidgetWithImageRawResource(context, dialogView, title, summary,
|
||||
R.raw.accessibility_shortcut_type_triple_tap);
|
||||
}
|
||||
|
||||
|
@@ -57,6 +57,7 @@ import androidx.viewpager.widget.PagerAdapter;
|
||||
import androidx.viewpager.widget.ViewPager;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settingslib.widget.LottieColorUtils;
|
||||
|
||||
import com.airbnb.lottie.LottieAnimationView;
|
||||
import com.airbnb.lottie.LottieDrawable;
|
||||
@@ -300,6 +301,7 @@ public final class AccessibilityGestureNavigationTutorial {
|
||||
result));
|
||||
lottieView.setAnimation(imageRawRes);
|
||||
lottieView.setRepeatCount(LottieDrawable.INFINITE);
|
||||
LottieColorUtils.applyDynamicColors(context, lottieView);
|
||||
lottieView.playAnimation();
|
||||
|
||||
return illustrationFrame;
|
||||
|
Reference in New Issue
Block a user