Skip to content

Commit 22ea623

Browse files
Eric (AX) LiangGitHub Enterprise
authored andcommitted
Merge pull request #5 from jared-marsau/reviews/reduceaxosrequirement
Lower Xcode SDK requirement for accessibility native code
2 parents 6b8a1d3 + 396232f commit 22ea623

20 files changed

+193
-174
lines changed
Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ internal AccessibilityNode _accessibilityParent()
542542
[SerializeField] private bool m_userIsAccessibilityElement = true;
543543
internal bool _isAccessibilityElement()
544544
{
545-
static bool defaultProvider(Component c)
545+
bool defaultProvider(Component c)
546546
{
547547
return false;
548548
}
@@ -554,7 +554,7 @@ static bool defaultProvider(Component c)
554554
[SerializeField] private AccessibilityTrait m_userAccessibilityTraits = AccessibilityTrait.None;
555555
internal AccessibilityTrait _accessibilityTraits()
556556
{
557-
static AccessibilityTrait defaultProvider(Component c)
557+
AccessibilityTrait defaultProvider(Component c)
558558
{
559559
if (c is Behaviour)
560560
{
@@ -570,7 +570,7 @@ static AccessibilityTrait defaultProvider(Component c)
570570
private Rect m_userAccessibilityFrame;
571571
internal Rect _accessibilityFrame()
572572
{
573-
static Rect defaultProvider(Component c)
573+
Rect defaultProvider(Component c)
574574
{
575575
Rect defaultFrame = Rect.zero;
576576
foreach (Renderer r in c.GetComponents<Renderer>())
@@ -608,7 +608,7 @@ static Rect defaultProvider(Component c)
608608
[SerializeField] private string m_userAccessibilityLabel;
609609
internal string _accessibilityLabel()
610610
{
611-
static string defaultProvider(Component c)
611+
string defaultProvider(Component c)
612612
{
613613
return null;
614614
}
@@ -620,7 +620,7 @@ static string defaultProvider(Component c)
620620
[SerializeField] private string m_userAccessibilityValue;
621621
internal string _accessibilityValue()
622622
{
623-
static string defaultProvider(Component c)
623+
string defaultProvider(Component c)
624624
{
625625
return null;
626626
}
@@ -632,7 +632,7 @@ static string defaultProvider(Component c)
632632
[SerializeField] private string m_userAccessibilityHint;
633633
internal string _accessibilityHint()
634634
{
635-
static string defaultProvider(Component c)
635+
string defaultProvider(Component c)
636636
{
637637
return null;
638638
}
@@ -644,7 +644,7 @@ static string defaultProvider(Component c)
644644
[SerializeField] private string m_userAccessibilityIdentifier;
645645
internal string _accessibilityIdentifier()
646646
{
647-
static string defaultProvider(Component c)
647+
string defaultProvider(Component c)
648648
{
649649
return null;
650650
}
@@ -656,7 +656,7 @@ static string defaultProvider(Component c)
656656
private Vector2 m_userAccessibilityActivationPoint;
657657
internal Vector2 _accessibilityActivationPoint()
658658
{
659-
static Vector2 defaultProvider(Component c)
659+
Vector2 defaultProvider(Component c)
660660
{
661661
// use positiveInfinity to indicate no-value.
662662
return Vector2.positiveInfinity;
@@ -669,7 +669,7 @@ static Vector2 defaultProvider(Component c)
669669
private AccessibilityCustomAction[] m_userAccessibilityCustomActions;
670670
internal AccessibilityCustomAction[] _accessibilityCustomActions()
671671
{
672-
static AccessibilityCustomAction[] defaultProvider(Component c)
672+
AccessibilityCustomAction[] defaultProvider(Component c)
673673
{
674674
return null;
675675
}
@@ -681,7 +681,7 @@ static AccessibilityCustomAction[] defaultProvider(Component c)
681681
[SerializeField] private bool m_userAccessibilityViewIsModal;
682682
internal bool _accessibilityViewIsModal()
683683
{
684-
static bool defaultProvider(Component c)
684+
bool defaultProvider(Component c)
685685
{
686686
return false;
687687
}
@@ -691,7 +691,7 @@ static bool defaultProvider(Component c)
691691

692692
internal bool _accessibilityIncrement()
693693
{
694-
static bool defaultProvider(Component c)
694+
bool defaultProvider(Component c)
695695
{
696696
return false;
697697
}
@@ -700,7 +700,7 @@ static bool defaultProvider(Component c)
700700

701701
internal bool _accessibilityDecrement()
702702
{
703-
static bool defaultProvider(Component c)
703+
bool defaultProvider(Component c)
704704
{
705705
return false;
706706
}
@@ -709,7 +709,7 @@ static bool defaultProvider(Component c)
709709

710710
internal bool _accessibilityScroll(AccessibilityScrollDirection direction)
711711
{
712-
static bool defaultProvider(Component c)
712+
bool defaultProvider(Component c)
713713
{
714714
return false;
715715
}
@@ -728,7 +728,7 @@ static bool defaultProvider(Component c)
728728

729729
internal bool _accessibilityPerformEscape()
730730
{
731-
static bool defaultProvider(Component c)
731+
bool defaultProvider(Component c)
732732
{
733733
return false;
734734
}
@@ -747,7 +747,7 @@ static bool defaultProvider(Component c)
747747

748748
internal bool _accessibilityPerformMagicTap()
749749
{
750-
static bool defaultProvider(Component c)
750+
bool defaultProvider(Component c)
751751
{
752752
return false;
753753
}
@@ -766,7 +766,7 @@ static bool defaultProvider(Component c)
766766

767767
internal bool _accessibilityActivate()
768768
{
769-
static bool defaultProvider(Component c)
769+
bool defaultProvider(Component c)
770770
{
771771
return false;
772772
}

0 commit comments

Comments
 (0)