Skip to content

Commit 5b5685a

Browse files
authored
Revert "Add support for Increase Contrast on iOS (flutter#15343)"
This reverts commit 0886205.
1 parent 1551f33 commit 5b5685a

File tree

4 files changed

+0
-25
lines changed

4 files changed

+0
-25
lines changed

lib/ui/window.dart

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,7 +1212,6 @@ class AccessibilityFeatures {
12121212
static const int _kDisableAnimationsIndex = 1 << 2;
12131213
static const int _kBoldTextIndex = 1 << 3;
12141214
static const int _kReduceMotionIndex = 1 << 4;
1215-
static const int _kHighContrastIndex = 1 << 5;
12161215

12171216
// A bitfield which represents each enabled feature.
12181217
final int _index;
@@ -1240,11 +1239,6 @@ class AccessibilityFeatures {
12401239
/// Only supported on iOS.
12411240
bool get reduceMotion => _kReduceMotionIndex & _index != 0;
12421241

1243-
/// The platform is requesting that UI be rendered with darker colors.
1244-
///
1245-
/// Only supported on iOS.
1246-
bool get highContrast => _kHighContrastIndex & _index != 0;
1247-
12481242
@override
12491243
String toString() {
12501244
final List<String> features = <String>[];
@@ -1258,8 +1252,6 @@ class AccessibilityFeatures {
12581252
features.add('boldText');
12591253
if (reduceMotion)
12601254
features.add('reduceMotion');
1261-
if (highContrast)
1262-
features.add('highContrast');
12631255
return 'AccessibilityFeatures$features';
12641256
}
12651257

lib/ui/window/window.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ enum class AccessibilityFeatureFlag : int32_t {
4444
kDisableAnimations = 1 << 2,
4545
kBoldText = 1 << 3,
4646
kReduceMotion = 1 << 4,
47-
kHighContrast = 1 << 5,
4847
};
4948

5049
class WindowClient {

lib/web_ui/lib/src/ui/window.dart

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,6 @@ class AccessibilityFeatures {
996996
static const int _kDisableAnimationsIndex = 1 << 2;
997997
static const int _kBoldTextIndex = 1 << 3;
998998
static const int _kReduceMotionIndex = 1 << 4;
999-
static const int _kHighContrastIndex = 1 << 5;
1000999

10011000
// A bitfield which represents each enabled feature.
10021001
final int _index;
@@ -1024,11 +1023,6 @@ class AccessibilityFeatures {
10241023
/// Only supported on iOS.
10251024
bool get reduceMotion => _kReduceMotionIndex & _index != 0;
10261025

1027-
/// The platform is requesting that UI be rendered with darker colors.
1028-
///
1029-
/// Only supported on iOS.
1030-
bool get highContrast => _kHighContrastIndex & _index != 0;
1031-
10321026
@override
10331027
String toString() {
10341028
final List<String> features = <String>[];
@@ -1047,9 +1041,6 @@ class AccessibilityFeatures {
10471041
if (reduceMotion) {
10481042
features.add('reduceMotion');
10491043
}
1050-
if (highContrast) {
1051-
features.add('highContrast');
1052-
}
10531044
return 'AccessibilityFeatures$features';
10541045
}
10551046

shell/platform/darwin/ios/framework/Source/FlutterViewController.mm

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,6 @@ - (void)setupNotificationCenterObservers {
298298
name:UIAccessibilityBoldTextStatusDidChangeNotification
299299
object:nil];
300300

301-
[center addObserver:self
302-
selector:@selector(onAccessibilityStatusChanged:)
303-
name:UIAccessibilityDarkerSystemColorsStatusDidChangeNotification
304-
object:nil];
305-
306301
[center addObserver:self
307302
selector:@selector(onUserSettingsChanged:)
308303
name:UIContentSizeCategoryDidChangeNotification
@@ -967,8 +962,6 @@ - (void)onAccessibilityStatusChanged:(NSNotification*)notification {
967962
flags |= static_cast<int32_t>(flutter::AccessibilityFeatureFlag::kReduceMotion);
968963
if (UIAccessibilityIsBoldTextEnabled())
969964
flags |= static_cast<int32_t>(flutter::AccessibilityFeatureFlag::kBoldText);
970-
if (UIAccessibilityDarkerSystemColorsEnabled())
971-
flags |= static_cast<int32_t>(flutter::AccessibilityFeatureFlag::kHighContrast);
972965
#if TARGET_OS_SIMULATOR
973966
// There doesn't appear to be any way to determine whether the accessibility
974967
// inspector is enabled on the simulator. We conservatively always turn on the

0 commit comments

Comments
 (0)