Svetoslav
03360cd239
am 196bc5c6: am e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
...
* commit '196bc5c63a3f08bc8dc972ee82f7fe98a453b8f5':
Show correct message for a print job that is being canceled.
2013-11-14 22:30:53 -08:00
Svetoslav
196bc5c63a
am e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
...
* commit 'e7b781f574b8ec957d6254ed9edaef469c7085a5':
Show correct message for a print job that is being canceled.
2013-11-14 22:27:36 -08:00
Svetoslav
e7b781f574
Merge "Show correct message for a print job that is being canceled." into klp-dev
2013-11-15 06:23:54 +00:00
Svetoslav
97e962cd36
Show correct message for a print job that is being canceled.
...
1. If a print job is being canceled we now show appropriate
message that matches what the notification shows.
2. If a print job is being canceled we do not show the cancel
button.
bug:11696928
Change-Id: I0fc4f8226c4aa9acd6a4b65811f4228e56018315
2013-11-14 18:15:19 -08:00
Jeff Brown
e58dda114c
am be6858e8: am 8174aad5: am 36f98428: Merge "Update cast screen strings." into klp-dev
...
* commit 'be6858e86f2bf89832e63a7a51663ac6cd13aab0':
Update cast screen strings.
2013-11-14 17:37:31 -08:00
Jeff Brown
be6858e86f
am 8174aad5: am 36f98428: Merge "Update cast screen strings." into klp-dev
...
* commit '8174aad50382280c55a33f2572eb1fcdb53078c1':
Update cast screen strings.
2013-11-14 17:35:01 -08:00
Jeff Brown
8174aad503
am 36f98428: Merge "Update cast screen strings." into klp-dev
...
* commit '36f98428d450226670d67123ce02cc0c0ca75621':
Update cast screen strings.
2013-11-14 17:31:33 -08:00
Jeff Brown
36f98428d4
Merge "Update cast screen strings." into klp-dev
2013-11-15 01:29:05 +00:00
Jeff Brown
b960c74673
Update cast screen strings.
...
Bug: 11257292
Change-Id: I280f99bb91ebd0badd06b7fdca25aa3f2e96d201
2013-11-14 16:04:13 -08:00
David Christie
f420843a44
am 9605791d: am 7ff9f2b4: am b1ded62f: Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev
...
* commit '9605791d4165435330979497191a6ac902762271':
Update power widget icons and fix location behavior Bug: 11242129
2013-11-14 14:25:09 -08:00
David Christie
9605791d41
am 7ff9f2b4: am b1ded62f: Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev
...
* commit '7ff9f2b488e4017c7b3385fb067a14cfc07764fb':
Update power widget icons and fix location behavior Bug: 11242129
2013-11-14 14:20:31 -08:00
David Christie
7ff9f2b488
am b1ded62f: Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev
...
* commit 'b1ded62f3fd8afa2507fc8d284522019dc1e31e2':
Update power widget icons and fix location behavior Bug: 11242129
2013-11-14 12:16:06 -08:00
David Christie
b1ded62f3f
Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev
2013-11-14 20:12:42 +00:00
Baligh Uddin
3f4a8e47e1
Merge "Import translations. DO NOT MERGE"
2013-11-14 02:24:51 +00:00
Baligh Uddin
69f6b8a4c6
Import translations. DO NOT MERGE
...
Change-Id: Idcb80c7ffa297e2175e8d309aaa9e8845eeb0e12
Auto-generated-cl: translation import
2013-11-13 18:14:33 -08:00
Baligh Uddin
9b28d5a0c3
Import translations. DO NOT MERGE
...
Change-Id: Ib1ee67aee616ec7f9c66191102dc2fbee9ef39de
Auto-generated-cl: translation import
2013-11-13 18:06:51 -08:00
Jeff Brown
57cf0e6671
am bf2f9612: am 3aedfdfd: am 81ed0438: Finalize assets for screen cast.
...
* commit 'bf2f96123fde3d1433ac18a072832b5f0f6a604f':
Finalize assets for screen cast.
2013-11-13 09:05:55 -08:00
Jeff Brown
bf2f96123f
am 3aedfdfd: am 81ed0438: Finalize assets for screen cast.
...
* commit '3aedfdfdbfcff15f6b761fca3b6bda8449f11053':
Finalize assets for screen cast.
2013-11-13 09:02:20 -08:00
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