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

13174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
b2aa8ab660 merge in master-release history after reset to master 2014-04-05 05:51:37 -07:00
Fabrice Di Meglio
8477a30fc6 Merge "Change Search icon asset in the ActionBar" 2014-04-05 01:18:57 +00:00
Fabrice Di Meglio
4e409012f3 Change Search icon asset in the ActionBar 
- use ic_search_api_holo_light and wait for the Quantum Paper asset

Related to bug #13818985 Settings using GB-style search icon

Change-Id: I6e550008b1ec89470c66bc83b55dec11f7a3f067
 2014-04-04 18:17:02 -07:00
Fabrice Di Meglio
54ed567b71 Merge "Fix bug #13817456 User not take to previous sub setting screen when Home ...affordance is tapped from second level sub settings page" 2014-04-05 00:57:49 +00:00
Fabrice Di Meglio
911fb2ad90 Fix bug #13817456 User not take to previous sub setting screen when Home 
...affordance is tapped from second level sub settings page

- start an Activity instead of switch Fragments

Change-Id: I0e47d6539a3a048d7aa25bdb125c4c99031f9e85
 2014-04-04 17:55:57 -07:00
Xia Wang
52ddc781a1 am 70ce016f: am d2f56f07: am ac768973: am ce11881a: Allow VPN to stay connected for some time before disconnecting it. 
* commit '70ce016f84ce6c54b2c5f07adf86e415de5598cb':
  Allow VPN to stay connected for some time before disconnecting it.
 2014-04-05 00:54:54 +00:00
Xia Wang
70ce016f84 am d2f56f07: am ac768973: am ce11881a: Allow VPN to stay connected for some time before disconnecting it. 
* commit 'd2f56f07f97e72e62c51b82454d06de1e7b929a8':
  Allow VPN to stay connected for some time before disconnecting it.
 2014-04-05 00:51:44 +00:00
Xia Wang
d2f56f07f9 am ac768973: am ce11881a: Allow VPN to stay connected for some time before disconnecting it. 
* commit 'ac768973bc23b9f8f266013c20d301554729fd70':
  Allow VPN to stay connected for some time before disconnecting it.
 2014-04-05 00:48:38 +00:00
Xia Wang
ac768973bc am ce11881a: Allow VPN to stay connected for some time before disconnecting it. 
* commit 'ce11881accf5db04e2a54b58176e24de49ef6917':
  Allow VPN to stay connected for some time before disconnecting it.
 2014-04-05 00:43:17 +00:00
Xia Wang
ce11881acc Allow VPN to stay connected for some time before disconnecting it. 
Change-Id: I25994b8329514a32b5b6f383abef231d3decb4ec
 2014-04-04 17:23:47 -07:00
Fabrice Di Meglio
6068967fd9 Re-enable the switch into Location Settings 
- get rid of that onIsHidingHeaders()

Change-Id: If0b3fc6900f70cb6dfb54094d1b46b44aba6290f
 2014-04-04 17:02:46 -07:00
Fabrice Di Meglio
bb16fd836a Fix bug #13813608 Launcher back button does not take you to previous... 
... settings after orientation change

- gasp, there were some issues in the way we were tracking if
a search result fragment was opened. Simplified that code.

Change-Id: I7f8efb3a5aab1a275193f7de15ac50ca33bdad16
 2014-04-04 15:08:39 -07:00
Fabrice Di Meglio
0c19d9e9c8 Add more logging for onHeaderClick(...) 
- log Header title and position

Change-Id: I07f7e8c50613b97609a3ea462b7a8e8fcc415f70
 2014-04-04 14:50:14 -07:00
Fabrice Di Meglio
aa448bade6 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-04 14:50:06 -07:00
Fabrice Di Meglio
437a224ae3 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-04 14:50:00 -07:00
Fabrice Di Meglio
7f111811e0 Fix bug #13758772 Crash when hitting back after clicking on add a restricted... 
... profile under Users

- no need to show the dialog again when we have pressed on BACK

Change-Id: I76f155a488512689c5af40ff35b80ce034da4ffe
 2014-04-04 11:35:55 -07:00
Fabrice Di Meglio
45d3c5130f Merge "Add more logging for onHeaderClick(...)" 2014-04-04 17:18:22 +00:00
Fabrice Di Meglio
bbdada8fab Add more logging for onHeaderClick(...) 
- log Header title and position

Change-Id: I07f7e8c50613b97609a3ea462b7a8e8fcc415f70
 2014-04-04 10:16:59 -07:00
Baligh Uddin
cccd683f1f am 1c89073d: (-s ours) am 87132265: (-s ours) am 3f3469ae: (-s ours) am cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '1c89073daee81ef5d3b4df89d9bcdd0a9daf01b7':
  Import translations. DO NOT MERGE
 2014-04-04 15:00:02 +00:00
Baligh Uddin
1c89073dae am 87132265: (-s ours) am 3f3469ae: (-s ours) am cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '871322653c4109a9640b56374a246120c65f8241':
  Import translations. DO NOT MERGE
 2014-04-04 14:53:11 +00:00
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
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