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

Commit dbd3fe77 authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Animation settings reset to default"

parents 0aaa30dc fa53d300

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

+34 −12
Original line number Diff line number Diff line
@@ -16,17 +16,6 @@ 


package com.android.providers.settings;



import com.android.internal.content.PackageHelper;

import com.android.internal.telephony.BaseCommands;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.RILConstants;

import com.android.internal.util.XmlUtils;

import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternView;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;



import android.content.ComponentName;

import android.content.ContentValues;

import android.content.Context;
@@ -47,6 +36,17 @@ import android.provider.Settings.Secure; 
import android.text.TextUtils;

import android.util.Log;



import com.android.internal.content.PackageHelper;

import com.android.internal.telephony.BaseCommands;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.RILConstants;

import com.android.internal.util.XmlUtils;

import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternView;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;



import java.io.IOException;

import java.util.HashSet;

import java.util.List;
@@ -63,7 +63,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
    // database gets upgraded properly. At a minimum, please confirm that 'upgradeVersion'

    // is properly propagated through your change.  Not doing so will result in a loss of user

    // settings.

    private static final int DATABASE_VERSION = 65;

    private static final int DATABASE_VERSION = 66;



    private Context mContext;
@@ -839,6 +839,28 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            upgradeVersion = 65;

        }



        if (upgradeVersion == 65) {

            /*

             * Animations are removed from Settings. Turned on by default

             */

            db.beginTransaction();

            SQLiteStatement stmt = null;

            try {

                db.execSQL("DELETE FROM system WHERE name='"

                        + Settings.System.WINDOW_ANIMATION_SCALE + "'");

                db.execSQL("DELETE FROM system WHERE name='"

                        + Settings.System.TRANSITION_ANIMATION_SCALE + "'");

                stmt = db.compileStatement("INSERT INTO system(name,value)"

                        + " VALUES(?,?);");

                loadDefaultAnimationSettings(stmt);

                db.setTransactionSuccessful();

            } finally {

                db.endTransaction();

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

            }

            upgradeVersion = 66;

        }



        // *** Remember to update DATABASE_VERSION above!



        if (upgradeVersion != currentVersion) {