Ed Heyl
f841589f6a
am 7ebe4c6c: am a27816dc: merge in release branch changes (no-op).
...
* commit '7ebe4c6c209e983e648e2529d68ebe2c36bf7733':
Revert "Accessibility: filter touches to Enable button"
2013-11-08 13:59:55 -08:00
Ed Heyl
7ebe4c6c20
am a27816dc: merge in release branch changes (no-op).
...
* commit 'a27816dc2d72f5757ee5377ccd03798736c96fd8':
Revert "Accessibility: filter touches to Enable button"
2013-11-08 13:31:32 -08:00
Ed Heyl
a27816dc2d
merge in release branch changes (no-op).
2013-11-08 13:23:52 -08:00
Robert Greenwalt
3bdc1eb38a
am 6c20565d: am 384bf727: am 29b7a844: Merge "Add batch scan data to power stats." into klp-dev
...
* commit '6c20565d97339751f22123a4b40893f2df7ea3ad':
Add batch scan data to power stats.
2013-11-07 15:12:58 -08:00
David Christie
587e6bf3fc
Update power widget icons and fix location behavior
...
Bug: 11242129
Change-Id: I29f5b4cf914ece4b0991229f384012eb66ba3820
2013-11-07 11:20:35 -08:00
Robert Greenwalt
6c20565d97
am 384bf727: am 29b7a844: Merge "Add batch scan data to power stats." into klp-dev
...
* commit '384bf72708b623bf48a0395a51db94bda055f496':
Add batch scan data to power stats.
2013-11-07 10:43:11 -08:00
Robert Greenwalt
384bf72708
am 29b7a844: Merge "Add batch scan data to power stats." into klp-dev
...
* commit '29b7a8446a36286bd4311ec2f52281fd1628a86e':
Add batch scan data to power stats.
2013-11-07 10:32:55 -08:00
Robert Greenwalt
29b7a8446a
Merge "Add batch scan data to power stats." into klp-dev
2013-11-07 18:31:03 +00:00
The Android Automerger
84760b633b
merge in klp-mr1-release history after reset to klp-dev
2013-11-07 06:01:28 -08:00
Baligh Uddin
91858723ae
am 233692b0: (-s ours) am f9be657a: (-s ours) am 7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '233692b051050faf37931ac8013839de7785f0f2':
Import translations. DO NOT MERGE
2013-11-06 20:09:47 -08:00
Baligh Uddin
233692b051
am f9be657a: (-s ours) am 7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'f9be657ac28f2530938c24b09458defdbca07c4c':
Import translations. DO NOT MERGE
2013-11-06 20:06:01 -08:00
Baligh Uddin
f9be657ac2
am 7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '7d7164361e3e9cf9198fca4050fca81547053b04':
Import translations. DO NOT MERGE
2013-11-06 20:03:44 -08:00
Baligh Uddin
930f873016
Merge "Import translations. DO NOT MERGE"
2013-11-07 04:00:08 +00:00
Baligh Uddin
7d7164361e
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-11-07 04:00:05 +00:00
Kenny Root
856c998aab
am d0e1c273: am 279c1e15: am d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
...
* commit 'd0e1c273dbf9518b84a0a6f8bdcaa14f13246110':
Revert "Accessibility: filter touches to Enable button"
2013-11-06 15:17:49 -08:00
Kenny Root
d0e1c273db
am 279c1e15: am d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
...
* commit '279c1e15d23254728783ad99faff7349d9543ac4':
Revert "Accessibility: filter touches to Enable button"
2013-11-06 15:14:35 -08:00
Kenny Root
8be30bb162
Revert "Accessibility: filter touches to Enable button"
...
This reverts commit 94d4f23dcc
2013-11-06 15:14:16 -08:00
Kenny Root
279c1e15d2
am d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
...
* commit 'd0de39e716c7d93beeb83f9b442af437be651e55':
Revert "Accessibility: filter touches to Enable button"
2013-11-06 15:11:14 -08:00
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
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
