From 3822896e226567c6cd3ef84518d318abd33a7624 Mon Sep 17 00:00:00 2001 From: Svetoslav Date: Tue, 29 Jan 2013 01:04:35 -0800 Subject: Remove "enhance web scripts" from settings and make it requested by plug-ins. Currently we have an "enhance web accessibility" setting that has to be enabled to make sure web content is accessible. We added the setting to get user consent because we are injecting JavaScript-based screen-reader pulled from the Google infrastructure. However, many users do not know that and (as expected) do not read the user documentation, resulting in critique for lacking accessibility support in WebViews with JavaScript enabled (Browser, Gmail, etc). To smoothen the user experience now "enhance web accessibility" is a feature an accessibility plug-in can request, similarly to explore by touch. Now a user does not need to know that she has to explicitly enable the setting and web accessibility will work out-of-the-box. Before we were showing a dialog when a plug-in tries to put the device in a touch exploration mode. However, now that we have one more feature a plug-in can request, showing two dialogs (assume a plug-in wants both features) will mean that a user should potentially deal with three dialogs, one for enabling the service, and one for each feature. We could merge the dialogs but still the user has to poke two dialogs. It seems that the permission mechanism is a perfect fit for getting user permission for an app to do something, in this case to enable an accessibility feature. We need a separate permission for explore by touch and enhance web accessibility since the former changes the interaction model and the latter injects JavaScript in web pages. It is critical to get user consent for the script injection part so we need a well-documented permission rather a vague umbrella permission for poking accessibility features. To allow better grouping of the accessibility permissions this patch adds a permission group as well. bug:8089372 Change-Id: Ic125514c34f191aea0416a469e4b3481ab3200b9 --- .../com/android/providers/settings/DatabaseHelper.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index fc0ff55..695c2aa 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -71,7 +71,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 = 96; + private static final int DATABASE_VERSION = 97; private Context mContext; private int mUserHandle; @@ -1536,6 +1536,22 @@ public class DatabaseHelper extends SQLiteOpenHelper { upgradeVersion = 96; } + if (upgradeVersion == 96) { + // Remove Settings.Secure.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES + if (mUserHandle == UserHandle.USER_OWNER) { + db.beginTransaction(); + try { + db.execSQL("DELETE FROM system WHERE name='" + + Settings.Secure.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES + + "'"); + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + } + } + upgradeVersion = 97; + } + // *** Remember to update DATABASE_VERSION above! if (upgradeVersion != currentVersion) { -- cgit v1.1