Jim Miller
ed1cfc45b1
am c9fd186b: am 44ee0fb1: am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev
...
* commit 'c9fd186b4692e2da63698f15be59abcd360e321c':
Delay tearing down external displays until keyguard finishes
Show keyguard scrim on external displays while keyguard showing
2013-11-08 11:38:12 -08:00
Jim Miller
c9fd186b46
am 44ee0fb1: am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev
...
* commit '44ee0fb144947206713e6527a5227fd44e2d4e1e':
Delay tearing down external displays until keyguard finishes
Show keyguard scrim on external displays while keyguard showing
2013-11-08 11:35:18 -08:00
Jim Miller
44ee0fb144
am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev
...
* commit 'c55edb266f96364277b4a3552295c94363d847fb':
Delay tearing down external displays until keyguard finishes
Show keyguard scrim on external displays while keyguard showing
2013-11-08 11:01:57 -08:00
Jeff Brown
ae9bf8dd42
resolved conflicts for merge of 6a1a2f9b to master
...
Change-Id: Ie204a484b9b989a66423b756bb4743d7018c0884
2013-11-07 21:25:26 -08:00
Jim Miller
0b9d8accc5
Delay tearing down external displays until keyguard finishes
...
This waits until the keyguard window is actually removed before turning
off external presentations to avoid flashing the user's password.
Fixes bug 11562369
Change-Id: I74bfc0d5e23dccc5a8628abfe02868c71c371f6e
2013-11-07 19:15:49 -08:00
Jim Miller
3192148fb4
Show keyguard scrim on external displays while keyguard showing
...
Fixes bug 11562369
Change-Id: I577f9d3683e62689954b4640601b3f360b78cb31
2013-11-07 18:44:56 -08:00
Jeff Brown
6a1a2f9b88
am 7938feef: am 52277428: Merge "Integrate remote display providers into Quick Settings." into klp-dev
...
* commit '7938feef5abd003bf54efa4f862f995856305e44':
Integrate remote display providers into Quick Settings.
2013-11-07 17:44:17 -08:00
Jeff Brown
7938feef5a
am 52277428: Merge "Integrate remote display providers into Quick Settings." into klp-dev
...
* commit '52277428d54cc71f0cde3f1efa035f1e6742b900':
Integrate remote display providers into Quick Settings.
2013-11-07 17:41:48 -08:00
Jeff Brown
52277428d5
Merge "Integrate remote display providers into Quick Settings." into klp-dev
2013-11-08 01:37:03 +00:00
Jim Miller
55565a493f
am eaacc7c1: am bb78ae9e: am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev
...
* commit 'eaacc7c1ba4ff00bac36f5fbfd7269b04eb77cae':
Fix scrubbing behavior on keyguard music transport
2013-11-07 16:13:13 -08:00
Jeff Brown
635e915296
Integrate remote display providers into Quick Settings.
...
This is a first pass at integrating new remote display functionality
into Quick Settings. The Wireless Display card which previously
only supported Wifi Display is reimplemented to use the media router
to enumerate available remote display routes. This ensures that the
user is presented with a consistent state regarding the currently
selected display route.
In this patch, the Wireless Display card still launches the old
Settings preference page for Wifi Display when clicked. This will be
addressed in future patches.
As part of this change, it was necessary to derive some new lifecycle
information regarding the visibility of the Quick Settings model.
When Quick Settings is shown, an onPrepare event is delivered to
give the model a chance to update its state. Likewise when Quick
Settings is hidden, an onUnprepare event is delivered.
These events allow the system to determine precisely when remote
display discovery is required to update the UI so as not to waste
power performing discovery in the background all of the time.
Bug: 11257292
Change-Id: Id802aa0983b625aeb972b5d123e4cc080dd6705f
2013-11-07 16:07:18 -08:00
Jim Miller
eaacc7c1ba
am bb78ae9e: am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev
...
* commit 'bb78ae9eedce1136410be326274b5304e8e046dc':
Fix scrubbing behavior on keyguard music transport
2013-11-07 14:57:16 -08:00
Jim Miller
bb78ae9eed
am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev
...
* commit '8cba0d0b21db0fc4f9006403d6706e5893582dc8':
Fix scrubbing behavior on keyguard music transport
2013-11-07 14:54:37 -08:00
Jim Miller
8cba0d0b21
Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev
2013-11-07 22:52:57 +00:00
Baligh Uddin
2d55e61bb9
Merge "Import translations. DO NOT MERGE"
2013-11-07 03:55:27 +00:00
Baligh Uddin
5be3186bac
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-11-07 03:55:19 +00:00
Baligh Uddin
a91256a7d2
Merge "Import translations. DO NOT MERGE"
2013-11-07 03:55:12 +00:00
Jim Miller
e85d20a32e
am a7756cbc: am b8aba3f4: am b892ac68: Merge "Fix glitch with switching users from QuickSettings" into klp-dev
...
* commit 'a7756cbc62d19bef22c99990043621086f731b25':
Fix glitch with switching users from QuickSettings
2013-11-06 19:22:10 -08:00
Jim Miller
a7756cbc62
am b8aba3f4: am b892ac68: Merge "Fix glitch with switching users from QuickSettings" into klp-dev
...
* commit 'b8aba3f4df3962ea6b11806aff4479f0b61eae0f':
Fix glitch with switching users from QuickSettings
2013-11-06 19:20:13 -08:00
Jim Miller
b8aba3f4df
am b892ac68: Merge "Fix glitch with switching users from QuickSettings" into klp-dev
...
* commit 'b892ac680b045daca2926037955857889d32e1c0':
Fix glitch with switching users from QuickSettings
2013-11-06 19:16:59 -08:00
Jim Miller
b892ac680b
Merge "Fix glitch with switching users from QuickSettings" into klp-dev
2013-11-07 03:14:37 +00:00
Jim Miller
cc747ad2da
Fix scrubbing behavior on keyguard music transport
...
This fixes a bug where the music scrub position would snap
back to a previous position. The problem was caused by latency
in the music application responding to scrub position changes.
The latency would mean that we'd get a response periodically
to some historical scrub position change.
Since we can't know when the state will become stable, we
just wait a little bit since the last update change before
continuing to update the scroll position.
In order to keep the music client from falling behind, we
throttle scrub updates.
Fixes bug 11351267
Change-Id: I6204833328751d1da781b4e078a2d557c1f93ff3
2013-11-06 17:53:32 -08:00
Ruben Brunk
9cd3b1218e
am df049d6f: am 9aed2ae0: am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev
...
* commit 'df049d6f2270b06679d51021c97eb9559f2657b7':
Disable face unlock when returning from camera.
2013-11-06 15:33:39 -08:00
Ruben Brunk
df049d6f22
am 9aed2ae0: am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev
...
* commit '9aed2ae0bd03edcaef3dd3cac8795055cf8d2b43':
Disable face unlock when returning from camera.
2013-11-06 15:30:26 -08:00
Ruben Brunk
9aed2ae0bd
am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev
...
* commit 'e77d2a9c62e747902bc53d40e303214705702b00':
Disable face unlock when returning from camera.
2013-11-06 15:26:48 -08:00
Ruben Brunk
e77d2a9c62
Merge "Disable face unlock when returning from camera." into klp-dev
2013-11-06 23:22:55 +00:00
John Spurlock
574ad40c26
am cd6258b5: am 20dc4923: am 10b9ac80: Merge "Fix lockscreen camera preview position in RTL." into klp-dev
...
* commit 'cd6258b50f94d69a3ba677c2d17bed824c10cdd2':
Fix lockscreen camera preview position in RTL.
2013-11-06 13:57:47 -08:00
John Spurlock
cd6258b50f
am 20dc4923: am 10b9ac80: Merge "Fix lockscreen camera preview position in RTL." into klp-dev
...
* commit '20dc49235e213d40f75dca9005e0e248931ceff4':
Fix lockscreen camera preview position in RTL.
2013-11-06 13:55:18 -08:00
John Spurlock
20dc49235e
am 10b9ac80: Merge "Fix lockscreen camera preview position in RTL." into klp-dev
...
* commit '10b9ac807f7cc0817e8dd4b96d587ccd41f8f177':
Fix lockscreen camera preview position in RTL.
2013-11-06 13:52:15 -08:00
John Spurlock
10b9ac807f
Merge "Fix lockscreen camera preview position in RTL." into klp-dev
2013-11-06 21:48:41 +00:00
Jim Miller
17a93ff130
am 5a31605a: am 78244c83: am 32293469: Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev
...
* commit '5a31605a034e990a68567597bbf9ccbc8cb28494':
Fix issue where transport control shows up off-screen on tablets
2013-11-06 13:25:09 -08:00
Jim Miller
5a31605a03
am 78244c83: am 32293469: Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev
...
* commit '78244c83fb633895c95f3c93ab874be979cf42e3':
Fix issue where transport control shows up off-screen on tablets
2013-11-06 13:22:16 -08:00
Jim Miller
78244c83fb
am 32293469: Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev
...
* commit '322934699433d703fa35505d72028abbcf8ce45f':
Fix issue where transport control shows up off-screen on tablets
2013-11-06 13:19:27 -08:00
Jim Miller
3229346994
Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev
2013-11-06 21:15:17 +00:00
Baligh Uddin
6ccf625559
Import translations. DO NOT MERGE
...
Change-Id: I659e58b641a7a154bca5ea33413aff6cde07635a
Auto-generated-cl: translation import
2013-11-06 11:54:16 -08:00
Baligh Uddin
3b79bf493c
Import translations. DO NOT MERGE
...
Change-Id: I13dd4dfd6492c31975cd61e28caeea940a5f66cb
Auto-generated-cl: translation import
2013-11-06 11:53:23 -08:00
Baligh Uddin
ca6c7fc653
Import translations. DO NOT MERGE
...
Change-Id: Ie33acfe6f39d170f88a99ec57ee960dc62c84ee0
Auto-generated-cl: translation import
2013-11-06 11:52:19 -08:00
John Spurlock
b6c3b20d71
Fix lockscreen camera preview position in RTL.
...
Bug:11263914
Change-Id: Ic3e5157ceb82495d10afd74b3af2655434a9467c
2013-11-06 14:44:54 -05:00
Michael Jurka
b52856129c
am 065f321d: am f080a24e: am 04cead14: Merge "Fix calculation of default wallpaper size" into klp-dev
...
* commit '065f321de92cfe8e86eaaeb86f0a0420c9300fbf':
Fix calculation of default wallpaper size
2013-11-06 11:17:37 -08:00
Michael Jurka
065f321de9
am f080a24e: am 04cead14: Merge "Fix calculation of default wallpaper size" into klp-dev
...
* commit 'f080a24e09eed73159e1e877dce2b6bf81744d40':
Fix calculation of default wallpaper size
2013-11-06 11:15:28 -08:00
Michael Jurka
f080a24e09
am 04cead14: Merge "Fix calculation of default wallpaper size" into klp-dev
...
* commit '04cead14b627947df7f1b713c35a3e03bef94286':
Fix calculation of default wallpaper size
2013-11-06 11:12:33 -08:00
Michael Jurka
04cead14b6
Merge "Fix calculation of default wallpaper size" into klp-dev
2013-11-06 19:06:50 +00:00
Ruben Brunk
21a99ddd9c
Disable face unlock when returning from camera.
...
Bug: 11063890
- Workaround for bug 11063890. Avoids the acquire/release
race when resuming face unlock while pausing the camera
widget.
Change-Id: I0a58f3a07f346da72ea55772242b4f9c54537235
2013-11-06 10:21:43 -08:00
Michael Jurka
f35fac93cd
am b1b0266d: am 8ef6da5c: am b922178d: Merge "More background protection in Recents for status bar" into klp-dev
...
* commit 'b1b0266dc7dd1e91bc40900085c9bb85356612db':
More background protection in Recents for status bar
2013-11-06 08:52:01 -08:00
Michael Jurka
b1b0266dc7
am 8ef6da5c: am b922178d: Merge "More background protection in Recents for status bar" into klp-dev
...
* commit '8ef6da5c9e40ae73a4f73be72df28d51fffcfaad':
More background protection in Recents for status bar
2013-11-06 05:01:22 -08:00
Michael Jurka
8ef6da5c9e
am b922178d: Merge "More background protection in Recents for status bar" into klp-dev
...
* commit 'b922178dce8464aa46203812d8bd4424c47ba486':
More background protection in Recents for status bar
2013-11-06 04:58:34 -08:00
Michael Jurka
b922178dce
Merge "More background protection in Recents for status bar" into klp-dev
2013-11-06 12:38:23 +00:00
Michael Jurka
eed96a0b90
Fix calculation of default wallpaper size
...
Bug: 11324470
2013-11-06 13:22:51 +01:00
Jim Miller
81190befe6
Fix issue where transport control shows up off-screen on tablets
...
This fix selects the current page ealier in the reconstruction
of Keyguard to ensure the layout bounds of KeyguardWidgetPager are
correct by the time it does the initial layout.
In addition this change postpones selecting the transport page if
the transport was just added.
Fixes bug 11287144
Change-Id: I92ba8bb5e13c166d13fbaa26881f5034d5ab2104
2013-11-05 21:14:18 -08:00
John Spurlock
1288608eee
am 46cfab75: am b2b56eae: am 499c7eeb: Merge "Update remaining settings icon with old style." into klp-dev
...
* commit '46cfab7587920d7175308952ab575954a81b3aff':
Update remaining settings icon with old style.
2013-11-05 19:18:05 -08:00