diff options
Diffstat (limited to 'services/java')
3 files changed, 16 insertions, 16 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); diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 75bc265..564a805 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -9027,9 +9027,9 @@ public class PackageManagerService extends IPackageManager.Stub { mSystemReady = true; // Read the compatibilty setting when the system is ready. - boolean compatibilityModeEnabled = android.provider.Settings.System.getInt( + boolean compatibilityModeEnabled = android.provider.Settings.Global.getInt( mContext.getContentResolver(), - android.provider.Settings.System.COMPATIBILITY_MODE, 1) == 1; + android.provider.Settings.Global.COMPATIBILITY_MODE, 1) == 1; PackageParser.setCompatibilityModeEnabled(compatibilityModeEnabled); if (DEBUG_SETTINGS) { Log.d(TAG, "compatibility mode:" + compatibilityModeEnabled); diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 3f7b67b..ae805c3 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -811,12 +811,12 @@ public class WindowManagerService extends IWindowManager.Stub mBatteryStats = BatteryStatsService.getService(); // Get persisted window scale setting - mWindowAnimationScale = Settings.System.getFloat(context.getContentResolver(), - Settings.System.WINDOW_ANIMATION_SCALE, mWindowAnimationScale); - mTransitionAnimationScale = Settings.System.getFloat(context.getContentResolver(), - Settings.System.TRANSITION_ANIMATION_SCALE, mTransitionAnimationScale); - setAnimatorDurationScale(Settings.System.getFloat(context.getContentResolver(), - Settings.System.ANIMATOR_DURATION_SCALE, mTransitionAnimationScale)); + mWindowAnimationScale = Settings.Global.getFloat(context.getContentResolver(), + Settings.Global.WINDOW_ANIMATION_SCALE, mWindowAnimationScale); + mTransitionAnimationScale = Settings.Global.getFloat(context.getContentResolver(), + Settings.Global.TRANSITION_ANIMATION_SCALE, mTransitionAnimationScale); + setAnimatorDurationScale(Settings.Global.getFloat(context.getContentResolver(), + Settings.Global.ANIMATOR_DURATION_SCALE, mTransitionAnimationScale)); // Track changes to DevicePolicyManager state so we can enable/disable keyguard. IntentFilter filter = new IntentFilter(); @@ -7480,12 +7480,12 @@ public class WindowManagerService extends IWindowManager.Stub } case PERSIST_ANIMATION_SCALE: { - Settings.System.putFloat(mContext.getContentResolver(), - Settings.System.WINDOW_ANIMATION_SCALE, mWindowAnimationScale); - Settings.System.putFloat(mContext.getContentResolver(), - Settings.System.TRANSITION_ANIMATION_SCALE, mTransitionAnimationScale); - Settings.System.putFloat(mContext.getContentResolver(), - Settings.System.ANIMATOR_DURATION_SCALE, mAnimatorDurationScale); + Settings.Global.putFloat(mContext.getContentResolver(), + Settings.Global.WINDOW_ANIMATION_SCALE, mWindowAnimationScale); + Settings.Global.putFloat(mContext.getContentResolver(), + Settings.Global.TRANSITION_ANIMATION_SCALE, mTransitionAnimationScale); + Settings.Global.putFloat(mContext.getContentResolver(), + Settings.Global.ANIMATOR_DURATION_SCALE, mAnimatorDurationScale); break; } |