From 86e7678b32436e0d04ae7a724732e58ec72caab6 Mon Sep 17 00:00:00 2001 From: Terry Heo Date: Mon, 12 Jun 2017 18:39:48 +0900 Subject: [PATCH] Fix loading of the default animation settings The animation settings were moved to global from system. So it should be read by loadGlobalSettings() not loadSystemSettings(). This change fixes the resource overlaying of "def_window_animation_scale" and "def_window_transition_scale". Bug: 62524410 Test: FDR and run adb shell cat /data/system/users/0/settings_global.xml | \ grep window_animation_scale Change-Id: Ifafddbad3183fd6c2efca30c6b790f6ed6a95832 --- .../src/com/android/providers/settings/DatabaseHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index b777d412ca6c4..dd101424668ca 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2319,8 +2319,6 @@ class DatabaseHelper extends SQLiteOpenHelper { loadBooleanSetting(stmt, Settings.System.SCREEN_BRIGHTNESS_MODE, R.bool.def_screen_brightness_automatic_mode); - loadDefaultAnimationSettings(stmt); - loadBooleanSetting(stmt, Settings.System.ACCELEROMETER_ROTATION, R.bool.def_accelerometer_rotation); @@ -2514,6 +2512,8 @@ class DatabaseHelper extends SQLiteOpenHelper { loadSetting(stmt, Settings.Global.MODE_RINGER, AudioManager.RINGER_MODE_NORMAL); + loadDefaultAnimationSettings(stmt); + // --- Previously in 'secure' loadBooleanSetting(stmt, Settings.Global.PACKAGE_VERIFIER_ENABLE, R.bool.def_package_verifier_enable);