Commit Graph

12888 Commits

Author SHA1 Message Date
Baligh Uddin
6b8a7116a2 Import translations. DO NOT MERGE
Change-Id: I06e9ef8b9e6bdabcb6daf0ba0761a367bd798918
Auto-generated-cl: translation import
2014-01-06 18:46:29 -08:00
John Spurlock
3e9110fe6a Merge "Remove rotation-lock from Display settings." 2014-01-06 19:22:15 +00:00
Elliott Hughes
d954e2cc1c am 391af725: am 8995a94d: am 97886741: am f85d9841: Merge "Fix elapsed time formatting."
* commit '391af72514dfca243249fb873b639401bcf0c129':
  Fix elapsed time formatting.
2014-01-03 21:45:43 +00: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
bf795e7ed5 Import translations. DO NOT MERGE
Change-Id: Iac0ca68f26633df3b392e7c2559767485b1571d6
Auto-generated-cl: translation import
2014-01-02 09:50:54 -08:00
Baligh Uddin
034e0e73ad am 348fb275: (-s ours) am d28125b7: (-s ours) am 9114be55: (-s ours) am c9d1e6f4: (-s ours) am 0ae418b2: (-s ours) Import translations. DO NOT MERGE
* commit '348fb275a25f473658b83bf997e5207975fe0ecb':
  Import translations. DO NOT MERGE
2013-12-31 00:48:34 +00: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
Baligh Uddin
6006d2c2da Import translations. DO NOT MERGE
Change-Id: I0f3e103c568ec7c7ddee3695e73a7a9f47465730
Auto-generated-cl: translation import
2013-12-30 15:13:19 -08:00
Baligh Uddin
0ae418b207 Import translations. DO NOT MERGE
Change-Id: I36c9a623cd5f1eb08fae29edf50d82e9a8cd5846
Auto-generated-cl: translation import
2013-12-30 15:09:59 -08:00
Andres Morales
13c42cfefc Reduce timeout of dismissing pairing dialog on success
Change-Id: If4b74559cd6f628164b8b114c8c8b509dcb6b884
2013-12-30 12:56:55 -08:00
Selim Gurun
f64facc2f9 Display certificate chain
Bug: 5012010
Change-Id: Id1b4753b28ab3460662ea41feea277777e655780
2013-12-27 18:17:24 -08:00
Baligh Uddin
85d0f81a89 am be790f34: (-s ours) am 6c6d0738: (-s ours) am 95fbce75: (-s ours) am d0c1b8cb: (-s ours) am 0f952752: (-s ours) Import translations. DO NOT MERGE
* commit 'be790f347a982d6165e186e87cfa051e95e36926':
  Import translations. DO NOT MERGE
2013-12-27 04:06:51 +00:00
Baligh Uddin
be790f347a am 6c6d0738: (-s ours) am 95fbce75: (-s ours) am d0c1b8cb: (-s ours) am 0f952752: (-s ours) Import translations. DO NOT MERGE
* commit '6c6d073847c1c26861671e042a1916b3efcdf5d9':
  Import translations. DO NOT MERGE
2013-12-27 04:04:22 +00:00
Baligh Uddin
6c6d073847 am 95fbce75: (-s ours) am d0c1b8cb: (-s ours) am 0f952752: (-s ours) Import translations. DO NOT MERGE
* commit '95fbce75a7a3c4937c08b610965cc7d7e1aea403':
  Import translations. DO NOT MERGE
2013-12-27 04:01:11 +00:00
Baligh Uddin
95fbce75a7 am d0c1b8cb: (-s ours) am 0f952752: (-s ours) Import translations. DO NOT MERGE
* commit 'd0c1b8cbee025b009261a5e9e3ae37e9cbb891ef':
  Import translations. DO NOT MERGE
2013-12-26 19:57:05 -08:00
Baligh Uddin
d0c1b8cbee am 0f952752: (-s ours) Import translations. DO NOT MERGE
* commit '0f952752e387cd4035193015ff3fa793164c980c':
  Import translations. DO NOT MERGE
2013-12-26 19:51:27 -08:00
Baligh Uddin
63974a92c8 Import translations. DO NOT MERGE
Change-Id: I295b494750d386344faed16eb3f281dfac28bea2
Auto-generated-cl: translation import
2013-12-26 16:30:07 -08:00
Baligh Uddin
0f952752e3 Import translations. DO NOT MERGE
Change-Id: I4f4f30cdf374729ad15bd018d7ae6d926f8d6f1d
Auto-generated-cl: translation import
2013-12-26 16:26:39 -08:00
Alan Viverette
dd6513d969 Merge "Additional captioning fonts" 2013-12-20 00:41:02 +00:00
Alan Viverette
7f9781b559 Merge "Additional caption settings for edge styles and window color" 2013-12-20 00:40:53 +00:00
Dianne Hackborn
09a3c1f949 Merge "Update to follow BatteryStats." 2013-12-19 22:51:47 +00:00
John Spurlock
26c3b25ac3 Remove rotation-lock from Display settings.
Ability to lock device to natural orientation is still available
under Accessibility.

Bug:11062710
Change-Id: I2045e16cfc676ee75d4d42b0cd652433b2f12715
2013-12-19 16:57:50 -05:00
Zhihai Xu
23d886f698 Merge "BLuetooth Discoverable timer not correctly cleared" 2013-12-19 21:49:50 +00:00
Kim Schulz
54313d7d66 BLuetooth Discoverable timer not correctly cleared
Changing the discoverable timer from 2min to infinity before the 2min timer
has passed will not clear the 2min timer.
This fix handles this case.

