Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions lib/ui/semantics.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ class SemanticsAction {
static const int _kPasteIndex = 1 << 14;
static const int _kDidGainAccessibilityFocusIndex = 1 << 15;
static const int _kDidLoseAccessibilityFocusIndex = 1 << 16;
static const int _kCustomAction = 1 << 17;
static const int _kCustomActionIndex = 1 << 17;
static const int _kDismissIndex = 1 << 18;
static const int _kMoveCursorForwardByWordIndex = 1 << 19;
static const int _kMoveCursorBackwardByWordIndex = 1 << 20;
static const int _kSetText = 1 << 21;
static const int _kSetTextIndex = 1 << 21;
// READ THIS: if you add an action here, you MUST update the
// numSemanticsActions value in testing/dart/semantics_test.dart, or tests
// will fail.
Expand Down Expand Up @@ -122,7 +122,7 @@ class SemanticsAction {
///
/// The action includes a string argument, which is the new text to
/// replace.
static const SemanticsAction setText = SemanticsAction._(_kSetText);
static const SemanticsAction setText = SemanticsAction._(_kSetTextIndex);

/// Set the text selection to the given range.
///
Expand Down Expand Up @@ -174,7 +174,7 @@ class SemanticsAction {
///
/// This handler is added automatically whenever a custom accessibility
/// action is added to a semantics node.
static const SemanticsAction customAction = SemanticsAction._(_kCustomAction);
static const SemanticsAction customAction = SemanticsAction._(_kCustomActionIndex);

/// A request that the node should be dismissed.
///
Expand Down Expand Up @@ -223,11 +223,11 @@ class SemanticsAction {
_kPasteIndex: paste,
_kDidGainAccessibilityFocusIndex: didGainAccessibilityFocus,
_kDidLoseAccessibilityFocusIndex: didLoseAccessibilityFocus,
_kCustomAction: customAction,
_kCustomActionIndex: customAction,
_kDismissIndex: dismiss,
_kMoveCursorForwardByWordIndex: moveCursorForwardByWord,
_kMoveCursorBackwardByWordIndex: moveCursorBackwardByWord,
_kSetText: setText,
_kSetTextIndex: setText,
};

@override
Expand Down Expand Up @@ -267,15 +267,15 @@ class SemanticsAction {
return 'SemanticsAction.didGainAccessibilityFocus';
case _kDidLoseAccessibilityFocusIndex:
return 'SemanticsAction.didLoseAccessibilityFocus';
case _kCustomAction:
case _kCustomActionIndex:
return 'SemanticsAction.customAction';
case _kDismissIndex:
return 'SemanticsAction.dismiss';
case _kMoveCursorForwardByWordIndex:
return 'SemanticsAction.moveCursorForwardByWord';
case _kMoveCursorBackwardByWordIndex:
return 'SemanticsAction.moveCursorBackwardByWord';
case _kSetText:
case _kSetTextIndex:
return 'SemanticsAction.setText';
}
assert(false, 'Unhandled index: $index (0x${index.toRadixString(8).padLeft(4, "0")})');
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/window.dart
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ class SingletonFlutterWindow extends FlutterWindow {
class AccessibilityFeatures {
const AccessibilityFeatures._(this._index);

static const int _kAccessibleNavigation = 1 << 0;
static const int _kAccessibleNavigationIndex = 1 << 0;
static const int _kInvertColorsIndex = 1 << 1;
static const int _kDisableAnimationsIndex = 1 << 2;
static const int _kBoldTextIndex = 1 << 3;
Expand All @@ -801,7 +801,7 @@ class AccessibilityFeatures {
/// interaction model of the device.
///
/// For example, TalkBack on Android and VoiceOver on iOS enable this flag.
bool get accessibleNavigation => _kAccessibleNavigation & _index != 0;
bool get accessibleNavigation => _kAccessibleNavigationIndex & _index != 0;

/// The platform is inverting the colors of the application.
bool get invertColors => _kInvertColorsIndex & _index != 0;
Expand Down
16 changes: 8 additions & 8 deletions lib/web_ui/lib/semantics.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ class SemanticsAction {
static const int _kPasteIndex = 1 << 14;
static const int _kDidGainAccessibilityFocusIndex = 1 << 15;
static const int _kDidLoseAccessibilityFocusIndex = 1 << 16;
static const int _kCustomAction = 1 << 17;
static const int _kCustomActionIndex = 1 << 17;
static const int _kDismissIndex = 1 << 18;
static const int _kMoveCursorForwardByWordIndex = 1 << 19;
static const int _kMoveCursorBackwardByWordIndex = 1 << 20;
static const int _kSetText = 1 << 21;
static const int _kSetTextIndex = 1 << 21;

final int index;

Expand All @@ -43,14 +43,14 @@ class SemanticsAction {
static const SemanticsAction showOnScreen = SemanticsAction._(_kShowOnScreenIndex);
static const SemanticsAction moveCursorForwardByCharacter = SemanticsAction._(_kMoveCursorForwardByCharacterIndex);
static const SemanticsAction moveCursorBackwardByCharacter = SemanticsAction._(_kMoveCursorBackwardByCharacterIndex);
static const SemanticsAction setText = SemanticsAction._(_kSetText);
static const SemanticsAction setText = SemanticsAction._(_kSetTextIndex);
static const SemanticsAction setSelection = SemanticsAction._(_kSetSelectionIndex);
static const SemanticsAction copy = SemanticsAction._(_kCopyIndex);
static const SemanticsAction cut = SemanticsAction._(_kCutIndex);
static const SemanticsAction paste = SemanticsAction._(_kPasteIndex);
static const SemanticsAction didGainAccessibilityFocus = SemanticsAction._(_kDidGainAccessibilityFocusIndex);
static const SemanticsAction didLoseAccessibilityFocus = SemanticsAction._(_kDidLoseAccessibilityFocusIndex);
static const SemanticsAction customAction = SemanticsAction._(_kCustomAction);
static const SemanticsAction customAction = SemanticsAction._(_kCustomActionIndex);
static const SemanticsAction dismiss = SemanticsAction._(_kDismissIndex);
static const SemanticsAction moveCursorForwardByWord = SemanticsAction._(_kMoveCursorForwardByWordIndex);
static const SemanticsAction moveCursorBackwardByWord = SemanticsAction._(_kMoveCursorBackwardByWordIndex);
Expand All @@ -73,11 +73,11 @@ class SemanticsAction {
_kPasteIndex: paste,
_kDidGainAccessibilityFocusIndex: didGainAccessibilityFocus,
_kDidLoseAccessibilityFocusIndex: didLoseAccessibilityFocus,
_kCustomAction: customAction,
_kCustomActionIndex: customAction,
_kDismissIndex: dismiss,
_kMoveCursorForwardByWordIndex: moveCursorForwardByWord,
_kMoveCursorBackwardByWordIndex: moveCursorBackwardByWord,
_kSetText: setText,
_kSetTextIndex: setText,
};

@override
Expand Down Expand Up @@ -117,15 +117,15 @@ class SemanticsAction {
return 'SemanticsAction.didGainAccessibilityFocus';
case _kDidLoseAccessibilityFocusIndex:
return 'SemanticsAction.didLoseAccessibilityFocus';
case _kCustomAction:
case _kCustomActionIndex:
return 'SemanticsAction.customAction';
case _kDismissIndex:
return 'SemanticsAction.dismiss';
case _kMoveCursorForwardByWordIndex:
return 'SemanticsAction.moveCursorForwardByWord';
case _kMoveCursorBackwardByWordIndex:
return 'SemanticsAction.moveCursorBackwardByWord';
case _kSetText:
case _kSetTextIndex:
return 'SemanticsAction.setText';
}
assert(false, 'Unhandled index: $index (0x${index.toRadixString(8).padLeft(4, "0")})');
Expand Down