diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2013-10-29 22:29:31 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-18 18:58:54 +0100 |
| commit | 768d4bbe29f397bdff2021133a31ecc4c37ec6d4 (patch) | |
| tree | 14ac8c4abf83f46e0585b9ebbe3b74ec963cf2fc /packages/SettingsProvider/src | |
| parent | 2c85503310e0b6b15be5ddf3a662e92ec834bcc5 (diff) | |
| download | frameworks_base-768d4bbe29f397bdff2021133a31ecc4c37ec6d4.zip frameworks_base-768d4bbe29f397bdff2021133a31ecc4c37ec6d4.tar.gz frameworks_base-768d4bbe29f397bdff2021133a31ecc4c37ec6d4.tar.bz2 | |
SettingsProvider: Correctly set animations settings and animator duration
Change-Id: Idb53fc16696e4b3bd4aee7db3d574c6b946fa4c8
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Diffstat (limited to 'packages/SettingsProvider/src')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index b3ec295..e9e310a 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -422,7 +422,6 @@ 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(); @@ -553,7 +552,6 @@ 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(); @@ -958,7 +956,6 @@ 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(); @@ -2564,8 +2561,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); @@ -2607,10 +2602,12 @@ 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) { @@ -2780,6 +2777,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); |