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

13185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
10cbad66f9 am 31e51bab: (-s ours) am 44e3e56f: (-s ours) am 216b5c50: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '31e51bab1530c93183467d7fa5371a725ed910d6':
  Import translations. DO NOT MERGE
 2014-04-04 14:52:31 +00:00
Baligh Uddin
31e51bab15 am 44e3e56f: (-s ours) am 216b5c50: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '44e3e56fe20c2fc59d90b6ef6564458cffb1efa7':
  Import translations. DO NOT MERGE
 2014-04-04 14:45:54 +00:00
Baligh Uddin
871322653c am 3f3469ae: (-s ours) am cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '3f3469aecc1da8bf72482ddae53e11d0245fddd9':
  Import translations. DO NOT MERGE
 2014-04-04 14:45:45 +00:00
Baligh Uddin
87985696c8 am 6c87824b: (-s ours) am 457681d5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '6c87824b86cd7e3420d3f600139648f6927b4b6c':
  Import translations. DO NOT MERGE
 2014-04-04 14:44:36 +00:00
Baligh Uddin
44e3e56fe2 am 216b5c50: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '216b5c501bb81977407b5977e6ee709b34f3a37d':
  Import translations. DO NOT MERGE
 2014-04-04 14:38:19 +00:00
Baligh Uddin
3f3469aecc am cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'cc01536f7755da6560a23057ac3dbdec10e3993f':
  Import translations. DO NOT MERGE
 2014-04-04 14:37:50 +00:00
Baligh Uddin
6c87824b86 am 457681d5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '457681d5f15aaa32edf76e0765d1e9e2b532893e':
  Import translations. DO NOT MERGE
 2014-04-04 14:37:19 +00:00
Baligh Uddin
cc01536f77 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-04-04 14:32:06 +00:00
Baligh Uddin
457681d5f1 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-04 14:32:04 +00:00
Baligh Uddin
216b5c501b Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2014-04-04 14:31:59 +00:00
Baligh Uddin
537b5a5347 Merge "Import translations. DO NOT MERGE" 2014-04-04 14:31:57 +00:00
Paul Lawrence
2b664e0713 Merge "Show OwnerInfo on CryptKeeper screen" 2014-04-04 14:06:09 +00:00
Fabrice Di Meglio
1800a9f3e7 Fix bug #13735413 Particular settings name changing on device orientation changes 
- restore the title correctly when we are restoring the Settings App

Change-Id: Ibd56c52b703620e3d2b8e524e6b3caf35f3c8980
 2014-04-03 19:31:07 -07:00
Fabrice Di Meglio
b731dd0554 Fix Up affordance when restoring Settings app state 
- save the state of the Up affordance and restore it

Change-Id: Ia00e929b1bbcdaa51280f9b2bb9322f8594c5a37
 2014-04-03 19:18:37 -07:00
Fabrice Di Meglio
ef724a0f95 Merge "Code cleaning" 2014-04-04 01:11:21 +00:00
Fabrice Di Meglio
086c76791f Code cleaning 
- remove dead code and some constants that were no more used

Change-Id: I32d19d74e5b271f9e7c8938e4b3c79175bdf69ee
 2014-04-03 18:11:37 -07:00
Fabrice Di Meglio
04a09d519e Merge "Fix bug #13794200 Settings crash when screen is locked and Power Usage... ...Settings is launched with an Intent" 2014-04-03 23:45:54 +00:00
Fabrice Di Meglio
d6985df419 Fix bug #13794200 Settings crash when screen is locked and Power Usage... 
...Settings is launched with an Intent

- fix the NPE by checking if mSearchMenuItem / mSearchView references are null

Change-Id: I7518c8360af88a20df780be8cb89360a26cdb8d0
 2014-04-03 16:43:26 -07:00
Fabrice Di Meglio
d2693a82ad Merge "Re-enable on/off switch for Wi-Fi and Bluetooth Settings" 2014-04-03 21:02:51 +00:00
Fabrice Di Meglio
86ea97f452 Re-enable on/off switch for Wi-Fi and Bluetooth Settings 
- the switch was no more there when launching from an Intent (it was a regression)

Change-Id: I1fc95cad4523a1d3812323fb26908f925a9e623e
 2014-04-03 13:57:56 -07:00
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
Baligh Uddin
59ff186089 Import translations. DO NOT MERGE 
Change-Id: Ia4d32ca1bcd5304c2dbe5933591434cd7b1ccd9c
Auto-generated-cl: translation import
 2014-04-02 11:56:38 -07:00
Baligh Uddin
84c216826c Import translations. DO NOT MERGE 
Change-Id: Id18f3fec7657dd9eba74e4fd0f5c34eeea264fd2
Auto-generated-cl: translation import
 2014-04-02 11:52:34 -07:00
Baligh Uddin
1cc35bcfa4 Import translations. DO NOT MERGE 
Change-Id: I2521114c59686637b57ea802bbb72aa7fa01615c
Auto-generated-cl: translation import
 2014-04-02 11:49:10 -07:00
Baligh Uddin
73c5412dee Import translations. DO NOT MERGE 
Change-Id: Ife01297eb460bb5881d86ed7c0f672ecb461cb48
Auto-generated-cl: translation import
 2014-04-02 11:47:25 -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