PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,008 Commits 1 Branch 0 Tags
d71c31ef946b35f73a0dded0a32c6ad6afc12227
Commit Graph

13008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Lawrence
d71c31ef94 Allow encryption when keyguard is set to pattern or no protection 
Don't block based on keyguard type, and pass type to encryption function.

Circular dependency on
  https://googleplex-android-review.git.corp.google.com/#/c/444200/

Bug: 13749169
Change-Id: Ica95713adca9552ae56341ff33badd1d4b748af8
 2014-04-03 19:45:52 +00:00
Adrian Roos
5de92cca6f Merge commit 'e63ac36f' into master 
Add lockout after trying to enter PIN / Password too often
Bug: 13647935

Conflicts:
	src/com/android/settings/ConfirmLockPassword.java

Change-Id: I0bf69d6d7fa8d5be9ad0fb42fe500e0a377af53b
 2014-04-03 17:05:36 +00:00
Adrian Roos
e63ac36f41 am 79a17924: am 0b55caf0: am a52a37b0: am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '79a179244612b09368209e2c95e48fe836aeab59':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:57:22 +00:00
Adrian Roos
79a1792446 am 0b55caf0: am a52a37b0: am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '0b55caf01af1efa15ff0bfbf50a1726fce788660':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:51:39 +00:00
Adrian Roos
0b55caf01a am a52a37b0: am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit 'a52a37b0fe17109877abbc25943d0d74232f3e5f':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:45:34 +00:00
Adrian Roos
a52a37b0fe am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '1b0b38cfeb54638899ddab48ff9198590f951a55':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:38:30 +00:00
Adrian Roos
1b0b38cfeb am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '5d3c8c89fca09ee190fe8df37e76ff05cc3833b1':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:35:13 +00:00
Adrian Roos
5d3c8c89fc am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '90630f6a6d19e169befb8ad8117d53200eb562c4':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:29:57 +00:00
Adrian Roos
90630f6a6d am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '09235d1065b501aa8a42e0767d72c15e7b846bae':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:23:57 +00:00
Adrian Roos
09235d1065 am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '82b3e62a4f8c8a229f700bbf122b8f8854162146':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:17:11 +00:00
Adrian Roos
82b3e62a4f am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '4692a48c28d7002221fec28d5ac324636f81c8f2':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:11:02 +00:00
Adrian Roos
4692a48c28 am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit 'c4bfea207acf62c9e70949d3225d082d95d4d193':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:05:07 +00:00
Adrian Roos
c4bfea207a am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '3f38173fadc1423d4c36b265a2ab5fdc09d88271':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 13:58:57 +00:00
Adrian Roos
3f38173fad am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '3a7690b157c100f3a36b6fdc2578a12845875e06':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 13:55:28 +00:00
Adrian Roos
3a7690b157 am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '8184ea524519a67b1284266844e6e186f3a74cab':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 13:49:53 +00:00
Fabrice Di Meglio
a2e7af9112 Merge "Add indexing for SwitchPreferences" 2014-04-03 02:39:57 +00:00
Fabrice Di Meglio
dd41dfc483 Add indexing for SwitchPreferences 
- now support the SwitchPreferences and save the "switchOn" and "switchOff"
attributes
- update Index database schema (and increment its version)
- fix an issue with some previous schema not rebuilt

Change-Id: I9cd48c666525f19474ef9bd5746d61b589058063
 2014-04-02 19:37:39 -07:00
Fabrice Di Meglio
2fbb49f698 Merge "Add indexing for ListPreferences" 2014-04-03 02:09:17 +00:00
Fabrice Di Meglio
a41707200b Add indexing for ListPreferences 
- now support ListPreferences and save the "entries" attribute
- update Index database schema (and increment its version)
- do some clever stuff when showing Search results: if there is
a "$s" or "%s" in the summary (replacement strings), just use
the entries instead

Change-Id: If36595c3816706b6349faff7d3c2e725d3ea33f4
 2014-04-02 19:05:45 -07:00
