Commit Graph

4057 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Baligh Uddin
9271875c12 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-25 19:21:06 +00:00
Baligh Uddin
0707038005 Import translations. DO NOT MERGE
Change-Id: I485d5d31cfd721f5bec653c6d131fb89cfa628b6
Auto-generated-cl: translation import
2013-10-25 11:44:06 -07:00
Baligh Uddin
144cdee03c Import translations. DO NOT MERGE
Change-Id: If2ea17bb82d79c6a722bfa2360db9dbee83d008d
Auto-generated-cl: translation import
2013-10-25 11:40:25 -07:00
Wink Saville
64217355be am b557b89c: am 01b7ae29: am 83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
* commit 'b557b89c4dde4c760b1ce7c6317d3077378692e0':
  Display remaining attempts when using or changing SIM PIN
2013-10-25 09:54:35 -07:00
Wink Saville
b557b89c4d am 01b7ae29: am 83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
* commit '01b7ae29600f934d491cdc6dafdacf22821baf8d':
  Display remaining attempts when using or changing SIM PIN
2013-10-25 09:49:34 -07:00
Wink Saville
01b7ae2960 am 83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
* commit '83671ff815f59a977b34297c94aa05b4b4e97d01':
  Display remaining attempts when using or changing SIM PIN
2013-10-25 09:46:29 -07:00
Wink Saville
83671ff815 Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev 2013-10-25 16:41:09 +00:00
Baligh Uddin
81f96c6b43 Merge "Import translations. DO NOT MERGE" 2013-10-24 03:33:39 +00:00
Baligh Uddin
2ba4985526 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-24 03:33:34 +00:00
Baligh Uddin
9e8b20b73e Import translations. DO NOT MERGE
Change-Id: I654010b903a3b8bb4cec6a288250380bd93070e0
Auto-generated-cl: translation import
2013-10-23 19:54:57 -07:00
Baligh Uddin
855d40a569 Import translations. DO NOT MERGE
Change-Id: Iea5d9695008ddc258cfead84f2494fb3111eefea
Auto-generated-cl: translation import
2013-10-23 19:50:57 -07:00
Wink Saville
8246579fa1 Display remaining attempts when using or changing SIM PIN
Bug: 9928717
Change-Id: I73718c9e6a8aa7244097e0dd4593a6226ff0ac08
2013-10-23 17:07:10 -07:00
Vineeta Srivastava
7531e1b153 am 4a66909a: am 7a40def1: am 47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev
* commit '4a66909a6aae9d35ebc13fb377a41e525bd0f6c9':
  Remove Manage Mobile Plan when config_show_mobile_plan is set to false
2013-10-23 16:17:13 -07:00
Vineeta Srivastava
4a66909a6a am 7a40def1: am 47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev
* commit '7a40def17c40279faf8ad01d730c88498cd2f549':
  Remove Manage Mobile Plan when config_show_mobile_plan is set to false
2013-10-23 16:14:35 -07:00
Vineeta Srivastava
7a40def17c am 47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev
* commit '479634248d2c9833d7315a6382f491460f48da0f':
  Remove Manage Mobile Plan when config_show_mobile_plan is set to false
2013-10-23 16:11:45 -07:00
Sungmin Choi
2490315e49 Remove Manage Mobile Plan when config_show_mobile_plan is set to false
config_show_mobile_plan is set to true by default.
When you don't want to show "Manage mobile plan" set config_show_mobile_plan to false in overlay.

Bug: 10819853
Change-Id: Ic3c69fb4246cc0de38518ef6c9950cee7fa4d987
2013-10-23 21:29:14 +00:00
Baligh Uddin
351a3dce1e Merge "Import translations. DO NOT MERGE" 2013-10-22 19:54:15 +00:00
Baligh Uddin
7fe57374cd Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-22 19:54:11 +00:00
Lifu Tang
f31559601c am 7077e646: am 75099b67: am cace3d8d: Modified the strings according to the specs
* commit '7077e6460e393e567d3b80da6190ff1ebe7d834a':
  Modified the strings according to the specs
2013-10-21 16:06:09 -07:00
Lifu Tang
7077e6460e am 75099b67: am cace3d8d: Modified the strings according to the specs
* commit '75099b672338213e9f74462cd9ff96dd51bdd9d5':
  Modified the strings according to the specs
2013-10-21 16:03:20 -07:00
Lifu Tang
75099b6723 am cace3d8d: Modified the strings according to the specs
* commit 'cace3d8d28f005e6226a3eb909f8ebc3668ef805':
  Modified the strings according to the specs
2013-10-21 16:00:32 -07:00
Baligh Uddin
393798c73d Import translations. DO NOT MERGE
Change-Id: Ie22a6c9bff23e69d4ed2fbf21c92cea4283797fe
Auto-generated-cl: translation import
2013-10-21 11:08:18 -07:00
Baligh Uddin
0e036f24af Import translations. DO NOT MERGE
Change-Id: Ic7fb5ee337d953a38cd86957054f550aa4ccc88c
Auto-generated-cl: translation import
2013-10-21 11:04:20 -07:00
Lifu Tang
cace3d8d28 Modified the strings according to the specs
- Fix b/11290711

Change-Id: I23827ad5bef4cf4bda14bb08f0e502cc4e9d2727
2013-10-18 17:49:47 -07:00
Baligh Uddin
2b22e29f3e Import translations. DO NOT MERGE
Change-Id: I41a338eda7e5ea66266315fab7808b0b04ec3ed9
Auto-generated-cl: translation import
2013-10-17 14:30:00 -07:00
Baligh Uddin
2496a32ca6 Import translations. DO NOT MERGE
Change-Id: I2aba430c7c862ee16f7adb93503877a4e79a1117
Auto-generated-cl: translation import
2013-10-17 14:21:57 -07:00
Baligh Uddin
d093024297 Import translations. DO NOT MERGE
Change-Id: Ifb0c8c8555ee014dbab39fab6d9f19442eb28410
Auto-generated-cl: translation import
2013-10-16 23:18:02 -07:00
Baligh Uddin
50a64d9dcf Import translations. DO NOT MERGE
Change-Id: I837e1a31e3443781597b7de28f44fc332c6a84fd
Auto-generated-cl: translation import
2013-10-16 23:13:11 -07:00