Amith Yamasani
e34608d460
am f7f6e4bf
: am 060d5fd1
: Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev
...
* commit 'f7f6e4bfc6e9dbfb8b2b22875e62a5bfa8e1a82a':
Adjust power control widget minWidth to occupy 4 cells.
2013-11-05 15:49:25 -08:00
Baligh Uddin
e202393f79
am 1bfd3541
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '1bfd35410db22b1f4aabe4ad3f471bedb088584d':
Import translations. DO NOT MERGE
2013-11-05 15:15:23 -08:00
Baligh Uddin
fee2daa120
Merge "Import translations. DO NOT MERGE"
2013-11-05 23:12:16 +00:00
Baligh Uddin
1bfd35410d
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-11-05 23:12:13 +00:00
Amith Yamasani
f7f6e4bfc6
am 060d5fd1
: Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev
...
* commit '060d5fd1727b087094e295481b2633deb33a6616':
Adjust power control widget minWidth to occupy 4 cells.
2013-11-05 13:54:00 -08:00
Amith Yamasani
060d5fd172
Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev
2013-11-05 21:51:43 +00:00
Elliott Hughes
78ab4a51e9
am c26cdd10
: am 98f5e186
: am c3a6cd6e
: Merge "Move a line into try block"
...
* commit 'c26cdd10cfc1e6d209f57247f8ba3fc24ca2f546':
Move a line into try block
2013-11-05 13:00:58 -08:00
Kenny Root
0ea0a07c84
am 8f40097e
: am 18964c90
: am 8cc60da4
: Merge "Accessibility: filter touches to Enable button" into klp-dev
...
* commit '8f40097e169232f9813ad3cf8e8e0a280106de16':
Accessibility: filter touches to Enable button
2013-11-05 12:02:08 -08:00
Jason Monk
070f3560d5
Add PAC UI to Wi-Fi Settings
...
Now when a PAC URL is set it shows it in settings rather than the proxy
spinner set to None. This should only be visible in EDU users as only EDU
has PAC.
Bug: 11528608
Change-Id: Ie4bad8ea935f0a8f1bb7877eb2be146e06d71c2d
2013-11-05 14:39:44 -05:00
Elliott Hughes
c26cdd10cf
am 98f5e186
: am c3a6cd6e
: Merge "Move a line into try block"
...
* commit '98f5e1861da4d708e7199b5d563895cf4d2c8db7':
Move a line into try block
2013-11-05 10:35:25 -08:00
Elliott Hughes
98f5e1861d
am c3a6cd6e
: Merge "Move a line into try block"
...
* commit 'c3a6cd6ee531c81f776551caa40b63732115e971':
Move a line into try block
2013-11-05 10:30:01 -08:00
Geoffrey Borggaard
03c56a95d3
Remove line break.
...
The "network may be monitored" message had an extra line break.
Bug: 11534572
Change-Id: I7a0e9845413f2e5787ca60ad9e2f8988eed207a6
2013-11-05 13:10:49 -05:00
Elliott Hughes
c3a6cd6ee5
Merge "Move a line into try block"
2013-11-05 16:48:47 +00:00
Kenny Root
8f40097e16
am 18964c90
: am 8cc60da4
: Merge "Accessibility: filter touches to Enable button" into klp-dev
...
* commit '18964c90638dd6d2cdaaaed3001aec40482f45b1':
Accessibility: filter touches to Enable button
2013-11-04 21:55:21 -08:00
Kenny Root
18964c9063
am 8cc60da4
: Merge "Accessibility: filter touches to Enable button" into klp-dev
...
* commit '8cc60da4c91c38f7f37561ff3bbb128dcb7456d8':
Accessibility: filter touches to Enable button
2013-11-04 16:16:08 -08:00
Kenny Root
8cc60da4c9
Merge "Accessibility: filter touches to Enable button" into klp-dev
2013-11-05 00:12:19 +00:00
Baligh Uddin
69da9c871c
Import translations. DO NOT MERGE
...
Change-Id: Ia3de82743ea76905ee20c14a963bb28b74a268c8
Auto-generated-cl: translation import
2013-11-04 15:28:13 -08:00
Baligh Uddin
734def9d81
Import translations. DO NOT MERGE
...
Change-Id: Ibae16129afb209250dddbfa8415fc2c780703a94
Auto-generated-cl: translation import
2013-11-04 15:23:56 -08:00
Lifu Tang
fe9420f7da
Shows LGAAYL when launching Location Settings
...
- Partial fix of b/10897468
Change-Id: Iec96909b87e71869c5a020ce848c6cf4fada3616
2013-11-04 11:37:55 -08:00
Amith Yamasani
49f9a444f3
Adjust power control widget minWidth to occupy 4 cells.
...
Bug: 10561000
Change-Id: I9a4312d956581059ea43077c5228e43e2bd1c7a5
2013-11-01 17:17:08 -07:00
Baligh Uddin
ccc010110a
am c160135e
: (-s ours) am 8fe316ca
: (-s ours) am e2b0278f
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'c160135e0363118877afe6a538c583a7b7a4a103':
Import translations. DO NOT MERGE
2013-11-01 07:52:07 -07:00
Baligh Uddin
c160135e03
am 8fe316ca
: (-s ours) am e2b0278f
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '8fe316cad47e2e0c73f1d7d2ec89be1eebacef09':
Import translations. DO NOT MERGE
2013-11-01 07:49:47 -07:00
Baligh Uddin
8fe316cad4
am e2b0278f
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'e2b0278fa3ce9f04fdaa3ce690b8e1581a0dbe13':
Import translations. DO NOT MERGE
2013-11-01 07:47:57 -07:00
Baligh Uddin
279a59b0c0
Merge "Import translations. DO NOT MERGE"
2013-11-01 14:46:30 +00:00
Baligh Uddin
e2b0278fa3
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-11-01 14:46:21 +00:00
Shuhrat Dehkanov
7e77699895
Move a line into try block
...
Currently, NumberFormatException is never handled as
Integer.parseInt() is called outside try block.
This moves that line inside try block.
Change-Id: I54544f5a665ca0f821de5351001755cb965078dc
Signed-off-by: Shuhrat Dehkanov <k@efir.uz >
2013-11-01 17:39:44 +09:00
Satoshi Kataoka
6c08377ce8
am 67b3039d
: am 2cab1344
: am aa4fa0ea
: Fix a bug on updating enabled IMEs
...
* commit '67b3039d37c0ca4b4314129bb151183fde614aed':
Fix a bug on updating enabled IMEs
2013-10-31 15:13:47 -07:00
Satoshi Kataoka
67b3039d37
am 2cab1344
: am aa4fa0ea
: Fix a bug on updating enabled IMEs
...
* commit '2cab1344037ada26710047138b59c2f8f0f4dfee':
Fix a bug on updating enabled IMEs
2013-10-31 15:10:17 -07:00
Satoshi Kataoka
2cab134403
am aa4fa0ea
: Fix a bug on updating enabled IMEs
...
* commit 'aa4fa0ea0950ecd61af64a6bdeea109cfed64362':
Fix a bug on updating enabled IMEs
2013-10-31 15:07:11 -07:00
Satoshi Kataoka
aa4fa0ea09
Fix a bug on updating enabled IMEs
...
Bug: 11354619
Change-Id: Ie33630b3dc150536bc0325ad6116ea5fdcf60740
2013-11-01 07:00:13 +09:00
Baligh Uddin
c0d9c7b324
Import translations. DO NOT MERGE
...
Change-Id: I273241a8e35b1d297916d59a7f0900a9ab20863a
Auto-generated-cl: translation import
2013-10-30 11:26:56 -07:00
Baligh Uddin
ac093063b0
Import translations. DO NOT MERGE
...
Change-Id: Ie376be991f9d022ac5b4f066c7946d44d4175c2e
Auto-generated-cl: translation import
2013-10-30 11:23:02 -07:00
Chris Wren
a32331de8b
am ed4c3aac
: am 455bf4d3
: am 1630ef4f
: remove lockscreen widget checkbox when there\'s no lockscreen.
...
* commit 'ed4c3aacfb020886d420299523059b37abd3f415':
remove lockscreen widget checkbox when there's no lockscreen.
2013-10-29 12:05:13 -07:00
Chris Wren
ed4c3aacfb
am 455bf4d3
: am 1630ef4f
: remove lockscreen widget checkbox when there\'s no lockscreen.
...
* commit '455bf4d3395e828dfbeca1f2ef5696e960874ad1':
remove lockscreen widget checkbox when there's no lockscreen.
2013-10-29 12:01:47 -07:00
Chris Wren
455bf4d339
am 1630ef4f
: remove lockscreen widget checkbox when there\'s no lockscreen.
...
* commit '1630ef4fc5f4131d7d7ef823ba5afba3b5b3fa72':
remove lockscreen widget checkbox when there's no lockscreen.
2013-10-29 11:59:53 -07:00
Chris Wren
1630ef4fc5
remove lockscreen widget checkbox when there's no lockscreen.
...
Bug: 11190345
Change-Id: I1b48e7a6a70226b103d8a6a27bd3374ff8349b3f
2013-10-29 13:42:05 -04:00
Baligh Uddin
1c144e2a6d
am 91d3ccff
: (-s ours) am 31735215
: (-s ours) am b9687f3b
: (-s ours) Import translations. DO NOT MERGE
...
* commit '91d3ccffeb48963b06864730fbca03755588d0fc':
Import translations. DO NOT MERGE
2013-10-28 20:51:41 -07:00
Baligh Uddin
91d3ccffeb
am 31735215
: (-s ours) am b9687f3b
: (-s ours) Import translations. DO NOT MERGE
...
* commit '317352151ba7e84be66a01f5c8c2585ea1aacb6f':
Import translations. DO NOT MERGE
2013-10-28 20:48:12 -07:00
Baligh Uddin
317352151b
am b9687f3b
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b9687f3b4ef392dbeddeeeb9de9e0b5e51f44a2f':
Import translations. DO NOT MERGE
2013-10-28 20:44:53 -07:00
Baligh Uddin
96c95b0d94
Import translations. DO NOT MERGE
...
Change-Id: Ic475e167a5d113bae5f55cadb821237be30e919c
Auto-generated-cl: translation import
2013-10-28 15:23:39 -07:00
Baligh Uddin
b9687f3b4e
Import translations. DO NOT MERGE
...
Change-Id: I9f5f19d06f849f0142b1667c74d3d2456ad6fe27
Auto-generated-cl: translation import
2013-10-28 15:19:24 -07:00
Baligh Uddin
17edb78217
Merge "Import translations. DO NOT MERGE"
2013-10-26 03:30:23 +00:00
Jeff Sharkey
457284e858
am 8cd39351
: am bd5cbb04
: am fd845410
: Merge "remove primary condition check on storage format." into klp-dev
...
* commit '8cd39351fe9d1164a06bb4420e2b95c5dd9259fb':
remove primary condition check on storage format.
2013-10-25 16:14:01 -07:00
Jeff Sharkey
8cd39351fe
am bd5cbb04
: am fd845410
: Merge "remove primary condition check on storage format." into klp-dev
...
* commit 'bd5cbb0400366faade3586e19f1deae2350c0ddd':
remove primary condition check on storage format.
2013-10-25 15:06:12 -07:00
Jeff Sharkey
bd5cbb0400
am fd845410
: Merge "remove primary condition check on storage format." into klp-dev
...
* commit 'fd845410aa3b5b572e2d72bd7d97fb5b112fa3fd':
remove primary condition check on storage format.
2013-10-25 15:02:50 -07:00
Jeff Sharkey
fd845410aa
Merge "remove primary condition check on storage format." into klp-dev
2013-10-25 22:00:07 +00:00
Pierre
93df01e3a7
remove primary condition check on storage format.
...
this change seemed to have been introduced originally
via commit d2a6f28fa7
as a workaround to fix interoperability problem with MTP,
then commit 8218d3ba18
seemed to have address this problem.
therefore it looks like removing the original restriction
is in order to allow formating of the sd-card when not
primary storage.
Bug: 11352632
Change-Id: I0419135a607dac08c44a3f30a7ccdcad17c46437
Signed-off-by: Pierre <pierre@broadcom.com >
2013-10-25 13:12:28 -07:00
Andrew Flynn
d1808bd6c8
Merge "Check for presence of carrier app in Mobile Plan."
2013-10-25 19:55:22 +00:00
Baligh Uddin
02b6a47df8
am c42d3174
: (-s ours) am 0728400a
: (-s ours) am 9271875c
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'c42d3174675ba909df526af3daec07bbc83c94df':
Import translations. DO NOT MERGE
2013-10-25 12:26:39 -07:00
Baligh Uddin
c42d317467
am 0728400a
: (-s ours) am 9271875c
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '0728400a7943303b26d0f60e52050dc1fb496c68':
Import translations. DO NOT MERGE
2013-10-25 12:25:00 -07:00