Updating the data base upgrade/creation code for the new touch exploraion setting.
1. Update the database creation/upgrade code to take care of the new setting
to enable touch exploration.
2. Made the tocuh exploration settings persistent to the cloud.
Change-Id: Ie24e9184b4a21869432d11d207cb6464fadbac3b
diff --git a/core/java/android/preference/TwoStatePreference.java b/core/java/android/preference/TwoStatePreference.java
index 55ef108..b6f00ad 100644
--- a/core/java/android/preference/TwoStatePreference.java
+++ b/core/java/android/preference/TwoStatePreference.java
@@ -202,7 +202,8 @@
&& view.isEnabled()) {
mSendAccessibilityEventViewClickedType = false;
if (mSendAccessibilityEventTypeViewClicked == null) {
- mSendAccessibilityEventTypeViewClicked = new SendAccessibilityEventTypeViewClicked();
+ mSendAccessibilityEventTypeViewClicked =
+ new SendAccessibilityEventTypeViewClicked();
}
mSendAccessibilityEventTypeViewClicked.mView = view;
view.post(mSendAccessibilityEventTypeViewClicked);
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index cd4e32e..71bd3b6 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3950,6 +3950,7 @@
ACCESSIBILITY_SCRIPT_INJECTION,
BACKUP_AUTO_RESTORE,
ENABLED_ACCESSIBILITY_SERVICES,
+ TOUCH_EXPLORATION_ENABLED,
TTS_USE_DEFAULTS,
TTS_DEFAULT_RATE,
TTS_DEFAULT_PITCH,
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index b349030..c61da4e 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -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>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index a5022e9..ad84112 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -891,6 +891,25 @@
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 @@
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();
}