DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't map iOS reduce motion to disabled animations (flutter/engine#6194)

Browse Source
This commit is contained in:
Jonah Williams 2018-09-07 11:20:44 -07:00 committed by GitHub
parent 7ceee12615
commit e6f0842c50
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/src/flutter/lib/ui/window.dart
View File

@ -763,6 +763,7 @@ class AccessibilityFeatures {
static const int _kInvertColorsIndex = 1 << 1;
static const int _kDisableAnimationsIndex = 1 << 2;
static const int _kBoldTextIndex = 1 << 3;
static const int _kReduceMotionIndex = 1 << 4;
// A bitfield which represents each enabled feature.
final int _index;
@ -784,6 +785,12 @@ class AccessibilityFeatures {
/// Only supported on iOS.
bool get boldText => _kBoldTextIndex & _index != 0;
/// The platform is requesting that certain animations be simplified and
/// parallax effects removed.
///
/// Only supported on iOS.
bool get reduceMotion => _kReduceMotionIndex & _index != 0;
@override
String toString() {
final List<String> features = <String>[];
@ -795,6 +802,8 @@ class AccessibilityFeatures {
features.add('disableAnimations');
if (boldText)
features.add('boldText');
if (reduceMotion)
features.add('reduceMotion');
return 'AccessibilityFeatures$features';
}

1
engine/src/flutter/lib/ui/window/window.h
View File

@ -31,6 +31,7 @@ enum class AccessibilityFeatureFlag : int32_t {
kInvertColors = 1 << 1,
kDisableAnimations = 1 << 2,
kBoldText = 1 << 3,
kReduceMotion = 1 << 4,
};
class WindowClient {

2
engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
View File

@ -836,7 +836,7 @@ static inline blink::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* to
if (UIAccessibilityIsInvertColorsEnabled())
flags ^= static_cast<int32_t>(blink::AccessibilityFeatureFlag::kInvertColors);
if (UIAccessibilityIsReduceMotionEnabled())
flags ^= static_cast<int32_t>(blink::AccessibilityFeatureFlag::kDisableAnimations);
flags ^= static_cast<int32_t>(blink::AccessibilityFeatureFlag::kReduceMotion);
if (UIAccessibilityIsBoldTextEnabled())
flags ^= static_cast<int32_t>(blink::AccessibilityFeatureFlag::kBoldText);
#if TARGET_OS_SIMULATOR