From 7b62df8556ff6febd8137b9a8bcd755b1f93a1f9 Mon Sep 17 00:00:00 2001 From: vinodkrishnan Date: Wed, 30 Nov 2016 20:09:59 +0000 Subject: Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" This reverts commit 8500f26d51e2ba0de7b6cd18bec5f85e5ca40e1d. Change-Id: I6408fa3f307d7611443e26b24d3876c1a1f92fdc --- core/java/android/provider/Settings.java | 11 -------- packages/SettingsProvider/res/values/defaults.xml | 3 -- .../android/providers/settings/DatabaseHelper.java | 3 -- .../android/server/wm/WindowManagerService.java | 33 +++------------------- 4 files changed, 4 insertions(+), 46 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ee2596bd2b9f..3f1789bf9d88 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5163,16 +5163,6 @@ public final class Settings { public static final String ACCESSIBILITY_SOFT_KEYBOARD_MODE = "accessibility_soft_keyboard_mode"; - /** - * Should we disable all animations when accessibility is turned on. On low-power devices - * like Android Wear, the performance makes the device unusable. Turning off animations - * is a partial fix. - * - * @hide - */ - public static final String ACCESSIBILITY_DISABLE_ANIMATIONS = - "accessibility_disable_animations"; - /** * Default soft keyboard behavior. * @@ -6451,7 +6441,6 @@ public final class Settings { ACCESSIBILITY_CAPTIONING_TYPEFACE, ACCESSIBILITY_CAPTIONING_FONT_SCALE, ACCESSIBILITY_CAPTIONING_WINDOW_COLOR, - ACCESSIBILITY_DISABLE_ANIMATIONS, TTS_USE_DEFAULTS, TTS_DEFAULT_RATE, TTS_DEFAULT_PITCH, diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index c459571616d8..a536874b750b 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -220,7 +220,4 @@ false - - - false diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 07bcce67c87e..d55bb4f44aa5 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2484,9 +2484,6 @@ class DatabaseHelper extends SQLiteOpenHelper { loadStringSetting(stmt, Settings.Secure.ACCESSIBILITY_SCREEN_READER_URL, R.string.def_accessibility_screen_reader_url); - loadBooleanSetting(stmt, Settings.Secure.ACCESSIBILITY_DISABLE_ANIMATIONS, - R.bool.def_accessibility_disable_animations); - if (SystemProperties.getBoolean("ro.lockscreen.disable.default", false) == true) { loadSetting(stmt, Settings.System.LOCKSCREEN_DISABLED, "1"); } else { diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 5dad9c4e3ce8..ca2610af3f66 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -350,13 +350,11 @@ public class WindowManagerService extends IWindowManager.Stub // Enums for animation scale update types. @Retention(RetentionPolicy.SOURCE) - @IntDef({WINDOW_ANIMATION_SCALE, TRANSITION_ANIMATION_SCALE, ANIMATION_DURATION_SCALE, - ACCESSIBILITY_CHANGED}) + @IntDef({WINDOW_ANIMATION_SCALE, TRANSITION_ANIMATION_SCALE, ANIMATION_DURATION_SCALE}) private @interface UpdateAnimationScaleMode {}; private static final int WINDOW_ANIMATION_SCALE = 0; private static final int TRANSITION_ANIMATION_SCALE = 1; private static final int ANIMATION_DURATION_SCALE = 2; - private static final int ACCESSIBILITY_CHANGED = 3; final private KeyguardDisableHandler mKeyguardDisableHandler; @@ -671,8 +669,6 @@ public class WindowManagerService extends IWindowManager.Stub Settings.Global.getUriFor(Settings.Global.TRANSITION_ANIMATION_SCALE); private final Uri mAnimationDurationScaleUri = Settings.Global.getUriFor(Settings.Global.ANIMATOR_DURATION_SCALE); - private final Uri mAccessibilityEnabledUri = - Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_ENABLED); public SettingsObserver() { super(new Handler()); @@ -685,8 +681,6 @@ public class WindowManagerService extends IWindowManager.Stub UserHandle.USER_ALL); resolver.registerContentObserver(mAnimationDurationScaleUri, false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(mAccessibilityEnabledUri, false, this, - UserHandle.USER_ALL); } @Override @@ -706,9 +700,6 @@ public class WindowManagerService extends IWindowManager.Stub mode = TRANSITION_ANIMATION_SCALE; } else if (mAnimationDurationScaleUri.equals(uri)) { mode = ANIMATION_DURATION_SCALE; - } else if (mAccessibilityEnabledUri.equals(uri)) { - // Change all of them. - mode = ACCESSIBILITY_CHANGED; } else { // Ignoring unrecognized content changes return; @@ -1007,12 +998,13 @@ public class WindowManagerService extends IWindowManager.Stub public void onLowPowerModeChanged(boolean enabled) { synchronized (mWindowMap) { if (mAnimationsDisabled != enabled && !mAllowAnimationsInLowPowerMode) { - setShouldAnimationsDisabled(enabled); + mAnimationsDisabled = enabled; + dispatchNewAnimatorScaleLocked(null); } } } }); - setShouldAnimationsDisabled(mPowerManagerInternal.getLowPowerModeEnabled()); + mAnimationsDisabled = mPowerManagerInternal.getLowPowerModeEnabled(); mScreenFrozenLock = mPowerManager.newWakeLock( PowerManager.PARTIAL_WAKE_LOCK, "SCREEN_FROZEN"); mScreenFrozenLock.setReferenceCounted(false); @@ -1095,18 +1087,6 @@ public class WindowManagerService extends IWindowManager.Stub } } - private void setShouldAnimationsDisabled(boolean isLowPowerEnabled) { - boolean accessibilityEnabled = Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.ACCESSIBILITY_ENABLED, 0) == 1; - boolean disableAnimationsWhenAccessibility = Settings.Secure.getInt( - mContext.getContentResolver(), - Settings.Secure.ACCESSIBILITY_DISABLE_ANIMATIONS, 0) == 1; - - mAnimationsDisabled = isLowPowerEnabled || - (accessibilityEnabled && disableAnimationsWhenAccessibility); - dispatchNewAnimatorScaleLocked(null); - } - private void placeWindowAfter(WindowState pos, WindowState window) { final WindowList windows = pos.getWindowList(); final int i = windows.indexOf(pos); @@ -8610,11 +8590,6 @@ public class WindowManagerService extends IWindowManager.Stub dispatchNewAnimatorScaleLocked(null); break; } - case ACCESSIBILITY_CHANGED: { - setShouldAnimationsDisabled( - mPowerManagerInternal.getLowPowerModeEnabled()); - } - break; } break; } -- cgit v1.2.3-59-g8ed1b