Kenny Root
d0de39e716
Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
2013-11-06 23:09:06 +00:00
Baligh Uddin
be4399b2f7
Import translations. DO NOT MERGE
...
Change-Id: I802dcdf95e177ce98ade2553310f26fa04c843d3
Auto-generated-cl: translation import
2013-11-06 14:39:01 -08:00
Baligh Uddin
4a5e53aa02
Import translations. DO NOT MERGE
...
Change-Id: I81129ec9d537a26df337e5f306b8897ce9fdc810
Auto-generated-cl: translation import
2013-11-06 14:34:35 -08:00
Kenny Root
b974fa8034
Revert "Accessibility: filter touches to Enable button"
...
This reverts commit 94d4f23dcc
.
Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
2013-11-06 22:03:52 +00:00
Lifu Tang
9ec08d65c5
am 227043b5
: am 5b68e4c8
: am 741bc054
: Merge "Shows LGAAYL when launching Location Settings" into klp-dev
...
* commit '227043b55722b38cde8508011e2b1748e5ef66bc':
Shows LGAAYL when launching Location Settings
2013-11-06 08:51:56 -08:00
Lifu Tang
227043b557
am 5b68e4c8
: am 741bc054
: Merge "Shows LGAAYL when launching Location Settings" into klp-dev
...
* commit '5b68e4c8d09d9c0cc864e32970c9af925dd0d643':
Shows LGAAYL when launching Location Settings
2013-11-05 22:26:19 -08:00
Lifu Tang
5b68e4c8d0
am 741bc054
: Merge "Shows LGAAYL when launching Location Settings" into klp-dev
...
* commit '741bc054243576dcfff17bf3a807dc8732bca332':
Shows LGAAYL when launching Location Settings
2013-11-05 22:23:01 -08:00
Lifu Tang
741bc05424
Merge "Shows LGAAYL when launching Location Settings" into klp-dev
2013-11-06 06:20:56 +00:00
Geoffrey Borggaard
f2f1ad9cdd
am 12a2c408
: am 36ddea8c
: am 5b7111d0
: Merge "Remove line break." into klp-dev
...
* commit '12a2c40871e2c9d965b0e9e1dbde5e00709f7b0a':
Remove line break.
2013-11-05 18:59:12 -08:00
Jason Monk
492c8ef15e
am 58f53f9c
: am c85359ef
: am 4e42c808
: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
...
* commit '58f53f9c351329bf51bb548409c047e024d94fc4':
Add PAC UI to Wi-Fi Settings
2013-11-05 18:59:11 -08:00
Geoffrey Borggaard
12a2c40871
am 36ddea8c
: am 5b7111d0
: Merge "Remove line break." into klp-dev
...
* commit '36ddea8c212b21dc24e270ce7d20023db1477a32':
Remove line break.
2013-11-05 18:56:59 -08:00
Jason Monk
58f53f9c35
am c85359ef
: am 4e42c808
: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
...
* commit 'c85359ef11221c09e7a5d55692ffda0f98b8e00c':
Add PAC UI to Wi-Fi Settings
2013-11-05 18:56:49 -08:00
Geoffrey Borggaard
36ddea8c21
am 5b7111d0
: Merge "Remove line break." into klp-dev
...
* commit '5b7111d05db50d479290517b1b459dbcfc178a7f':
Remove line break.
2013-11-05 18:39:31 -08:00
Geoffrey Borggaard
5b7111d05d
Merge "Remove line break." into klp-dev
2013-11-06 02:37:48 +00:00
Jason Monk
c85359ef11
am 4e42c808
: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
...
* commit '4e42c80872e3543247913afd270fe5b9950b2969':
Add PAC UI to Wi-Fi Settings
2013-11-05 18:22:58 -08:00
Jason Monk
4e42c80872
Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
2013-11-06 02:20:50 +00:00
Baligh Uddin
9d3817f7c9
am 9dddb8f5
: (-s ours) am e202393f
: (-s ours) am 1bfd3541
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '9dddb8f58951adf9a1b6102b93e15349f69ed4c8':
Import translations. DO NOT MERGE
2013-11-05 15:53:30 -08:00
Amith Yamasani
6882329f96
am e34608d4
: am f7f6e4bf
: am 060d5fd1
: Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev
...
* commit 'e34608d4603dfe18b189fae8806f8d22aa9ae84b':
Adjust power control widget minWidth to occupy 4 cells.
2013-11-05 15:53:29 -08:00
Baligh Uddin
9dddb8f589
am e202393f
: (-s ours) am 1bfd3541
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'e202393f797540ebd2c472dd63b63557e9fcbab9':
Import translations. DO NOT MERGE
2013-11-05 15:49:37 -08:00
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