Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,762 Commits 1 Branch 0 Tags
0b55caf01af1efa15ff0bfbf50a1726fce788660
Commit Graph

11762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
112916b596 Import translations. DO NOT MERGE 
Change-Id: I0208bc3b072d49bb77ea2f07e365b1982bb5e324
Auto-generated-cl: translation import
 2014-03-31 14:40:25 -07:00
Baligh Uddin
f39672bfac am 3a9b49f9: (-s ours) Import translations. DO NOT MERGE 
* commit '3a9b49f975df7c53e86dd795e21f904442c22a4a':
  Import translations. DO NOT MERGE
 2014-03-27 22:22:03 +00:00
Baligh Uddin
3a9b49f975 Import translations. DO NOT MERGE 
Change-Id: I81d83e8408295dcc6e24b92459170e9d81d2ec0f
Auto-generated-cl: translation import
 2014-03-26 14:08:55 -07:00
Baligh Uddin
b86dff8480 am da4a6a53: (-s ours) Import translations. DO NOT MERGE 
* commit 'da4a6a53d48d3ba0ae0a7d6ea3cdfe2a26deb38a':
  Import translations. DO NOT MERGE
 2014-03-25 16:54:48 +00:00
Baligh Uddin
da4a6a53d4 Import translations. DO NOT MERGE 
Change-Id: Ifc3cdc5dd618ef6c452303597b5abc791e0bf5af
Auto-generated-cl: translation import
 2014-03-24 12:59:14 -07:00
Baligh Uddin
2e71c1df7c am 947e8995: (-s ours) Import translations. DO NOT MERGE 
* commit '947e8995856a66d05bfb614edf00dd5edfecc4ba':
  Import translations. DO NOT MERGE
 2014-03-20 18:41:54 +00:00
Baligh Uddin
947e899585 Import translations. DO NOT MERGE 
Change-Id: I4fe915d0452b637fc646265dca39732877a12444
Auto-generated-cl: translation import
 2014-03-19 13:10:41 -07:00
Geoff Mendal
c8131cb90e am e8de72e5: (-s ours) Import translations. DO NOT MERGE 
* commit 'e8de72e53ae22a9e373b8c65c8f57c14bf4a81eb':
  Import translations. DO NOT MERGE
 2014-03-17 20:34:20 +00:00
Geoff Mendal
e8de72e53a Import translations. DO NOT MERGE 
Change-Id: I85a8b58b4ced6be66f751e4315f5b039e0378355
Auto-generated-cl: translation import
 2014-03-17 12:42:54 -07:00
David Braun
63ac6a06ef am edcb923d: Add string parameter order to default SMS dialog text 
* commit 'edcb923df6f9e690fd16b0e643c6ba3da5e9264c':
  Add string parameter order to default SMS dialog text
 2014-03-13 18:30:11 +00:00
David Braun
edcb923df6 Add string parameter order to default SMS dialog text 
Bug: 13433191 cs - Android - Other: Swapped placeholders in Hangouts confirmation message, reverse m
Change-Id: I8d00c58e5000b3851304d48c4681f9ebe2eebec8
 2014-03-13 11:20:48 -07:00
Baligh Uddin
255034803c am 7c35c10e: (-s ours) Import translations. DO NOT MERGE 
* commit '7c35c10ebcf53a25d2c9c5cf37c25b1d5b553d1c':
  Import translations. DO NOT MERGE
 2014-03-13 16:40:31 +00:00
Baligh Uddin
7c35c10ebc Import translations. DO NOT MERGE 
Change-Id: Ide5d8c50abddb80d6e820777804ed8f0a2a93327
Auto-generated-cl: translation import
 2014-03-12 12:02:29 -07:00
Baligh Uddin
846f036ef1 am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '14b82fd73f59f51dffee9562057ab747f12134d3':
  Import translations. DO NOT MERGE
 2014-03-11 17:41:25 +00:00
