SettingsProvider: Correctly set animations settings and animator duration

Change-Id: Idb53fc16696e4b3bd4aee7db3d574c6b946fa4c8
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

2 files changed, 7 insertions, 7 deletions

diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 90cd78c..b00cb44 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -32,6 +32,7 @@
     <bool name="def_screen_off_animation">false</bool>
     <fraction name="def_window_animation_scale">100%</fraction>
     <fraction name="def_window_transition_scale">100%</fraction>
+    <fraction name="def_animator_duration_scale">100%</fraction>
     <bool name="def_haptic_feedback">true</bool>
 
     <bool name="def_adb_enabled">false</bool>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 09e19a2..efedf56 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -380,7 +380,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                         + Settings.System.TRANSITION_ANIMATION_SCALE + "'");
                 stmt = db.compileStatement("INSERT INTO system(name,value)"
                         + " VALUES(?,?);");
-                loadDefaultAnimationSettings(stmt);
                 db.setTransactionSuccessful();
             } finally {
                 db.endTransaction();
@@ -511,7 +510,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                         + Settings.System.TRANSITION_ANIMATION_SCALE + "'");
                 stmt = db.compileStatement("INSERT INTO system(name,value)"
                         + " VALUES(?,?);");
-                loadDefaultAnimationSettings(stmt);
                 db.setTransactionSuccessful();
             } finally {
                 db.endTransaction();
@@ -915,7 +913,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                         + Settings.System.TRANSITION_ANIMATION_SCALE + "'");
                 stmt = db.compileStatement("INSERT INTO system(name,value)"
                         + " VALUES(?,?);");
-                loadDefaultAnimationSettings(stmt);
                 db.setTransactionSuccessful();
             } finally {
                 db.endTransaction();
@@ -1960,8 +1957,6 @@ public 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);
 
@@ -2005,10 +2000,12 @@ public class DatabaseHelper extends SQLiteOpenHelper {
     }
 
     private void loadDefaultAnimationSettings(SQLiteStatement stmt) {
-        loadFractionSetting(stmt, Settings.System.WINDOW_ANIMATION_SCALE,
+        loadFractionSetting(stmt, Settings.Global.WINDOW_ANIMATION_SCALE,
                 R.fraction.def_window_animation_scale, 1);
-        loadFractionSetting(stmt, Settings.System.TRANSITION_ANIMATION_SCALE,
+        loadFractionSetting(stmt, Settings.Global.TRANSITION_ANIMATION_SCALE,
                 R.fraction.def_window_transition_scale, 1);
+        loadFractionSetting(stmt, Settings.Global.ANIMATOR_DURATION_SCALE,
+                R.fraction.def_animator_duration_scale, 1);
     }
 
     private void loadDefaultHapticSettings(SQLiteStatement stmt) {
@@ -2152,6 +2149,8 @@ public 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);