Commit Graph

12132 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
The Android Open Source Project
9cadf8b10d am b5685487: Merge commit \'f9ca318a3d2aceaf5c9e54610073a9017442be9b\' into HEAD
* commit 'b568548747c9b137d7da05fcdbb84f157273b3db':
2013-12-05 17:25:39 -08:00
The Android Open Source Project
b568548747 Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD 2013-12-05 12:38:23 -08:00
Lance Jin-woong Chang
e161f8733e am 1f5e6639: (-s ours) am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
* commit '1f5e66392e4fa01d2686a06044a8f0edfda6310f':
  Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
2013-12-04 17:40:17 -08:00
Lance Jin-woong Chang
1f5e66392e am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
* commit '5d65a47c395918d3f777d99747eb4f2e901566ee':
  Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
2013-12-04 17:29:27 -08:00
Lance Chang
6d0397864a am 0ea2229b: (-s ours) am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
* commit '0ea2229b4b39146ed41b99ca0542c73e5305d059':
  Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
2013-12-04 17:28:36 -08:00
Lance Jin-woong Chang
5d65a47c39 Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev 2013-12-05 01:27:46 +00:00
Lance Jin-woong Chang
0637c1f909 Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
This reverts commit 5796dad9a4.

Change-Id: Ib9de134bef6328dac6aa5a4b6033c584fb672ab5
2013-12-05 00:59:51 +00:00
Lance Chang
0ea2229b4b am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
* commit '071fbfd3f35c01fb1c4052614902dabe16af691f':
  Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
2013-12-04 16:49:45 -08:00
Lance Chang
071fbfd3f3 Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev 2013-12-05 00:47:16 +00:00
Geoff Mendal
bc3c36da78 am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE
* commit '65c2a2850526802c542ac5a1dee26eab41c33ec3':
  Import translations. DO NOT MERGE
2013-12-04 13:45:17 -08:00
Geoff Mendal
65c2a28505 am 3c29831e: (-s ours) Import translations. DO NOT MERGE
* commit '3c29831e87bb131246e88aeb2b18d1fc11627e5d':
  Import translations. DO NOT MERGE
2013-12-04 13:42:04 -08:00
Geoff Mendal
3c29831e87 Import translations. DO NOT MERGE
Change-Id: I4082ee8a0e0fe74e5328bd304f44cab57d4f40cb
Auto-generated-cl: translation import
2013-12-04 13:28:51 -08:00
Amith Yamasani
ff0fad2a06 am e10f8528: Merge "Fix switching running/cached apps with memory bar"
* commit 'e10f8528220fc4506ff6deee5c71ddab3da5e21d':
  Fix switching running/cached apps with memory bar
2013-12-04 13:05:17 -08:00
Amith Yamasani
95dd34b4e4 am f67aa398: Merge "Wrong referring to the resource - id/android:id"
* commit 'f67aa3985d36cace1fbea2537bcdc97f8b6d81ef':
  Wrong referring to the resource - id/android:id
2013-12-04 13:05:16 -08:00
Amith Yamasani
e10f852822 Merge "Fix switching running/cached apps with memory bar" 2013-12-04 19:17:33 +00:00
Amith Yamasani
f67aa3985d Merge "Wrong referring to the resource - id/android:id" 2013-12-04 19:05:29 +00:00
Amith Yamasani
ab747c87a9 am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
* commit '3d6ca11349f0ff2b53f4058731da9e904db2c938':
  Put fragment in specific activity's whitelist
2013-12-03 11:38:00 -08:00
Amith Yamasani
3d6ca11349 am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
* commit '72a7afb0935264586c821062279d39d8338b1e3d':
  Put fragment in specific activity's whitelist
2013-12-03 11:35:14 -08:00
Amith Yamasani
72a7afb093 Merge "Put fragment in specific activity's whitelist" into klp-dev 2013-12-03 19:33:21 +00:00
Lance Chang
5796dad9a4 Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change
Bug: 11923434
Change-Id: I34a353137338b0f8d55e2309f037c34922141181
2013-12-03 19:16:12 +09:00
Geoff Mendal
9d229638eb am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE
* commit 'd6ea675c11285c02a625d59a8d88270649da6a5f':
  Import translations. DO NOT MERGE
2013-12-02 12:48:22 -08:00
Geoff Mendal
d6ea675c11 am f8e1829c: (-s ours) Import translations. DO NOT MERGE
* commit 'f8e1829c99f1ad74131dad12e220b95a629cd9b5':
  Import translations. DO NOT MERGE
2013-12-02 12:45:29 -08:00