Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,119 Commits 1 Branch 0 Tags
8ce54bd640ddab13416d7a105df63bf29df2ae45
Commit Graph

12119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob Fletcher
8ce54bd640 am 04f36983: (-s ours) am 549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946 
* commit '04f3698345f804848ea7f03c6022dbdb0d8ac28d':
  DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
 2014-03-06 22:41:29 +00: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
Baligh Uddin
a9d878ef67 am af03def3: (-s ours) am 63a354ee: (-s ours) am d83484db: (-s ours) Import translations. DO NOT MERGE 
* commit 'af03def380ca594838ef6caff4f8c23dc78e821c':
  Import translations. DO NOT MERGE
 2014-02-20 21:02:54 +00:00
Baligh Uddin
af03def380 am 63a354ee: (-s ours) am d83484db: (-s ours) Import translations. DO NOT MERGE 
* commit '63a354ee094f3e71773cbdd29359b5c28df2b9f0':
  Import translations. DO NOT MERGE
 2014-02-20 20:59:28 +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
aea431f24b am f6971ee1: am 454df35e: 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 'f6971ee1d52a0e258fa60306b07cb8348d88baf8':
  Remove unused DebugIntentSender
 2014-02-05 20:43:52 +00:00
Amith Yamasani
f6971ee1d5 am 454df35e: 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 '454df35ee323ec9ca21b0c1ed982eba263df70e3':
  Remove unused DebugIntentSender
 2014-02-05 20:40:39 +00: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
Amith Yamasani
7c0ada6554 am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '3f72207985a5a636d14800d0b8094c28220a8e00':
  Remove unused DebugIntentSender
 2014-02-05 11:27:30 -08:00
Amith Yamasani
3f72207985 am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '1ba09366ccc174d71572ddbe0b80814982d2ae9b':
  Remove unused DebugIntentSender
 2014-02-05 11:22:46 -08:00
Amith Yamasani
1ba09366cc am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '0fce6123bddf505d1dab3d7a7daff05a0832c007':
  Remove unused DebugIntentSender
 2014-02-05 11:19:03 -08:00
Amith Yamasani
0fce6123bd am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
  Remove unused DebugIntentSender
 2014-02-05 11:15:01 -08:00
Amith Yamasani
7a2d8bd4b0 am 49d502a4: am c7843db0: Remove unused DebugIntentSender 
* commit '49d502a45d9b7536d38210590c99d8c99a43e4d9':
  Remove unused DebugIntentSender
 2014-02-05 11:09:40 -08:00
Amith Yamasani
49d502a45d am c7843db0: Remove unused DebugIntentSender 
* commit 'c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
  Remove unused DebugIntentSender
 2014-02-05 11:04:25 -08:00
Amith Yamasani
c7843db06c Remove unused DebugIntentSender 
Bug: 12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit 26430486e4)
 2014-02-04 23:48:05 +00:00
John Spurlock
af87ce0991 am 04119285: am cb8a5354: am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide" 
* commit '041192855ed8b025246578d80f0b372bf346a2f1':
  'When to daydream' dialog does not follow the JB dialog design guide
 2014-01-28 15:48:12 +00:00
John Spurlock
041192855e am cb8a5354: am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide" 
* commit 'cb8a53541ec142ee5d57f163496583518ddb5c6e':
  'When to daydream' dialog does not follow the JB dialog design guide
 2014-01-28 15:44:53 +00:00
John Spurlock
cb8a53541e am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide" 
* commit '3f0f02b94e5be6724659f860aef5e637ff61d3aa':
  'When to daydream' dialog does not follow the JB dialog design guide
 2014-01-28 15:40:45 +00:00
John Spurlock
3f0f02b94e Merge "'When to daydream' dialog does not follow the JB dialog design guide" 2014-01-28 14:03:41 +00:00
Per Allard
6251d707b1 'When to daydream' dialog does not follow the JB dialog design guide 
The dialog is a single selection popup and according to the
dialogs design guide the popup should close when the user
has make his/her choice, but in this case it does not.

Change-Id: Iac6bc19146a88236d3253d2d846212ce09b4925b
 2014-01-23 18:15:56 +09:00
Wei Wang
f4f8d9f346 BLE peripheral mode (4/4): Settings change for advertising preference. 
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
 2014-01-14 18:06:42 -08:00
Wei Wang
fc8d255671 Add ble settings strings. 
Change-Id: If8685aac2f36f56a534f3ba47b1cc60fed88a8a3
 2014-01-14 18:06:32 -08:00
Jeff Sharkey
ba646e3af1 am 0cd68e04: am 859909fe: am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor" 
* commit '0cd68e04a9f74aa5afc3e843db498568dd5fa173':
  Fix null pointer exceptions in NetworkPolicyEditor
 2014-01-10 23:14:20 +00:00
Jeff Sharkey
0cd68e04a9 am 859909fe: am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor" 
* commit '859909fee87d4dab6964977834a780acfd2310b2':
  Fix null pointer exceptions in NetworkPolicyEditor
 2014-01-10 23:11:35 +00:00
Jeff Sharkey
859909fee8 am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor" 
* commit 'b5377a7165a1f09c3cbd5c76f5a5745f6efc28e5':
  Fix null pointer exceptions in NetworkPolicyEditor
 2014-01-10 15:08:40 -08:00