Baligh Uddin
14b82fd73f Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-11 17:37:53 +00:00
Alan Viverette
0100a310d8 am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev 
* commit '8840aa4c406bf08bba186cf9e674033bd1b9a4c1':
  DO NOT MERGE Add preference for caption text opacity
 2014-03-11 02:15:28 +00:00
Alan Viverette
a74da813ec am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev 
* commit 'd43d5becb359cfdd5e30f691724739ab216011f0':
  DO NOT MERGE Remove extra fragment in captioning preferences
 2014-03-11 02:15:27 +00:00
Alan Viverette
8840aa4c40 Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev 2014-03-11 02:11:52 +00:00
Alan Viverette
d43d5becb3 Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev 2014-03-11 02:11:41 +00:00
Baligh Uddin
f1b94b2f67 Import translations. DO NOT MERGE 
Change-Id: I7cdee6a82eff27c06e0b0039a695d28de2339011
Auto-generated-cl: translation import
 2014-03-10 15:28:38 -07:00
Wei Wang
a8e634ca53 am 104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev 
* commit '104eea0b97c63b97040dc26ddf3635257e1b19a2':
  DO NOT MERGE Change bluetooth off display message.
 2014-03-08 02:02:19 +00:00
Wei Wang
104eea0b97 Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev 2014-03-08 02:00:37 +00:00
Alan Viverette
00f221dc9e DO NOT MERGE Add preference for caption text opacity 
BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
 2014-03-07 14:06:29 -08:00
Alan Viverette
af28facb6f DO NOT MERGE Remove extra fragment in captioning preferences 
BUG: 11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
 2014-03-07 14:06:07 -08:00
Rob Fletcher
04f3698345 am 549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946 
* commit '549a39b49510dad27da588714f848dc891913239':
  DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
 2014-03-06 21:59:31 +00:00
Rob Fletcher
549a39b495 DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946 
During bluetooth pairing, HTML injection is possible via the device name displayed to the user. This escapes the device name, before creating HTML from it, so it will preserve things like < and > but will not affect rendering of HTML

Bug: 12976386
Change-Id: I8a02d3be8c1a779dc9ed1c9ef8083a1159ab3f2b
 2014-03-06 11:51:15 -08:00
Wei Wang
1a188f4075 DO NOT MERGE Change bluetooth off display message. 
Cherry picking ble advertising changes from master to KLP MR2.
b/13137996

Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8
 2014-03-06 18:45:35 +00:00
Baligh Uddin
63a354ee09 am d83484db: (-s ours) Import translations. DO NOT MERGE 
* commit 'd83484dba0749e01cf80a85cd0d2648a79f9fdf4':
  Import translations. DO NOT MERGE
 2014-02-20 20:56:19 +00:00
Baligh Uddin
d83484dba0 Import translations. DO NOT MERGE 
Change-Id: I96d7cdea504fe320dc1768f1e0dbae23d5901fbd
Auto-generated-cl: translation import
 2014-02-20 07:23:08 -08:00
Amith Yamasani
454df35ee3 am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '3c4603ef1c19510bd4a58aee19935e084603c69b':
  Remove unused DebugIntentSender
 2014-02-05 20:37:21 +00:00
Amith Yamasani
3c4603ef1c am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '8f9482170835059c11cffa9c554191306db49fbd':
  Remove unused DebugIntentSender
 2014-02-05 20:35:24 +00:00
Amith Yamasani
8f94821708 am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit 'c68a6bde44203cae70c50f6194cce22c9be5c48e':
  Remove unused DebugIntentSender
 2014-02-05 12:33:48 -08:00
Amith Yamasani
c68a6bde44 am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '0ad774458a627cc4608c717a7efdadf2404d973c':
  Remove unused DebugIntentSender
 2014-02-05 12:30:42 -08:00
Amith Yamasani
0ad774458a am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '7c0ada65542f2c9b3899337b085aace13fcc7142':
  Remove unused DebugIntentSender
 2014-02-05 11:52:23 -08:00