Brian Carlstrom
d475ff3bd3
am f2e9be9a
: Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default"
...
* commit 'f2e9be9a4bb4c030c9bbcb29990e8b22bab809e4':
packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
2014-03-07 00:37:32 +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
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
Brian Carlstrom
f2e9be9a4b
Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default"
2014-01-30 21:50:53 +00:00
Brian Carlstrom
7a60db234a
packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
...
Bug: 12798969
Change-Id: I1937c2ff758214e1c9d369e475ae4efbba4f9dec
2014-01-30 13:17:08 -08: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
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
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
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
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