Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
114d33d3
E
engine
项目概览
sxychenjing
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
未验证
提交
114d33d3
编写于
11月 13, 2018
作者:
D
Dan Field
提交者:
GitHub
11月 13, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Set and unset accessibility flags even when re-entrant (#6853)
* Make sure to not unset a11y flags on reentrant calls to API
上级
396402f5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
9 deletion
+11
-9
shell/platform/android/io/flutter/view/FlutterView.java
shell/platform/android/io/flutter/view/FlutterView.java
+6
-4
shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
...form/darwin/ios/framework/Source/FlutterViewController.mm
+5
-5
未找到文件。
shell/platform/android/io/flutter/view/FlutterView.java
浏览文件 @
114d33d3
...
...
@@ -877,7 +877,9 @@ public class FlutterView extends SurfaceView
ensureAccessibilityEnabled
();
}
if
(
mTouchExplorationEnabled
)
{
mAccessibilityFeatureFlags
^=
AccessibilityFeature
.
ACCESSIBLE_NAVIGATION
.
value
;
mAccessibilityFeatureFlags
|=
AccessibilityFeature
.
ACCESSIBLE_NAVIGATION
.
value
;
}
else
{
mAccessibilityFeatureFlags
&=
~
AccessibilityFeature
.
ACCESSIBLE_NAVIGATION
.
value
;
}
// Apply additional accessibility settings
updateAccessibilityFeatures
();
...
...
@@ -896,7 +898,7 @@ public class FlutterView extends SurfaceView
String
transitionAnimationScale
=
Settings
.
Global
.
getString
(
getContext
().
getContentResolver
(),
Settings
.
Global
.
TRANSITION_ANIMATION_SCALE
);
if
(
transitionAnimationScale
!=
null
&&
transitionAnimationScale
.
equals
(
"0"
))
{
mAccessibilityFeatureFlags
^
=
AccessibilityFeature
.
DISABLE_ANIMATIONS
.
value
;
mAccessibilityFeatureFlags
|
=
AccessibilityFeature
.
DISABLE_ANIMATIONS
.
value
;
}
else
{
mAccessibilityFeatureFlags
&=
~
AccessibilityFeature
.
DISABLE_ANIMATIONS
.
value
;
}
...
...
@@ -966,7 +968,7 @@ public class FlutterView extends SurfaceView
String
value
=
Settings
.
Global
.
getString
(
getContext
().
getContentResolver
(),
Settings
.
Global
.
TRANSITION_ANIMATION_SCALE
);
if
(
value
!=
null
&&
value
.
equals
(
"0"
))
{
mAccessibilityFeatureFlags
^
=
AccessibilityFeature
.
DISABLE_ANIMATIONS
.
value
;
mAccessibilityFeatureFlags
|
=
AccessibilityFeature
.
DISABLE_ANIMATIONS
.
value
;
}
else
{
mAccessibilityFeatureFlags
&=
~
AccessibilityFeature
.
DISABLE_ANIMATIONS
.
value
;
}
...
...
@@ -980,7 +982,7 @@ public class FlutterView extends SurfaceView
if
(
enabled
)
{
mTouchExplorationEnabled
=
true
;
ensureAccessibilityEnabled
();
mAccessibilityFeatureFlags
^
=
AccessibilityFeature
.
ACCESSIBLE_NAVIGATION
.
value
;
mAccessibilityFeatureFlags
|
=
AccessibilityFeature
.
ACCESSIBLE_NAVIGATION
.
value
;
nativeSetAccessibilityFeatures
(
mNativeView
.
get
(),
mAccessibilityFeatureFlags
);
}
else
{
mTouchExplorationEnabled
=
false
;
...
...
shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
浏览文件 @
114d33d3
...
...
@@ -716,11 +716,11 @@ static blink::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch) {
auto
platformView
=
[
_engine
.
get
()
platformView
];
int32_t
flags
=
0
;
if
(
UIAccessibilityIsInvertColorsEnabled
())
flags
^
=
static_cast
<
int32_t
>
(
blink
::
AccessibilityFeatureFlag
::
kInvertColors
);
flags
|
=
static_cast
<
int32_t
>
(
blink
::
AccessibilityFeatureFlag
::
kInvertColors
);
if
(
UIAccessibilityIsReduceMotionEnabled
())
flags
^
=
static_cast
<
int32_t
>
(
blink
::
AccessibilityFeatureFlag
::
kReduceMotion
);
flags
|
=
static_cast
<
int32_t
>
(
blink
::
AccessibilityFeatureFlag
::
kReduceMotion
);
if
(
UIAccessibilityIsBoldTextEnabled
())
flags
^
=
static_cast
<
int32_t
>
(
blink
::
AccessibilityFeatureFlag
::
kBoldText
);
flags
|
=
static_cast
<
int32_t
>
(
blink
::
AccessibilityFeatureFlag
::
kBoldText
);
#if TARGET_OS_SIMULATOR
// There doesn't appear to be any way to determine whether the accessibility
// inspector is enabled on the simulator. We conservatively always turn on the
...
...
@@ -729,8 +729,8 @@ static blink::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch) {
platformView
->
SetAccessibilityFeatures
(
flags
);
#else
bool
enabled
=
UIAccessibilityIsVoiceOverRunning
()
||
UIAccessibilityIsSwitchControlRunning
();
if
(
UIAccessibilityIsVoiceOverRunning
()
||
UIAccessibilityIsSwitchControlRunning
()
)
flags
^
=
static_cast
<
int32_t
>
(
blink
::
AccessibilityFeatureFlag
::
kAccessibleNavigation
);
if
(
enabled
)
flags
|
=
static_cast
<
int32_t
>
(
blink
::
AccessibilityFeatureFlag
::
kAccessibleNavigation
);
platformView
->
SetSemanticsEnabled
(
enabled
||
UIAccessibilityIsSpeakScreenEnabled
());
platformView
->
SetAccessibilityFeatures
(
flags
);
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录