Fabrice Di Meglio
a2c8febd28 Merge "Add indexing for Storage preferences" 2014-04-03 00:20:21 +00:00
Fabrice Di Meglio
f66eb7a8c8 Add indexing for Storage preferences 
- implement the contract for SEARCH_INDEX_DATA_PROVIDER

Change-Id: I131e9176c47ccd697d05961b09546ba0e51059f7
 2014-04-02 17:18:56 -07:00
Fabrice Di Meglio
355806bf89 Merge "Blow up the Settings Search Index database if there is a Database downgrade detected" 2014-04-02 22:51:01 +00:00
Fabrice Di Meglio
fb5e639b30 Blow up the Settings Search Index database if there is a Database downgrade detected 
- use the onDowngrade(...) callback for blowing away the Search Index database and
recompute the Index.

Change-Id: I137b22e710dd3205063cf8ce239105b2f1c5278b
 2014-04-02 15:50:34 -07:00
Fabrice Di Meglio
a95864d025 Merge "Add indexing for Limited Interruptions (notifications) preferences" 2014-04-02 21:27:23 +00:00
Fabrice Di Meglio
019b87f17a Add indexing for Limited Interruptions (notifications) preferences 
- implement the contract for SEARCH_INDEX_DATA_PROVIDER
- some code styling too

Change-Id: I106d1d9493eb945ea71e500acd43a1fc6096bb1f
 2014-04-02 14:26:59 -07:00
Adrian Roos
8184ea5245 Add lockout after trying to enter PIN / Password too often 
Enforce the same lockout that is already enforced when entering the pattern.

Bug: 13647935

Change-Id: Ia60a2235ad526c293b7a8d5600f406f187004df7
 2014-04-02 16:28:10 +02:00
Xia Wang
c4e68c1dcd am 2f633ca3: am 8361a97c: am 3e238230: am 836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev 
* commit '2f633ca3a5813eb3fece716448308bf8e7d351ee':
  Add legacy VPN test framework and test cases
 2014-04-02 03:55:59 +00:00
Xia Wang
2f633ca3a5 am 8361a97c: am 3e238230: am 836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev 
* commit '8361a97c43a49b5e7528afd5baeca624d909bbf9':
  Add legacy VPN test framework and test cases
 2014-04-02 03:51:38 +00:00
Xia Wang
8361a97c43 am 3e238230: am 836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev 
* commit '3e23823015d2ad0679d89adc2a62c7d568adada8':
  Add legacy VPN test framework and test cases
 2014-04-02 03:45:56 +00:00
Xia Wang
3e23823015 am 836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev 
* commit '836eff87a93f5b2857b41763197ab6782581aafc':
  Add legacy VPN test framework and test cases
 2014-04-02 03:40:26 +00:00
Xia Wang
836eff87a9 Merge "Add legacy VPN test framework and test cases" into klp-dev 2014-04-02 03:36:50 +00:00
Xia Wang
340bda7154 Add legacy VPN test framework and test cases 
- VpnProfileParser can parse VPN profiles from an xml file
- CertInstallerHelper installs keys and certificates to keystore
- VpnTests includes all test cases

Change-Id: Ib5ce33e770ee4f82bea153f9b5c5cf3802f95b0c
 2014-04-01 17:45:58 -07:00
Fabrice Di Meglio
627ef9706b Merge "Add indexing for Notifications preferences" 2014-04-01 20:25:17 +00:00
Fabrice Di Meglio
9593782d15 Add indexing for Notifications preferences 
- also add indexing of CheckBoxPreferences
- also some code cleaning

Change-Id: I2943caaec3d64fb2a6be85168454fc76fe572afe
 2014-04-01 13:21:01 -07:00
Baligh Uddin
61ac531286 am b89c4d71: (-s ours) am cf743762: (-s ours) am 88adaa72: (-s ours) am 112916b5: (-s ours) Import translations. DO NOT MERGE 
* commit 'b89c4d713bd33072961ace7743d391ed6339d410':
  Import translations. DO NOT MERGE
 2014-04-01 01:25:38 +00:00
