Jim Miller
83b9647d16
Merge "Integrate new PIN pad." into jb-mr1-lockscreen-dev
2012-10-23 14:03:47 -07:00
Daniel Sandler
69bdee7c87
Integrate new PIN pad.
...
Change-Id: I08d6551dfde501c5526eb6fd641ae08475c1365b
2012-10-23 16:45:50 -04:00
Jeff Brown
f33ff92313
am 6fd394ae: Merge "Improve auto-brightness hysteresis." into jb-mr1-dev
...
* commit '6fd394ae799cc81e3b571773819ee99374a25158':
Improve auto-brightness hysteresis.
2012-10-23 12:46:50 -07:00
Jeff Brown
6fd394ae79
Merge "Improve auto-brightness hysteresis." into jb-mr1-dev
2012-10-23 12:43:47 -07:00
Chris Wren
3867ddabbe
Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev
2012-10-23 12:29:05 -07:00
Baligh Uddin
1afe77883e
am 8ed48222: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '8ed482224ccd9d43fbb7544379a9bb7c10554419':
Import translations. DO NOT MERGE
2012-10-23 11:21:57 -07:00
Baligh Uddin
22f91da2c2
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-10-23 11:20:02 -07:00
Baligh Uddin
8ed482224c
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-23 11:19:07 -07:00
Romain Guy
0472d565f3
am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090 " into jb-mr1-dev
...
* commit '04c8d402fa824c548dc5de82c56e63eb5df02371':
Properly draw the window background on window resize Bug #7385090
2012-10-23 10:51:01 -07:00
Irfan Sheriff
086dc1ce9b
am c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev
...
* commit 'c48ca657f801b120e88c94287cdeecddc1a46e88':
Fix driver stop handling
2012-10-23 10:49:16 -07:00
Chris Wren
692bb13352
merge new multiuser avatars in from proto app
...
Change-Id: I6a7f63738279be1c036061b4cea461e94fb51658
2012-10-23 13:48:38 -04:00
Romain Guy
04c8d402fa
Merge "Properly draw the window background on window resize Bug #7385090 " into jb-mr1-dev
2012-10-23 10:47:56 -07:00
Irfan Sheriff
c48ca657f8
Merge "Fix driver stop handling" into jb-mr1-dev
2012-10-23 10:45:42 -07:00
Baligh Uddin
bd28f2376f
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-10-23 10:42:49 -07:00
Baligh Uddin
66e893fb9b
am 21ce854b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '21ce854b50667bf675bc36ce0db1a3d6f0a2ab92':
Import translations. DO NOT MERGE
2012-10-23 10:42:17 -07:00
Baligh Uddin
21ce854b50
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-23 10:39:27 -07:00
Irfan Sheriff
e6464af000
Fix driver stop handling
...
Defer supplicant state change event so we do not miss it
Bug: 7394390
Change-Id: Ibae6cef6be42a6cb45dc20ba4fa5060d8e459217
2012-10-23 10:36:51 -07:00
Baligh Uddin
7ed59aec32
Import translations. DO NOT MERGE
...
Change-Id: Ic1848f36834beea6d08e296aff9de39435482f75
Auto-generated-cl: translation import
2012-10-23 10:36:05 -07:00
Daniel Sandler
79db48003b
am 365ece1d: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
...
* commit '365ece1dd04df936b51e739ba3dde5fb94b3e527':
Dreams/Sleep Mode is now Daydreams.
2012-10-23 10:35:13 -07:00
Baligh Uddin
8cd4ef8f7b
Import translations. DO NOT MERGE
...
Change-Id: I349b6bc4c17141a0ac74e50b573382a2cf694f7e
Auto-generated-cl: translation import
2012-10-23 10:34:11 -07:00
Daniel Sandler
365ece1dd0
Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
2012-10-23 10:31:23 -07:00
Baligh Uddin
2107dcbd5c
Import translations. DO NOT MERGE
...
Change-Id: Ia49d738d4c123d06cc8ef2a31a18aa7156816d26
Auto-generated-cl: translation import
2012-10-23 10:06:53 -07:00
Justin Ho
c1c03c429a
am 5d6562d3: Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev
...
* commit '5d6562d34cb088f3468021b8bbdf8d75b68dca68':
Avoid mentioning hidden API in docs.
2012-10-23 10:05:22 -07:00
Baligh Uddin
1c8e4dc101
Import translations. DO NOT MERGE
...
Change-Id: I6d7f8dec6e1115a4586befbaa302eafe606fb901
Auto-generated-cl: translation import
2012-10-23 10:03:00 -07:00
Justin Ho
5d6562d34c
Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev
2012-10-23 09:41:48 -07:00
Irfan Sheriff
5f8e3f2b36
am bf310d1f: Merge "Fix issues shown on CTS tests" into jb-mr1-dev
...
* commit 'bf310d1f6ef4ac167f66a4e31724c7766981bd84':
Fix issues shown on CTS tests
2012-10-23 09:38:41 -07:00
Jeff Sharkey
b76a0c40d4
Avoid mentioning hidden API in docs.
...
Change-Id: If83c179ec0d1b038e94a7fdca386c8ddf324e391
2012-10-23 09:37:54 -07:00
Irfan Sheriff
bf310d1f6e
Merge "Fix issues shown on CTS tests" into jb-mr1-dev
2012-10-23 09:36:48 -07:00
Irfan Sheriff
51aec5ed5f
Fix issues shown on CTS tests
...
Reset timeout for single interface architecture
Fix persistence reinvocation handling on the receive side
Bug: 7379336
Change-Id: Iacca0bd6dcbeb42af63bf2078e8cf3126e4e74a7
2012-10-23 09:25:37 -07:00
Jeff Sharkey
32a1c5f7d6
am 1c8135ad: Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
...
* commit '1c8135adba37ac09fe661180237df446611daa4b':
Update docs for multi-user storage behavior.
2012-10-23 09:11:10 -07:00
Jeff Sharkey
1c8135adba
Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
2012-10-23 09:08:42 -07:00
Daniel Sandler
cf64067c95
am 0058f4ed: Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
...
* commit '0058f4ed50e5b4bfc8361c18b87115160d7132bb':
Reset ExpandHelper when the panel is collapsed.
2012-10-23 08:37:23 -07:00
Daniel Sandler
0058f4ed50
Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
2012-10-23 08:34:57 -07:00
Daniel Sandler
ac47ff70c3
Reset ExpandHelper when the panel is collapsed.
...
Fixes a rather unpleasant bug in which the ExpandHelper
could get locked in "expanding" mode if the panel was closed
(for example, with the back button) while you were in the
middle of an expand gesture. In this situation ExpandHelper
would hungrily eat all future touch events destined for the
notification panel, making it impossible to click or even
clear any notifications.
Bug: 7330828
Change-Id: I9c493db5e8fd8ef1aca53f77820780d60fa4e5a7
2012-10-23 10:41:44 -04:00
John Spurlock
31821c5b61
am 780a13b0: Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev
...
* commit '780a13b0f43fa5590bb22dc399d9faaf316d66f5':
Fix nav bar glitch when quickly turning screen off then on.
2012-10-23 04:14:11 -07:00
John Spurlock
780a13b0f4
Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev
2012-10-23 04:10:29 -07:00
Daniel Sandler
bd9cafa433
Dreams/Sleep Mode is now Daydreams.
...
Bug: 7395321
Change-Id: I3173cd9205df94217911a2d432d1be1db9e3d539
2012-10-23 01:21:33 -04:00
Jim Miller
5d3f859959
Merge multi-user stuff from prototype into framework.
...
Change-Id: I195b588ecfcea3388a2489fe7278a851202380c6
2012-10-22 20:45:56 -07:00
Romain Guy
41308e2936
Properly draw the window background on window resize
...
Bug #7385090
This change gets rid of two silly asumptions:
- That a layer needs to be cleared with opaque black (it shouldn't,
it's already cleared to transparent and the view will cover it up
with its own background)
- The the clip should be dirty at the beginning of a frame only
when the render target is opaque
Change-Id: I415b6d3cab196057fb0281419a53fef601a44e28
2012-10-22 20:02:43 -07:00
Jim Miller
022554e3da
Merge latest prototype changes into keyguard
...
- multi-user avatar stuff.
- new SlidingChallengeLayout changes.
Change-Id: I45bec7313b71dbca16544e7525281bf6c0e44a25
2012-10-22 19:06:05 -07:00
Jeff Brown
e941b1e27f
Improve auto-brightness hysteresis.
...
Reintroduced the stability time heuristic which requires brightness
to remain significantly above or below the currently accepted
ambient brightnes before effecting a brightness change. The
heuristic has the nice property of preventing light sensor noise
from causing oscillations in brightness even when the noise has
a relatively large magnitude (such as in low light environments).
The time bound and filter thresholds are current set so that
brightness increases typically occur within 5 seconds of a change
in the ambient environment. Decreases take somewhat longer and
typically occur within 10 seconds.
Changed the timing for brightness animations when the screen is
being dimmed due to a pending user activity timeout. The screen
now dims slowly but then brightens rapidly when touched.
Previously the screen dimmed quickly and brightened slowly which
felt somewhat unresponsive.
Fixed a problem where a brightness change might not occur because
the light sensor had not reported a new value in a long time.
Now we synthesize measurements when needed to ensure that a
transition will take place if appropriate.
Bug: 7387800
Change-Id: I998df2fec59922042a41a1ba4af97ea52c0bd02a
2012-10-22 18:56:39 -07:00
Jim Miller
c28261d4fa
Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev
2012-10-22 18:52:37 -07:00
erin rosenthal
9415aa1c1b
am 36425d19: Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
...
* commit '36425d19fc578c2042098d2045092990a811d0e6':
Catch badly formed URLs in WebView accessibility injector.
2012-10-22 17:56:27 -07:00
erin rosenthal
36425d19fc
Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
2012-10-22 17:53:27 -07:00
Eric Laurent
d691056ca8
am 3ac692f5: Merge "reduce camera sound volume." into jb-mr1-dev
...
* commit '3ac692f5114f058c82ca3855bdd36321f1540be5':
reduce camera sound volume.
2012-10-22 17:26:06 -07:00
Eric Laurent
3ac692f511
Merge "reduce camera sound volume." into jb-mr1-dev
2012-10-22 17:23:20 -07:00
Jim Miller
086977094d
Fix multiple onScreenTurnedOn callbacks in KeyguardHostView.
...
The show() method was calling onScreenTurnedOn() which attempted
to update the entire state.
Instead, show() should just ensure the current security screen
is showing.
This was causing some mischief in Face Unlock because onResume() was
being called multiple times.
Change-Id: I39682a213b1cc4dcf8133907b643028e844d0f47
2012-10-22 16:50:50 -07:00
Amith Yamasani
8e6dcb0045
am 0b828ee0: Merge "Set the correct flags for brightness dialog to show on all users" into jb-mr1-dev
...
* commit '0b828ee0d53980d6f5ce62248cab57f177921fa8':
Set the correct flags for brightness dialog to show on all users
2012-10-22 16:30:19 -07:00
Eric Laurent
ef2faae5af
reduce camera sound volume.
...
Reduce new video start and stop sounds volume to
match camera shutter sound volume.
Bug 7377030.
Change-Id: Ic42b36f063006da30dd870fa5ed9c8c5361aa043
2012-10-22 16:26:14 -07:00
Michael Jurka
5419ae873d
am 4ce82df5: Merge "Solve issue where labels in Recents were blank" into jb-mr1-dev
...
* commit '4ce82df5cc95826d499252f897573f79b514a347':
Solve issue where labels in Recents were blank
2012-10-22 16:25:40 -07:00