summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2015-04-03 14:33:37 -0700
committerRoman Birg <roman@cyngn.com>2015-12-11 11:42:41 -0600
commit0cf7d4373afc1bbc0b9a42954d6dbd162aa361a4 (patch)
tree307f858411925cd08f8edf6fd848d3986d4aab43 /packages/SettingsProvider
parenta037ad401e4a78ce22a9ec2dada8ff3593aa8fa4 (diff)
downloadframeworks_base-0cf7d4373afc1bbc0b9a42954d6dbd162aa361a4.zip
frameworks_base-0cf7d4373afc1bbc0b9a42954d6dbd162aa361a4.tar.gz
frameworks_base-0cf7d4373afc1bbc0b9a42954d6dbd162aa361a4.tar.bz2
Forward port CM Screen Security settings (1/2)
* Variable size pattern lockscreen * Toggle dots/error pattern visibility Change-Id: Ie109e82c1fb2fd96b07e977e1cd76ae3acb865ff
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 3af1d36..b3ec295 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -721,6 +721,9 @@ class DatabaseHelper extends SQLiteOpenHelper {
Secure.LOCK_PATTERN_ENABLED,
Secure.LOCK_PATTERN_VISIBLE,
Secure.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED,
+ Secure.LOCK_PATTERN_SIZE,
+ Secure.LOCK_DOTS_VISIBLE,
+ Secure.LOCK_SHOW_ERROR_PATH,
"lockscreen.password_type",
"lockscreen.lockoutattemptdeadline",
"lockscreen.patterneverchosen",
@@ -2241,7 +2244,7 @@ class DatabaseHelper extends SQLiteOpenHelper {
try {
LockPatternUtils lpu = new LockPatternUtils(mContext);
List<LockPatternView.Cell> cellPattern =
- LockPatternUtils.stringToPattern(lockPattern);
+ LockPatternUtils.stringToPattern(lockPattern, lpu.getLockPatternSize());
lpu.saveLockPattern(cellPattern, null, UserHandle.USER_OWNER);
} catch (IllegalArgumentException e) {
// Don't want corrupted lock pattern to hang the reboot process