Jeff Sharkey
b5377a7165 Merge "Fix null pointer exceptions in NetworkPolicyEditor" 2014-01-10 23:04:31 +00:00
Amith Yamasani
200b6c6323 am 3cfb6767: am e7d8485a: am 5be77489: Merge "Dont show "Erase SD Card" when there is none" 
* commit '3cfb676758b5ec44100a0a8cd47f1c4a7a615775':
  Dont show "Erase SD Card" when there is none
 2014-01-07 18:48:22 +00:00
Amith Yamasani
3cfb676758 am e7d8485a: am 5be77489: Merge "Dont show "Erase SD Card" when there is none" 
* commit 'e7d8485a23def2f0670ba2813f5589cbef562d4d':
  Dont show "Erase SD Card" when there is none
 2014-01-07 18:45:23 +00:00
Amith Yamasani
e7d8485a23 am 5be77489: Merge "Dont show "Erase SD Card" when there is none" 
* commit '5be77489e2f1f7b5c68763cf7660e844587d5e9e':
  Dont show "Erase SD Card" when there is none
 2014-01-07 10:42:15 -08:00
Amith Yamasani
5be77489e2 Merge "Dont show "Erase SD Card" when there is none" 2014-01-07 18:37:54 +00:00
Baligh Uddin
021be85f52 am 2659aeb1: (-s ours) am 094de604: (-s ours) am 3f426653: (-s ours) am 6b8a7116: (-s ours) Import translations. DO NOT MERGE 
* commit '2659aeb1fae6cb031647321df59ad9bbff86847e':
  Import translations. DO NOT MERGE
 2014-01-07 05:50:13 +00:00
Baligh Uddin
2659aeb1fa am 094de604: (-s ours) am 3f426653: (-s ours) am 6b8a7116: (-s ours) Import translations. DO NOT MERGE 
* commit '094de60467fc1cb2d2635a3a4aa82dff79d355fc':
  Import translations. DO NOT MERGE
 2014-01-07 05:46:12 +00:00
Baligh Uddin
094de60467 am 3f426653: (-s ours) am 6b8a7116: (-s ours) Import translations. DO NOT MERGE 
* commit '3f4266533121113a62e33fc4b3e1072f841f5d50':
  Import translations. DO NOT MERGE
 2014-01-06 21:07:02 -08:00
Baligh Uddin
3f42665331 am 6b8a7116: (-s ours) Import translations. DO NOT MERGE 
* commit '6b8a7116a2203b32cff432fd1602cc3e186b2608':
  Import translations. DO NOT MERGE
 2014-01-06 21:04:29 -08:00
Baligh Uddin
6b8a7116a2 Import translations. DO NOT MERGE 
Change-Id: I06e9ef8b9e6bdabcb6daf0ba0761a367bd798918
Auto-generated-cl: translation import
 2014-01-06 18:46:29 -08:00
Elliott Hughes
391af72514 am 8995a94d: am 97886741: am f85d9841: Merge "Fix elapsed time formatting." 
* commit '8995a94d4eb7d8de10ae0758751357f452a898c9':
  Fix elapsed time formatting.
 2014-01-03 21:42:53 +00:00
Elliott Hughes
8995a94d4e am 97886741: am f85d9841: Merge "Fix elapsed time formatting." 
* commit '97886741b916048cd5974d336c18f2b625dcb7fd':
  Fix elapsed time formatting.
 2014-01-03 21:39:20 +00:00
Elliott Hughes
97886741b9 am f85d9841: Merge "Fix elapsed time formatting." 
* commit 'f85d9841f8e198de656973a2102d3239e628390a':
  Fix elapsed time formatting.
 2014-01-03 13:36:27 -08:00
Elliott Hughes
f85d9841f8 Merge "Fix elapsed time formatting." 2014-01-03 21:28:13 +00:00
Elliott Hughes
f7cb4b0dda Fix elapsed time formatting. 
We should extend DateUtils to provide this kind of elapsed time
formatting via icu4c, but for now let's at least fix our
arithmetic.

Bug: https://code.google.com/p/android/issues/detail?id=61479
Change-Id: I6c087dbb9fdbff0a21d9243d239126fee180454c
 2014-01-03 12:14:13 -08:00
Baligh Uddin
348fb275a2 am d28125b7: (-s ours) am 9114be55: (-s ours) am c9d1e6f4: (-s ours) am 0ae418b2: (-s ours) Import translations. DO NOT MERGE 
* commit 'd28125b742479ce571b7dd32b2c90169200b5479':
  Import translations. DO NOT MERGE
 2013-12-31 00:46:25 +00:00
Baligh Uddin
d28125b742 am 9114be55: (-s ours) am c9d1e6f4: (-s ours) am 0ae418b2: (-s ours) Import translations. DO NOT MERGE 
* commit '9114be558880d42af1e8095bd7734c7256490aba':
  Import translations. DO NOT MERGE
 2013-12-31 00:44:18 +00:00
Baligh Uddin
9114be5588 am c9d1e6f4: (-s ours) am 0ae418b2: (-s ours) Import translations. DO NOT MERGE 
* commit 'c9d1e6f49cf5be83fad9002942c47499c7fcbc35':
  Import translations. DO NOT MERGE
 2013-12-30 16:42:54 -08:00
Baligh Uddin
c9d1e6f49c am 0ae418b2: (-s ours) Import translations. DO NOT MERGE 
* commit '0ae418b207f37bbc9ed4b0be267054f8244dc70a':
  Import translations. DO NOT MERGE
 2013-12-30 16:41:18 -08:00