diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-06-11 17:25:51 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2014-06-12 12:59:47 -0700 |
| commit | 1e9c21871e81642669079cd290ef47818a3165bd (patch) | |
| tree | b8f951004c8a017f1a9b92290ab1308bc6e89ee5 /packages/SettingsProvider | |
| parent | 02a9c359a1a6e1175cdd2d560f97be9cdb816a0e (diff) | |
| download | frameworks_base-1e9c21871e81642669079cd290ef47818a3165bd.zip frameworks_base-1e9c21871e81642669079cd290ef47818a3165bd.tar.gz frameworks_base-1e9c21871e81642669079cd290ef47818a3165bd.tar.bz2 | |
Guest user first iteration
Setting for controlling if guest is enabled on the device.
Setting to hint to apps that they should skip showing first use clings.
User switcher handles creation and deletion of the guest user.
Some tweaks to the user switcher to show some feedback and make the icons
circular.
Change-Id: I187dc381d2ee7c372ec6d35e14aa9ea4dfbe5936
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 3 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 0e025a9..a92ab7e 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -195,4 +195,7 @@ <!-- Default for Settings.Secure.WAKE_GESTURE_ENABLED --> <bool name="def_wake_gesture_enabled">true</bool> + <!-- Default for Settings.Global.GUEST_USER_ENABLED --> + <bool name="def_guest_user_enabled">true</bool> + </resources> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 9b21ae4..09e6a94 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -70,7 +70,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 = 104; + private static final int DATABASE_VERSION = 105; private Context mContext; private int mUserHandle; @@ -1677,6 +1677,24 @@ public class DatabaseHelper extends SQLiteOpenHelper { upgradeVersion = 104; } + if (upgradeVersion < 105) { + if (mUserHandle == UserHandle.USER_OWNER) { + db.beginTransaction(); + SQLiteStatement stmt = null; + try { + stmt = db.compileStatement("INSERT OR IGNORE INTO global(name,value)" + + " VALUES(?,?);"); + loadBooleanSetting(stmt, Settings.Global.GUEST_USER_ENABLED, + R.bool.def_guest_user_enabled); + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + if (stmt != null) stmt.close(); + } + } + upgradeVersion = 105; + } + // *** Remember to update DATABASE_VERSION above! if (upgradeVersion != currentVersion) { @@ -2410,6 +2428,8 @@ public class DatabaseHelper extends SQLiteOpenHelper { loadSetting(stmt, Settings.Global.DEVICE_NAME, getDefaultDeviceName()); + loadBooleanSetting(stmt, Settings.Global.GUEST_USER_ENABLED, + R.bool.def_guest_user_enabled); // --- New global settings start here } finally { if (stmt != null) stmt.close(); |
