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
Jim Miller
f75a736a3e
am 31ee7e19: am fb3d5cad: Don\'t show keyguard on top of CryptKeeper
...
* commit '31ee7e19a040ab7660d39a6693f6ed38f7c961ad':
Don't show keyguard on top of CryptKeeper
2013-11-14 16:29:39 -08:00
Jim Miller
31ee7e19a0
am fb3d5cad: Don\'t show keyguard on top of CryptKeeper
...
* commit 'fb3d5cad48876dbd366fd8b562529d355d2428db':
Don't show keyguard on top of CryptKeeper
2013-11-14 16:27:24 -08:00
Jeff Brown
b960c74673
Update cast screen strings.
...
Bug: 11257292
Change-Id: I280f99bb91ebd0badd06b7fdca25aa3f2e96d201
2013-11-14 16:04:13 -08:00
Jim Miller
fb3d5cad48
Don't show keyguard on top of CryptKeeper
...
The fix in Change Ifbe4cdf40e3b76d2069ecace940f85fa58f31187 causes
keyguard to be more aggressive about showing itself.
CryptKeeper itself should explicitly dismiss keyguard.
Fixes bug 11680832
Change-Id: I87287762b73bdffc6f1800379f02f70f4bd873a8
2013-11-14 14:40:22 -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
94e1d51c69
am 2f888a47: (-s ours) am 9b28d5a0: (-s ours) Import translations. DO NOT MERGE
...
* commit '2f888a47522f8dcaad3f7ec32274675dd74c1501':
Import translations. DO NOT MERGE
2013-11-13 18:37:13 -08:00
Baligh Uddin
2f888a4752
am 9b28d5a0: (-s ours) Import translations. DO NOT MERGE
...
* commit '9b28d5a0c3a6ac46a55a5c8c3b10791494fd61c5':
Import translations. DO NOT MERGE
2013-11-13 18:33:06 -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
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
Baligh Uddin
5a04fb76da
am 74a503fd: (-s ours) am 622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '74a503fddf2626f6aedec486e9b30c4beb6377e2':
Import translations. DO NOT MERGE
2013-11-11 14:48:31 -08:00
Baligh Uddin
74a503fddf
am 622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '622b5d2a6af0cda319e4fbe066d62e36b06f7aa3':
Import translations. DO NOT MERGE
2013-11-11 14:44:42 -08:00
Baligh Uddin
622b5d2a6a
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-11-11 22:41:12 +00: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
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
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
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
7d7164361e
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-11-07 04:00:05 +00: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
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
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
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
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
