Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 467a052e: Magnification does not work if no enabled accessibility services.

Browse Source 
* commit '467a052e159d5dc87b27ce94f8559576ec73040b':
  Magnification does not work if no enabled accessibility services.
This commit is contained in:
Svetoslav Ganov
2013-04-18 11:36:42 -07:00
committed by Android Git Automerger
parent b71ec91a32 467a052e15
commit 7a3e91f4f9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -1160,7 +1160,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
boolean setInputFilter = false;
AccessibilityInputFilter inputFilter = null;
synchronized (mLock) {
if (userState.mIsAccessibilityEnabled) {
// Accessibility enabled means at least one service is enabled.
if (userState.mIsAccessibilityEnabled
|| userState.mIsDisplayMagnificationEnabled) {
if (!mHasInputFilter) {
mHasInputFilter = true;
if (mInputFilter == null) {
@@ -1174,7 +1176,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
if (userState.mIsDisplayMagnificationEnabled) {
flags |= AccessibilityInputFilter.FLAG_FEATURE_SCREEN_MAGNIFIER;
}
if (userState.mIsTouchExplorationEnabled) {
// Touch exploration without accessibility makes no sense.
if (userState.mIsAccessibilityEnabled && userState.mIsTouchExplorationEnabled) {
flags |= AccessibilityInputFilter.FLAG_FEATURE_TOUCH_EXPLORATION;
}
mInputFilter.setEnabledFeatures(flags);