diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-10-01 13:39:08 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-10-02 13:55:15 -0700 |
| commit | 6e2bee75cea415621165698fdd9ce857bbb8872e (patch) | |
| tree | 840286617a3603685bb9f134e2fe4c924b8afef4 /services/java/com/android/server/accessibility/ScreenMagnifier.java | |
| parent | 0944d625448209185452eb4e800daec49de51986 (diff) | |
| download | frameworks_base-6e2bee75cea415621165698fdd9ce857bbb8872e.zip frameworks_base-6e2bee75cea415621165698fdd9ce857bbb8872e.tar.gz frameworks_base-6e2bee75cea415621165698fdd9ce857bbb8872e.tar.bz2 | |
Migrate more System and Secure settings to Global.
Includes telephony, WindowManager, PackageManager, and debugging
settings. Update API to point towards moved values.
Bug: 7231764, 7231252, 7231156
Change-Id: I5828747205708872f19f83a5bc821ed0a801cb79
Diffstat (limited to 'services/java/com/android/server/accessibility/ScreenMagnifier.java')
| -rw-r--r-- | services/java/com/android/server/accessibility/ScreenMagnifier.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/accessibility/ScreenMagnifier.java b/services/java/com/android/server/accessibility/ScreenMagnifier.java index f20eff1..14762a1 100644 --- a/services/java/com/android/server/accessibility/ScreenMagnifier.java +++ b/services/java/com/android/server/accessibility/ScreenMagnifier.java @@ -183,8 +183,8 @@ public final class ScreenMagnifier implements EventStreamTransformation { com.android.internal.R.integer.config_longAnimTime); mTapDistanceSlop = ViewConfiguration.get(context).getScaledTouchSlop(); mMultiTapDistanceSlop = ViewConfiguration.get(context).getScaledDoubleTapSlop(); - mWindowAnimationScale = Settings.System.getFloat(context.getContentResolver(), - Settings.System.WINDOW_ANIMATION_SCALE, DEFAULT_WINDOW_ANIMATION_SCALE); + mWindowAnimationScale = Settings.Global.getFloat(context.getContentResolver(), + Settings.Global.WINDOW_ANIMATION_SCALE, DEFAULT_WINDOW_ANIMATION_SCALE); mMagnificationController = new MagnificationController(mShortAnimationDuration); mDisplayProvider = new DisplayProvider(context, mWindowManager); |