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

Commit c12a80ef authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

SettingsProvider: Animator settings are now in global 

Load the animation defaults to global as well. That's where windowmanager
gets them from

Change-Id: I55f9231d05d4339b92cb6bd96d87bfe49e297fec
parent 91cabc9b

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -2218,11 +2218,11 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
    }

    }





    private void loadDefaultAnimationSettings(SQLiteStatement stmt) {

    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);

                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);

                R.fraction.def_window_transition_scale, 1);

        loadFractionSetting(stmt, Settings.System.ANIMATOR_DURATION_SCALE,

        loadFractionSetting(stmt, Settings.Global.ANIMATOR_DURATION_SCALE,

                R.fraction.def_animator_duration_scale, 1);

                R.fraction.def_animator_duration_scale, 1);

    }

    }
@@ -2517,6 +2517,8 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            loadIntegerSetting(stmt, Settings.Global.SEND_ACTION_APP_ERROR,

            loadIntegerSetting(stmt, Settings.Global.SEND_ACTION_APP_ERROR,

                    R.integer.def_send_action_app_error);

                    R.integer.def_send_action_app_error);





            loadDefaultAnimationSettings(stmt);



            // --- New global settings start here

            // --- New global settings start here

            loadQuickBootSetting(db);

            loadQuickBootSetting(db);