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

Commit 8cbe6e8f authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Updating the data base upgrade/creation code for the new touch exploraion setting."

parents 7c8d19d5 a28a16d1

core/java/android/preference/TwoStatePreference.java

+2 −1
Original line number Diff line number Diff line
@@ -202,7 +202,8 @@ public abstract class TwoStatePreference extends Preference { 
                && view.isEnabled()) {

            mSendAccessibilityEventViewClickedType = false;

            if (mSendAccessibilityEventTypeViewClicked == null) {

                mSendAccessibilityEventTypeViewClicked = new SendAccessibilityEventTypeViewClicked();

                mSendAccessibilityEventTypeViewClicked =

                    new SendAccessibilityEventTypeViewClicked();

            }

            mSendAccessibilityEventTypeViewClicked.mView = view;

            view.post(mSendAccessibilityEventTypeViewClicked);

core/java/android/provider/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -3964,6 +3964,7 @@ public final class Settings { 
            ACCESSIBILITY_SCRIPT_INJECTION,

            BACKUP_AUTO_RESTORE,

            ENABLED_ACCESSIBILITY_SERVICES,

            TOUCH_EXPLORATION_ENABLED,

            TTS_USE_DEFAULTS,

            TTS_DEFAULT_RATE,

            TTS_DEFAULT_PITCH,

packages/SettingsProvider/res/values/defaults.xml

+3 −0
Original line number Diff line number Diff line
@@ -112,6 +112,9 @@ 
            0x200000038=0x03000701:0x03010701:0x03020701;

    </string>



    <!-- Default for Settings.Secure.TOUCH_EXPLORATION_ENABLED -->

    <bool name="def_touch_exploration_enabled">false</bool>



    <!-- Default for Settings.System.USER_ROTATION -->

    <integer name="def_user_rotation">0</integer>

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

+22 −0
Original line number Diff line number Diff line
@@ -891,6 +891,25 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
             upgradeVersion = 67;

         }



        if (upgradeVersion == 67) {

            // New setting to enable touch exploration.

            db.beginTransaction();

            SQLiteStatement stmt = null;

            try {

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

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

                loadBooleanSetting(stmt, Settings.Secure.TOUCH_EXPLORATION_ENABLED,

                        R.bool.def_touch_exploration_enabled);

                stmt.close();

                db.setTransactionSuccessful();

            } finally {

                db.endTransaction();

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

            }

            upgradeVersion = 68;

        }





        // *** Remember to update DATABASE_VERSION above!



        if (upgradeVersion != currentVersion) {
@@ -1427,6 +1446,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { 


            loadIntegerSetting(stmt, Settings.Secure.LONG_PRESS_TIMEOUT,

                    R.integer.def_long_press_timeout_millis);



            loadBooleanSetting(stmt, Settings.Secure.TOUCH_EXPLORATION_ENABLED,

                    R.bool.def_touch_exploration_enabled);

        } finally {

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

        }