DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Have the AccessibilityBridge attach/detach itself to the (#8229)

Browse Source 
PlatformViewsDelegate.

Since onDetachedFromWindow can be called after the activity was
destroyed, the previous call to detach the accessibility bridge could
have crash as the NativeFlutterView was already null.
This commit is contained in:
Amir Hardon 2019-03-20 12:26:30 -07:00 committed by GitHub
parent 45b19e47c3
commit 6a8a45fc4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
shell/platform/android/io/flutter/plugin/platform/PlatformViewsAccessibilityDelegate.java
View File

@ -4,10 +4,28 @@
package io.flutter.plugin.platform;
import io.flutter.view.AccessibilityBridge;
/**
* Facilitates interaction between the accessibility bridge and embedded platform views.
*/
public interface PlatformViewsAccessibilityDelegate {
// TODO(amirh): add a View getViewById(int id) here.
// not filing a tracking issue as this is going to be done in the next PR.
/**
* Attaches an accessibility bridge for this platform views accessibility delegate.
*
* Accessibility events originating in platform views belonging to this delegate will be delegated
* to this accessibility bridge.
*/
void attachAccessibilityBridge(AccessibilityBridge accessibilityBridge);
/**
* Detaches the current accessibility bridge.
*
* Any accessibility events sent by platform views belonging to this delegate will be ignored until
* a new accessibility bridge is attached.
*/
void detachAccessibiltyBridge();
}

13
shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
View File

@ -98,21 +98,12 @@ public class PlatformViewsController implements MethodChannel.MethodCallHandler,
mTextureRegistry = null;
}
/**
* Attaches an accessibility bridge for this platform views controller.
*
* Accessibility events sent by platform views that belonging to this controller will be
* dispatched to this accessibility bridge.
*/
@Override
public void attachAccessibilityBridge(AccessibilityBridge accessibilityBridge) {
this.accessibilityBridge = accessibilityBridge;
}
/**
* Detaches the current accessibility bridge.
*
* Any accessibility events sent by platform views belonging to this controller will be ignored.
*/
@Override
public void detachAccessibiltyBridge() {
this.accessibilityBridge = null;
}

20
shell/platform/android/io/flutter/view/AccessibilityBridge.java
View File

@ -312,7 +312,10 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
@NonNull AccessibilityChannel accessibilityChannel,
@NonNull AccessibilityManager accessibilityManager,
@NonNull ContentResolver contentResolver,
@NonNull PlatformViewsAccessibilityDelegate platformViewsAccessibilityDelegate
// This should be @NonNull once the plumbing for io.flutter.embedding.engine.android.FlutterView is done.
// TODO(mattcarrol): Add the annotation once the plumbing is done.
// https://github.com/flutter/flutter/issues/29618
PlatformViewsAccessibilityDelegate platformViewsAccessibilityDelegate
) {
this.rootAccessibilityView = rootAccessibilityView;
this.accessibilityChannel = accessibilityChannel;
@ -362,6 +365,14 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
Uri transitionUri = Settings.Global.getUriFor(Settings.Global.TRANSITION_ANIMATION_SCALE);
this.contentResolver.registerContentObserver(transitionUri, false, animationScaleObserver);
}
// platformViewsAccessibilityDelegate should be @NonNull once the plumbing
// for io.flutter.embedding.engine.android.FlutterView is done.
// TODO(mattcarrol): Remove the null check once the plumbing is done.
// https://github.com/flutter/flutter/issues/29618
if (platformViewsAccessibilityDelegate != null) {
platformViewsAccessibilityDelegate.attachAccessibilityBridge(this);
}
}
/**
@ -372,6 +383,13 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
* on this {@code AccessibilityBridge} after invoking {@code release()} is undefined.
*/
public void release() {
// platformViewsAccessibilityDelegate should be @NonNull once the plumbing
// for io.flutter.embedding.engine.android.FlutterView is done.
// TODO(mattcarrol): Remove the null check once the plumbing is done.
// https://github.com/flutter/flutter/issues/29618
if (platformViewsAccessibilityDelegate != null) {
platformViewsAccessibilityDelegate.detachAccessibiltyBridge();
}
setOnAccessibilityChangeListener(null);
accessibilityManager.removeAccessibilityStateChangeListener(accessibilityStateChangeListener);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {

2
shell/platform/android/io/flutter/view/FlutterView.java
View File

@ -668,7 +668,6 @@ public class FlutterView extends SurfaceView implements BinaryMessenger, Texture
getContext().getContentResolver(),
platformViewsController
);
platformViewsController.attachAccessibilityBridge(mAccessibilityNodeProvider);
mAccessibilityNodeProvider.setOnAccessibilityChangeListener(onAccessibilityChangeListener);
resetWillNotDraw(
@ -681,7 +680,6 @@ public class FlutterView extends SurfaceView implements BinaryMessenger, Texture
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
getPluginRegistry().getPlatformViewsController().detachAccessibiltyBridge();
mAccessibilityNodeProvider.release();
mAccessibilityNodeProvider = null;
}