Bug: 12220031
Change-Id: I8794eda353c74e46b09e15ee9a7a491658e7b5cd
2013-12-19 13:45:11 -08:00
Dianne Hackborn
fb03058dc9 Update to follow BatteryStats.
Change data use to be based on packets instead of bytes.

Change-Id: I536dd2c2fc3fbeb12689e793f79e5fac984fe3af
2013-12-19 13:10:25 -08:00
Alan Viverette
d07c16107d Additional caption settings for edge styles and window color
Change-Id: Ib967bc566a7b8f7674c696fc05d799e12269ec42
2013-12-19 11:31:36 -08:00
Alan Viverette
65a6ef6f34 Additional captioning fonts
Change-Id: Ib3298f65b602d581fa031576c3b9026bfd6a8672
2013-12-19 11:30:48 -08:00
Baligh Uddin
3f538cc3f8 am 0c70ceef: (-s ours) am 5f4deba1: (-s ours) am fb793cb9: (-s ours) am 8c810a4e: (-s ours) am 7ba72721: (-s ours) Import translations. DO NOT MERGE
* commit '0c70ceef84fd53887facc655a9c7088267e2935b':
  Import translations. DO NOT MERGE
2013-12-19 15:36:18 +00:00
Baligh Uddin
0c70ceef84 am 5f4deba1: (-s ours) am fb793cb9: (-s ours) am 8c810a4e: (-s ours) am 7ba72721: (-s ours) Import translations. DO NOT MERGE
* commit '5f4deba185e4ab2b3c121822add6cf0ec8ec5612':
  Import translations. DO NOT MERGE
2013-12-19 15:34:33 +00:00
Baligh Uddin
5f4deba185 am fb793cb9: (-s ours) am 8c810a4e: (-s ours) am 7ba72721: (-s ours) Import translations. DO NOT MERGE
* commit 'fb793cb94e762c8c50072c529bba093777d3fa9f':
  Import translations. DO NOT MERGE
2013-12-19 15:32:59 +00:00
Baligh Uddin
fb793cb94e am 8c810a4e: (-s ours) am 7ba72721: (-s ours) Import translations. DO NOT MERGE
* commit '8c810a4e5dd0435f621e4f3f691bfc567d948ee0':
  Import translations. DO NOT MERGE
2013-12-19 07:30:01 -08:00
Baligh Uddin
8c810a4e5d am 7ba72721: (-s ours) Import translations. DO NOT MERGE
* commit '7ba72721134adeda10972f68fbcf74a491c6b11e':
  Import translations. DO NOT MERGE
2013-12-19 07:28:03 -08:00
Johan Redestig
5517ad92dd Dont show "Erase SD Card" when there is none
On devices with physcal, external SD Cards, the "Erase SD card"
option in in Settings/Storage is available even when there is
no SD card present, this dont make much sense since you cannot
erase a card that is absent. With this change the erase option
is bound to the mount toggle which leads to the following
consequences:

 Card present and mounted -> Erase enabled
 Card present but unmounted -> Erase enabled
 No card present -> Erase disabled
 Card present and MTP attached -> Erase disabled

Change-Id: I756ae8af3e0565febaf940df5f4991dd89105bd9
2013-12-19 10:47:17 +01:00
Baligh Uddin
f2398abe54 Import translations. DO NOT MERGE
Change-Id: Ie72bd5a59406450877a580e2c60c0c81f48ef603
Auto-generated-cl: translation import
2013-12-18 22:15:35 -08:00
Baligh Uddin
7ba7272113 Import translations. DO NOT MERGE
Change-Id: Ib169fe13c8487481f13d4a17b9f09bd04883f93e
Auto-generated-cl: translation import
2013-12-18 22:12:01 -08:00
Behrooz Aliabadi
524dee0fb5 Fix null pointer exceptions in NetworkPolicyEditor
This upload fixes a null pointer exception issue.
After this fix the modified methods return
their corresponding default values instead of null.

Change-Id: Idb94f8b808b8dd18be5e3fc92cc5560ce0f81c4f
2013-12-18 09:55:45 +00:00
Baligh Uddin
1bb8618339 am 665d1db2: (-s ours) am d48a1386: (-s ours) am 379bb6ef: (-s ours) am ee9a2cbc: (-s ours) am 1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit '665d1db296cf2cc9fb527ebe9a376ac2428ebb13':
  Import translations. DO NOT MERGE
2013-12-17 17:41:44 +00:00
Baligh Uddin
665d1db296 am d48a1386: (-s ours) am 379bb6ef: (-s ours) am ee9a2cbc: (-s ours) am 1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit 'd48a138605e735175b519cb998e478a7aad0c60f':
  Import translations. DO NOT MERGE
2013-12-17 17:40:19 +00:00
Baligh Uddin
d48a138605 am 379bb6ef: (-s ours) am ee9a2cbc: (-s ours) am 1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit '379bb6ef5a1140497c7cf3510faea1c705fe4583':
  Import translations. DO NOT MERGE
2013-12-17 17:38:44 +00:00
Baligh Uddin
379bb6ef5a am ee9a2cbc: (-s ours) am 1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit 'ee9a2cbcf3a12f65ddbc05507bf51ad161feee05':
  Import translations. DO NOT MERGE
2013-12-17 09:35:44 -08:00
Baligh Uddin
ee9a2cbcf3 am 1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit '1177cdec4eeeacc787059a7843ade6571f54ac5f':
  Import translations. DO NOT MERGE
2013-12-17 09:33:32 -08:00
Baligh Uddin
ecee72d15e Merge "Import translations. DO NOT MERGE" 2013-12-17 17:31:04 +00:00
Alan Viverette
17bf9338f6 Merge "Update A11y service dialog for explicit create() before getButton()" 2013-12-17 01:20:41 +00:00