Commit Graph

4121 Commits

Author SHA1 Message Date
Jeff Brown
3aedfdfdbf am 81ed0438: Finalize assets for screen cast.
* commit '81ed043857dadcb69885c1e2ac37d63925c56c65':
  Finalize assets for screen cast.
2013-11-13 08:57:58 -08:00
Jeff Brown
81ed043857 Finalize assets for screen cast.
Bug: 11257292
Change-Id: I483496b4fc92bcf8e2c4f080a5a5d5bf97318b5d
2013-11-13 00:43:30 -08:00
Wei Wang
5cc44ae3d0 Add ble settings strings.
Change-Id: If8685aac2f36f56a534f3ba47b1cc60fed88a8a3
2013-11-12 17:29:32 -08:00
Jeff Brown
71504b1f71 am 0df39f39: am 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '0df39f39fcc45ff3efe92740ee46d7a762410b86':
  Integrate remote display routes into screen cast settings UI.
2013-11-11 20:51:05 -08:00
Baligh Uddin
622b5d2a6a Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-11 22:41:12 +00:00
Baligh Uddin
4366e49651 Import translations. DO NOT MERGE
Change-Id: I4d3ae2840e2024de8eb5a15fbdab5f68123cb1c7
Auto-generated-cl: translation import
2013-11-11 10:40:56 -08:00
Baligh Uddin
b50dc884a2 Import translations. DO NOT MERGE
Change-Id: Icd51d4bde4dadc325ff26b08dece13e761a99430
Auto-generated-cl: translation import
2013-11-11 10:35:06 -08:00
Jeff Brown
0df39f39fc am 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '2fba8be9c0c9da814e40af00847f3f2d28cf7f01':
  Integrate remote display routes into screen cast settings UI.
2013-11-11 10:27:24 -08:00
Jeff Brown
2fba8be9c0 am 4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '4e54c2a17765aed01ba23c9b0ec4d41e66c698b7':
  Integrate remote display routes into screen cast settings UI.
2013-11-11 10:21:59 -08:00
Jeff Brown
4e54c2a177 Integrate remote display routes into screen cast settings UI.
Merged remote display route selection into the existing wifi
display preference UI.  Moved the on/off toggle over to a menu item.

The preference page is now mainly implemented in terms of the
media router.  It only interacts with the display manager for the purpose
of pairing with new devices or making wifi display certification
controls available.

This means that the observed state is now completely consistent across
the system ui, settings, and applications that use the media router.

Bug: 11257292
Change-Id: I3705570812384fef4bfffeccaaccf7895d370d12
2013-11-10 21:20:16 -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
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
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
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