Skip to content

Commit dddc633

Browse files
Merge branch 'convergence_ax_wait_step' into 'convergence'
AX for wait step From Ryan, even through `UIProgressView` is not accessible. See merge request !30
2 parents 9e358e7 + 0aacde2 commit dddc633

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

ResearchKit/Common/ORKWaitStepView.m

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -105,32 +105,4 @@ - (void)setUpConstraints {
105105
}
106106
}
107107

108-
#pragma mark - Accessibility
109-
110-
- (BOOL)isAccessibilityElement {
111-
return YES;
112-
}
113-
114-
- (NSString *)accessibilityLabel {
115-
if (_progressView) {
116-
if (!_percentFormatter) {
117-
_percentFormatter = [[NSNumberFormatter alloc] init];
118-
_percentFormatter.numberStyle = NSNumberFormatterPercentStyle;
119-
}
120-
return ORKAccessibilityStringForVariables(_progressView.accessibilityLabel,
121-
[_percentFormatter stringFromNumber:[NSNumber numberWithFloat:_progressView.progress]]);
122-
} else if (_activityIndicatorView) {
123-
return ORKAccessibilityStringForVariables(_activityIndicatorView.accessibilityLabel);
124-
}
125-
return nil;
126-
}
127-
128-
- (UIAccessibilityTraits)accessibilityTraits {
129-
if (_progressView) {
130-
return [super accessibilityTraits] | UIAccessibilityTraitUpdatesFrequently;
131-
} else {
132-
return [super accessibilityTraits];
133-
}
134-
}
135-
136108
@end

0 commit comments

Comments
 (0)