Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_43355755
engine
提交
68cc67f2
E
engine
项目概览
weixin_43355755
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
68cc67f2
编写于
4月 14, 2016
作者:
I
Ian Hickson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge pull request #2597 from Hixie/3177
Fix crashes with LastPass, Now-on-Tap, DashLane
上级
c3504b51
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
32 addition
and
20 deletion
+32
-20
sky/shell/platform/android/io/flutter/view/AccessibilityBridge.java
...platform/android/io/flutter/view/AccessibilityBridge.java
+32
-20
未找到文件。
sky/shell/platform/android/io/flutter/view/AccessibilityBridge.java
浏览文件 @
68cc67f2
...
...
@@ -28,7 +28,7 @@ class AccessibilityBridge extends AccessibilityNodeProvider implements Semantics
private
Map
<
Integer
,
PersistentAccessibilityNode
>
mTreeNodes
;
private
FlutterView
mOwner
;
private
SemanticsServer
.
Proxy
mSemanticsServer
;
private
boolean
mAccessi
libilyEnabled
=
tru
e
;
private
boolean
mAccessi
bilityEnabled
=
fals
e
;
private
PersistentAccessibilityNode
mFocusedNode
;
private
PersistentAccessibilityNode
mHoveredNode
;
...
...
@@ -42,7 +42,7 @@ class AccessibilityBridge extends AccessibilityNodeProvider implements Semantics
}
void
setAccessibilityEnabled
(
boolean
accessibilityEnabled
)
{
mAccessi
libil
yEnabled
=
accessibilityEnabled
;
mAccessi
bilit
yEnabled
=
accessibilityEnabled
;
}
@Override
...
...
@@ -121,8 +121,10 @@ class AccessibilityBridge extends AccessibilityNodeProvider implements Semantics
result
.
addAction
(
AccessibilityNodeInfo
.
AccessibilityAction
.
ACTION_ACCESSIBILITY_FOCUS
);
}
for
(
PersistentAccessibilityNode
child
:
node
.
children
)
{
result
.
addChild
(
mOwner
,
child
.
id
);
if
(
node
.
children
!=
null
)
{
for
(
PersistentAccessibilityNode
child
:
node
.
children
)
{
result
.
addChild
(
mOwner
,
child
.
id
);
}
}
return
result
;
...
...
@@ -221,7 +223,7 @@ class AccessibilityBridge extends AccessibilityNodeProvider implements Semantics
}
private
void
sendAccessibilityEvent
(
int
virtualViewId
,
int
eventType
)
{
if
(!
mAccessi
libil
yEnabled
)
{
if
(!
mAccessi
bilit
yEnabled
)
{
return
;
}
if
(
virtualViewId
==
0
)
{
...
...
@@ -257,8 +259,10 @@ class AccessibilityBridge extends AccessibilityNodeProvider implements Semantics
if
(
mHoveredNode
==
node
)
{
mHoveredNode
=
null
;
}
for
(
PersistentAccessibilityNode
child
:
node
.
children
)
{
removePersistentNode
(
child
);
if
(
node
.
children
!=
null
)
{
for
(
PersistentAccessibilityNode
child
:
node
.
children
)
{
removePersistentNode
(
child
);
}
}
}
...
...
@@ -306,18 +310,22 @@ class AccessibilityBridge extends AccessibilityNodeProvider implements Semantics
}
if
(
node
.
children
!=
null
)
{
List
<
PersistentAccessibilityNode
>
oldChildren
=
children
;
children
=
new
ArrayList
<
PersistentAccessibilityNode
>(
node
.
children
.
length
);
if
(
oldChildren
!=
null
)
{
for
(
PersistentAccessibilityNode
child
:
oldChildren
)
{
assert
child
.
parent
!=
null
;
child
.
parent
=
null
;
}
}
for
(
SemanticsNode
childNode
:
node
.
children
)
{
PersistentAccessibilityNode
child
=
AccessibilityBridge
.
this
.
updateSemanticsNode
(
childNode
);
assert
child
!=
null
;
child
.
parent
=
this
;
children
.
add
(
child
);
if
(
node
.
children
.
length
>
0
)
{
children
=
new
ArrayList
<
PersistentAccessibilityNode
>(
node
.
children
.
length
);
for
(
SemanticsNode
childNode
:
node
.
children
)
{
PersistentAccessibilityNode
child
=
AccessibilityBridge
.
this
.
updateSemanticsNode
(
childNode
);
assert
child
!=
null
;
child
.
parent
=
this
;
children
.
add
(
child
);
}
}
else
{
children
=
null
;
}
if
(
oldChildren
!=
null
)
{
for
(
PersistentAccessibilityNode
child
:
oldChildren
)
{
...
...
@@ -361,8 +369,10 @@ class AccessibilityBridge extends AccessibilityNodeProvider implements Semantics
geometryDirty
=
true
;
// TODO(ianh): if we are the AccessibilityBridge.this.mFocusedNode
// then we may have to unfocus and refocus ourselves to get Android to update the focus rect
for
(
PersistentAccessibilityNode
child
:
children
)
{
child
.
invalidateGlobalGeometry
();
if
(
children
!=
null
)
{
for
(
PersistentAccessibilityNode
child
:
children
)
{
child
.
invalidateGlobalGeometry
();
}
}
}
...
...
@@ -429,11 +439,13 @@ class AccessibilityBridge extends AccessibilityNodeProvider implements Semantics
Rect
rect
=
getGlobalRect
();
if
(!
rect
.
contains
(
x
,
y
))
return
null
;
for
(
int
index
=
children
.
size
()-
1
;
index
>=
0
;
index
-=
1
)
{
PersistentAccessibilityNode
child
=
children
.
get
(
index
);
PersistentAccessibilityNode
result
=
child
.
hitTest
(
x
,
y
);
if
(
result
!=
null
)
{
return
result
;
if
(
children
!=
null
)
{
for
(
int
index
=
children
.
size
()-
1
;
index
>=
0
;
index
-=
1
)
{
PersistentAccessibilityNode
child
=
children
.
get
(
index
);
PersistentAccessibilityNode
result
=
child
.
hitTest
(
x
,
y
);
if
(
result
!=
null
)
{
return
result
;
}
}
}
return
this
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录