Commit Graph

12188 Commits

Author SHA1 Message Date
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
Baligh Uddin
0ae418b207 Import translations. DO NOT MERGE
Change-Id: I36c9a623cd5f1eb08fae29edf50d82e9a8cd5846
Auto-generated-cl: translation import
2013-12-30 15:09:59 -08: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
0f952752e3 Import translations. DO NOT MERGE
Change-Id: I4f4f30cdf374729ad15bd018d7ae6d926f8d6f1d
Auto-generated-cl: translation import
2013-12-26 16:26:39 -08: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
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
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
1177cdec4e Import translations. DO NOT MERGE
Change-Id: I41e0c190e9f01cfccff03435cebbf732b603751f
Auto-generated-cl: translation import
2013-12-16 12:44:01 -08:00
Kenny Root
3bf6ac0c0e am ead1bcd9: am ef2f97c7: am e14a5ef6: Merge "Use java.util.Objects instead of internal API"
* commit 'ead1bcd9a23a811b25a73e663c556c590e649d82':
  Use java.util.Objects instead of internal API
2013-12-13 22:04:16 +00:00
Kenny Root
ead1bcd9a2 am ef2f97c7: am e14a5ef6: Merge "Use java.util.Objects instead of internal API"
* commit 'ef2f97c70e5942f390daf8e227eafa44ea675f09':
  Use java.util.Objects instead of internal API
2013-12-13 22:01:13 +00:00
Kenny Root
ef2f97c70e am e14a5ef6: Merge "Use java.util.Objects instead of internal API"
* commit 'e14a5ef660ebc65cad53c1e108c99d9fd98a4696':
  Use java.util.Objects instead of internal API
2013-12-13 13:58:59 -08:00
Kenny Root
e14a5ef660 Merge "Use java.util.Objects instead of internal API" 2013-12-13 21:51:30 +00:00
Kenny Root
7440dde808 Use java.util.Objects instead of internal API
Change-Id: Ib0d797b3e7f2e4f831f52832776b64c0973880b3
2013-12-13 13:28:33 -08:00
Baligh Uddin
061662cb17 am 02dd4a20: (-s ours) am f4f14efc: (-s ours) am 5fcebc78: (-s ours) am 879cc42f: (-s ours) Import translations. DO NOT MERGE
* commit '02dd4a20e9a2ad1733e8cd52729f4c5683220f56':
  Import translations. DO NOT MERGE
2013-12-12 16:51:25 +00:00
Baligh Uddin
02dd4a20e9 am f4f14efc: (-s ours) am 5fcebc78: (-s ours) am 879cc42f: (-s ours) Import translations. DO NOT MERGE
* commit 'f4f14efc79b82b7f99d311ae59ec394d60ae81c1':
  Import translations. DO NOT MERGE
2013-12-12 16:44:02 +00:00
Baligh Uddin
f4f14efc79 am 5fcebc78: (-s ours) am 879cc42f: (-s ours) Import translations. DO NOT MERGE
* commit '5fcebc78b9f6a05ac661dba25acbd354981e9168':
  Import translations. DO NOT MERGE
2013-12-12 08:40:48 -08:00
Baligh Uddin
5fcebc78b9 am 879cc42f: (-s ours) Import translations. DO NOT MERGE
* commit '879cc42fb33f717f985e4627355c7735c78f16b3':
  Import translations. DO NOT MERGE
2013-12-12 07:46:25 -08:00
Baligh Uddin
879cc42fb3 Import translations. DO NOT MERGE
Change-Id: I653a48c8fe5951d7987fc807befc343913ae11f3
Auto-generated-cl: translation import
2013-12-11 20:01:51 -08:00
Qiwen Zhao
76aa20fa31 DO NOT MERGE reset to goog/klp-volantis-dev 2013-12-09 14:21:29 -08:00
Baligh Uddin
ebadadc8a4 am b69795b6: (-s ours) am c5e08935: (-s ours) am 233d666a: (-s ours) Import translations. DO NOT MERGE
* commit 'b69795b6f6a7a33fe20c2e6b06ef4be454ccdf98':
  Import translations. DO NOT MERGE
2013-12-09 20:17:15 +00:00
Baligh Uddin
b69795b6f6 am c5e08935: (-s ours) am 233d666a: (-s ours) Import translations. DO NOT MERGE
* commit 'c5e0893521593aaa7dc7089eeaf4f14eac07dad7':
  Import translations. DO NOT MERGE
2013-12-09 12:13:46 -08:00
Baligh Uddin
c5e0893521 am 233d666a: (-s ours) Import translations. DO NOT MERGE
* commit '233d666aee25e8a869fa923e1578ca4ff0a202e2':
  Import translations. DO NOT MERGE
2013-12-09 12:10:52 -08:00
Baligh Uddin
233d666aee Import translations. DO NOT MERGE
Change-Id: I6e55230f7b85d2e90578617e879802d6d40eb6d2
Auto-generated-cl: translation import
2013-12-09 11:47:45 -08:00