Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Cherry-pick #28846 and #28743 into flutter-2.6-candidate.11 #28937

Merged
xster merged 5 commits into from
Oct 4, 2021
Merged

Cherry-pick #28846 and #28743 into flutter-2.6-candidate.11 #28937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a74a56d
Fixes FlutterSemanticsScrollView to not implement accessibility conta…
chunhtai Sep 24, 2021
6acecc6
add branch to test
xster Sep 29, 2021
29b700d
Replace jcenter() for mavenCentral() (#28777)
Sep 21, 2021
705c2ad
Set MinimumOSVersion to iOS 9 in Info.plist (#28783)
jmagman Sep 22, 2021
9ea5d83
Do not use jcenter(), switch to mavenCentral() (#28738)
dnfield Sep 20, 2021
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
1 change: 1 addition & 0 deletions .ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ enabled_branches:
- dev
- beta
- stable
- flutter-2.6-candidate.11

platform_properties:
linux:
Expand Down
4 changes: 2 additions & 2 deletions shell/platform/android/test_runner/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:7.0.0"
Expand All @@ -10,7 +10,7 @@ buildscript {

repositories {
google()
jcenter()
mavenCentral()
}

apply plugin: "com.android.library"
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/darwin/ios/framework/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>8.0</string>
Copy link
Copy Markdown
Member Author

@xster xster Sep 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jmagman I imagine it's ok but just double checking, both #28783 and #28743 touched this line. Neither of which are in the cherry-pick base. Cherry picking this directly is ok?

Copy link
Copy Markdown
Member

@jmagman jmagman Sep 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is 4460688 in this branch? Otherwise this doesn't need to be cherry-picked. I can't tell what the parent SHA is from the GitHub UI.

Copy link
Copy Markdown
Member

@jmagman jmagman Sep 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, it's branched off 5b81c6d (that makes sense). Just cherry pick #28783 then, it's more focused and lower risk. Thanks @xster!

Copy link
Copy Markdown
Member Author

@xster xster Sep 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, you're saying #28783 addresses b/200635527 too? Done

Copy link
Copy Markdown
Member

@jmagman jmagman Sep 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exactly, sorry I wasn't clear! 😄

<string>9.0</string>
<key>FlutterEngine</key>
<string>{0}</string>
<key>ClangVersion</key>
Expand Down
29 changes: 0 additions & 29 deletions shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,33 +106,4 @@ - (NSInteger)accessibilityElementCount {
return [[_semanticsObject children] count];
}

- (id)accessibilityElementAtIndex:(NSInteger)index {
SemanticsObject* child = [_semanticsObject children][index];

// Swap the original `SemanticsObject` to a `PlatformViewSemanticsContainer`
if (child.node.IsPlatformViewNode()) {
child.platformViewSemanticsContainer.index = index;
return child.platformViewSemanticsContainer;
}

if ([child hasChildren])
return [child accessibilityContainer];
return [child nativeAccessibility];
}

- (NSInteger)indexOfAccessibilityElement:(id)element {
if ([element isKindOfClass:[FlutterPlatformViewSemanticsContainer class]]) {
return ((FlutterPlatformViewSemanticsContainer*)element).index;
}

NSArray<SemanticsObject*>* children = [_semanticsObject children];
for (size_t i = 0; i < [children count]; i++) {
SemanticsObject* child = children[i];
if ((![child hasChildren] && child == element) ||
([child hasChildren] && [child accessibilityContainer] == element))
return i;
}
return NSNotFound;
}

@end
4 changes: 2 additions & 2 deletions testing/android_background_image/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.0'
Expand All @@ -16,7 +16,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

Expand Down
4 changes: 2 additions & 2 deletions testing/scenario_app/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.0'
Expand All @@ -23,7 +23,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

Expand Down
4 changes: 2 additions & 2 deletions tools/cipd/android_embedding_bundle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def destinationDir = "lib"
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:3.5.0"
Expand All @@ -22,7 +22,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

Expand Down