Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f095e6f authored by Roman Birg's avatar Roman Birg Committed by Gerrit Code Review
Browse files

SettingsProvider: load animation defaults into correct table 



These belong to Settings.Global now.

Change-Id: I6a0436d887f2be068329c866983f3a03650ed0ce
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent 312801d2

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+4 −4
Original line number Diff line number Diff line
@@ -2498,8 +2498,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);
@@ -2577,9 +2575,9 @@ 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);

    }
@@ -2950,6 +2948,8 @@ public class DatabaseHelper extends SQLiteOpenHelper { 


            loadBooleanSetting(stmt, Settings.Global.GUEST_USER_ENABLED,

                    R.bool.def_guest_user_enabled);



            loadDefaultAnimationSettings(stmt);

            // --- New global settings start here

        } finally {

            if (stmt != null) stmt.close();