Fabrice Di Meglio
5ff8de7e4d Merge "Fix bug #13727850 Input values are not visible when setting up the lockscreen... ...security(PIN/Passwor/Pattern)." 2014-04-01 01:21:23 +00:00
Fabrice Di Meglio
0e1d4b0d1a Fix bug #13727850 Input values are not visible when setting up the lockscreen... 
...security(PIN/Passwor/Pattern).

- remove hardcoded colors...
- define a text appearance style for the password / pin

Change-Id: I425a2daa016cb782f18de320b5696d076f576600
 2014-03-31 17:36:52 -07:00
Baligh Uddin
47d7f210f9 am b3545a54: (-s ours) am 518a5037: (-s ours) Import translations. DO NOT MERGE 
* commit 'b3545a548fe336024dae011ac1c4e643d4f4b114':
  Import translations. DO NOT MERGE
 2014-04-01 00:24:35 +00:00
Baligh Uddin
b89c4d713b am cf743762: (-s ours) am 88adaa72: (-s ours) am 112916b5: (-s ours) Import translations. DO NOT MERGE 
* commit 'cf743762611ceb918aabee179ef10f81ccc90aaf':
  Import translations. DO NOT MERGE
 2014-04-01 00:21:31 +00:00
Baligh Uddin
cf74376261 am 88adaa72: (-s ours) am 112916b5: (-s ours) Import translations. DO NOT MERGE 
* commit '88adaa72a385c3199787ecd3dae826f25d38572d':
  Import translations. DO NOT MERGE
 2014-04-01 00:15:49 +00:00
Baligh Uddin
88adaa72a3 am 112916b5: (-s ours) Import translations. DO NOT MERGE 
* commit '112916b59634a86195880a1368d8d60a86f33188':
  Import translations. DO NOT MERGE
 2014-04-01 00:09:19 +00:00
Baligh Uddin
b3545a548f am 518a5037: (-s ours) Import translations. DO NOT MERGE 
* commit '518a503740bcb900fe8a69c86f5826466f99ee6e':
  Import translations. DO NOT MERGE
 2014-04-01 00:08:46 +00:00
Baligh Uddin
d81233e94d Merge "Import translations. DO NOT MERGE" 2014-03-31 22:15:05 +00:00
Baligh Uddin
b123c7a90a Import translations. DO NOT MERGE 
Change-Id: I40361b20546a4fa949b75623315040f0d32127fa
Auto-generated-cl: translation import
 2014-03-31 14:47:58 -07:00
Baligh Uddin
518a503740 Import translations. DO NOT MERGE 
Change-Id: I2df2a0668882bab5b18242e3db72b5a5daf983b0
Auto-generated-cl: translation import
 2014-03-31 14:42:20 -07:00
Baligh Uddin
112916b596 Import translations. DO NOT MERGE 
Change-Id: I0208bc3b072d49bb77ea2f07e365b1982bb5e324
Auto-generated-cl: translation import
 2014-03-31 14:40:25 -07:00
Adrian Roos
5954ff505f Add initial trust agent settings 
Adds a first version of the trust agent settings
under Security -> Device Administration -> Trust Agents.

Change-Id: I2e2dc41208d13cc1b11bb21d427c6f86053a3640
 2014-03-31 23:00:51 +02:00
John Spurlock
3726525d50 Zen mode settings update. 
- Fix master switch placement, hide search option.
 - New text-based design for bucket configs.
 - Automatically turn on = Never
 - Still read-only.

Bug:13670014
Change-Id: I33e7614515cc4ce1ca957d922b844d4865e35c9a
 2014-03-31 12:07:52 -04:00
John Spurlock
12acc58109 Fix NPE in notification settings. 
Show/hide the apps category safely every time.
Default apps category to hidden to avoid startup blip.

Change-Id: I4c18c57754e5d0a6a73e7271844ff71c0a66ad8d
 2014-03-31 11:04:26 -04:00
Fabrice Di Meglio
7784e3507d Merge "Go Quantum Go!" 2014-03-29 01:49:03 +00:00