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

Merge "Control magnification only with the setting." into nyc-dev

Browse Source
This commit is contained in:
Phil Weaver
2016-02-26 20:57:45 +00:00
committed by Android (Google) Code Review
parent 01e81117a9 6cb67af65f
commit 8c8e55904a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1768,14 +1768,14 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
private void updateMagnificationLocked(UserState userState) {
final int userId = userState.mUserId;
if (userId == mCurrentUserId && mMagnificationController != null) {
if (userHasMagnificationServicesLocked(userState)) {
if (userState.mIsDisplayMagnificationEnabled ||
userHasMagnificationServicesLocked(userState)) {
mMagnificationController.setUserId(userState.mUserId);
} else {
// If the user no longer has any magnification-controlling
// services and is not using magnification gestures, then
// reset the state to normal.
if (!userState.mIsDisplayMagnificationEnabled
&& mMagnificationController.resetIfNeeded(true)) {
if (mMagnificationController.resetIfNeeded(true)) {
// Animations are still running, so wait until we receive a
// callback verifying that we've reset magnification.
mUnregisterMagnificationOnReset = true;