215 Commits

Author SHA1 Message Date
Mike Lockwood
61e411a948 am 65fb72a4: am d6adf0ae: Disable key repeats when the screen is off.
Merge commit '65fb72a42ca01124beea8d4a4b9ee0326cfe5e1c' into eclair-mr2-plus-aosp

* commit '65fb72a42ca01124beea8d4a4b9ee0326cfe5e1c':
  Disable key repeats when the screen is off.
2009-10-22 10:58:52 -07:00
Mike Lockwood
5a5bf77699 am d6adf0ae: Disable key repeats when the screen is off.
Merge commit 'd6adf0ae620ca3b64eee38cd53aaeedb7bd98457' into eclair-mr2

* commit 'd6adf0ae620ca3b64eee38cd53aaeedb7bd98457':
  Disable key repeats when the screen is off.
2009-10-22 10:49:00 -07:00
Mike Lockwood
fcb39240b1 Disable key repeats when the screen is off.
This prevents an endless stream of key repeats spamming the keyguard
if a volume key is pressed at the same time you turn off the screen
with the power button.

This is part of a fix for bug b/2198537

Change-Id: I0d7e335fee79cbebba96b2cd908458c3c94c839e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-21 23:01:07 -04:00
Jim Miller
456c868379 am 6c15d1d4: am eb44da50: (-s ours) Cherry-pick from mr2 to eclair: DO NOT MERGE
Merge commit '6c15d1d46e86ec41a62ac937f01a2b6437c4006e' into eclair-mr2-plus-aosp

* commit '6c15d1d46e86ec41a62ac937f01a2b6437c4006e':
2009-10-08 18:33:31 -07:00
Gil Dobjanschi
d30ae3409b Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/policies/base into eclair-mr2-plus-aosp 2009-10-08 18:33:31 -07:00
Jim Miller
562074bf7d am eb44da50: (-s ours) Cherry-pick from mr2 to eclair: DO NOT MERGE
Merge commit 'eb44da5077ae21571f39bae86d6be49b74c68e24' into eclair-mr2

* commit 'eb44da5077ae21571f39bae86d6be49b74c68e24':
  Cherry-pick from mr2 to eclair: DO NOT MERGE
2009-10-08 18:28:21 -07:00
Jim Miller
22dfe722df Cherry-pick from mr2 to eclair: DO NOT MERGE
commit 149c0543a3d5f450686b7c3d142ac5f8fcf61ed4

BUG=2176949

Partial fix for 2069703: Fix race condition in KeyguardViewManager.hide() that could result in a blank screen.

This fixes a race condition seen whenever show() is called before the timer in hide() triggers. This can happen
for example if the user hits "Emergency Dial" followed by the back button before the 0.5s timeout completes. The result
is a blank screen with no keyguard view and no means to recover on devices w/o a keyboard.

The bug caused us to sometimes remove the newly created KeyguardView instead of the old one, leaving the view empty.

The fix is to always remove the last view.
2009-10-08 17:55:05 -07:00
Mike Lockwood
316de3ca9a am c679a30d: am f184c681: Ignore requests to hide the keyguard if we are in the process of waking up.
Merge commit 'c679a30dd2902cd59a38d293df064e07faa3abd1' into eclair-mr2-plus-aosp

* commit 'c679a30dd2902cd59a38d293df064e07faa3abd1':
2009-10-08 17:48:43 -07:00
Dan Murphy
174b641165 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/policies/base into eclair-mr2-plus-aosp 2009-10-08 17:48:43 -07:00
Mike Lockwood
a3d12ce260 am f184c681: Ignore requests to hide the keyguard if we are in the process of waking up.
Merge commit 'f184c68119489aa00eccba41d3babedce282518b' into eclair-mr2

* commit 'f184c68119489aa00eccba41d3babedce282518b':
  Ignore requests to hide the keyguard if we are in the process of waking up.
2009-10-08 17:30:06 -07:00
Mike Lockwood
b4a5842157 Ignore requests to hide the keyguard if we are in the process of waking up.
This should fix a race condition that results in the screen waking up
and displaying nothing but wall paper

Bug b/2168660

Change-Id: I55bac0aaab8425cde282e7fc7e7c6b82217fbc9d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-08 14:32:44 -04:00
Dianne Hackborn
68607b976f am e6a78dcd: am 2ae4f37c: More fix #2163209: alarm clock rings but is hidden behind lock screen
Merge commit 'e6a78dcd009f9dd7618b2ee531a867085afdb86e' into eclair-mr2-plus-aosp

* commit 'e6a78dcd009f9dd7618b2ee531a867085afdb86e':
2009-10-07 22:13:23 -07:00
Dima Zavin
e8924c7e86 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/policies/base into eclair-mr2-plus-aosp 2009-10-07 22:13:23 -07:00
Dianne Hackborn
9f7135b5b4 am 2ae4f37c: More fix #2163209: alarm clock rings but is hidden behind lock screen
Merge commit '2ae4f37c435ae02cf9038216e1dfce0b82d9caab' into eclair-mr2

* commit '2ae4f37c435ae02cf9038216e1dfce0b82d9caab':
  More fix #2163209: alarm clock rings but is hidden behind lock screen
2009-10-07 22:07:48 -07:00
Dianne Hackborn
e7c8c7c1a4 More fix #2163209: alarm clock rings but is hidden behind lock screen
Another way we could miss the application's flags is because the
system now force hides application windows behind the lock screen.  So
we need to use this new API to actually take those into account when
looking for the top-most window that can specify for the lock screen
to be removed or hidden.

I have tested with pulling the device in and out of the desktop with
all kinds of random speeds and ways and this -seems- to now cover
everything.  Keeping fingers crossed.

Change-Id: Ice640eea6ee06ee27f069d60856fb394c7eeae51
2009-10-07 21:29:44 -07:00
Dianne Hackborn
92cb4ee770 am d586a383: am 08b8108e: Fix issue #2171460: Turn off background blurring of power dialog
Merge commit 'd586a383685a11b41fe894d7ea5c1e9f9a4ff1b6' into eclair-mr2-plus-aosp

* commit 'd586a383685a11b41fe894d7ea5c1e9f9a4ff1b6':
2009-10-07 17:52:06 -07:00
Dianne Hackborn
e92534a8cb am 2002f37c: am b4ccee6f: Fix issue #2171766: Device can go to sleep while in dock
Merge commit '2002f37cd072acd801eb3f849eb2783ab11784bb' into eclair-mr2-plus-aosp

* commit '2002f37cd072acd801eb3f849eb2783ab11784bb':
2009-10-07 17:52:03 -07:00
Neel Parekh
f2d7852d28 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/policies/base into eclair-mr2-plus-aosp 2009-10-07 17:52:03 -07:00
Dianne Hackborn
ba5e592ef2 am 08b8108e: Fix issue #2171460: Turn off background blurring of power dialog
Merge commit '08b8108e5873a758bb694aa0a64d758153145a76' into eclair-mr2

* commit '08b8108e5873a758bb694aa0a64d758153145a76':
  Fix issue #2171460: Turn off background blurring of power dialog
2009-10-07 17:45:08 -07:00
Dianne Hackborn
8d93c3e46c Fix issue #2171460: Turn off background blurring of power dialog
Change-Id: I233929c363cac232de26dad20bc4011f12e3a5ab
2009-10-07 16:33:48 -07:00
Dianne Hackborn
bf29460f2a am b4ccee6f: Fix issue #2171766: Device can go to sleep while in dock
Merge commit 'b4ccee6f4c4bff3e063a06b26a3314121d06467d' into eclair-mr2

* commit 'b4ccee6f4c4bff3e063a06b26a3314121d06467d':
  Fix issue #2171766: Device can go to sleep while in dock
2009-10-07 16:05:01 -07:00
Dianne Hackborn
80fa166bf6 Fix issue #2171766: Device can go to sleep while in dock
The issue I saw was then when plugging into the dock, we the battery
first is in the "USB" state before going to "AC".  The phone window
manager would pick up the first state, but not the second.

This change reworks this code to always monitor the battery status
while plugged in to the dock, to update itself whenever that state
changes.  When not in the dock, we don't monitor, since this is
only used to determine whether to keep the device on while in the
dock.

Change-Id: Ic1e8b584082a44c4e5df13ee19dab450775027f6
2009-10-07 14:02:10 -07:00
Dianne Hackborn
9f7d80e171 am e526c56e: Fix #2163209: alarm clock rings but is hidden behind lock screen
Merge commit 'e526c56eb01db55706f07afc3b763786565d251b' into eclair-mr2

* commit 'e526c56eb01db55706f07afc3b763786565d251b':
  Fix #2163209: alarm clock rings but is hidden behind lock screen
2009-10-07 11:41:13 -07:00
Jim Miller
6c0a563e67 Partial fix for 2069703: Fix race condition in KeyguardViewManager.hide() that could result in a blank screen.
This fixes a race condition seen whenever show() is called before the timer in hide() triggers. This can happen
for example if the user hits "Emergency Dial" followed by the back button before the 0.5s timeout completes. The result
is a blank screen with no keyguard view and no means to recover on devices w/o a keyboard.

The bug caused us to sometimes remove the newly created KeyguardView instead of the old one, leaving the view empty.

The fix is to always remove the last view.
2009-10-07 02:03:02 -07:00
Dianne Hackborn
d70bc2f662 Fix #2163209: alarm clock rings but is hidden behind lock screen
The lock screen's flag to force the status bar on was sometimes
interfering with the flag of the alarm behind to hide the lock screen.

Change-Id: I91368c56d09d35b03db548530aa1eb59197206bd
2009-10-06 23:25:51 -07:00
Mike Lockwood
674d3e4021 Hold a partial wakelock while showing the keyguard
This ensures that the keyguard is fully displayed before the processor suspends,
which avoids a race condition when the device is powered back up.
Fixes one instance of bug b/2164183

Change-Id: Ifd7f928068cf779ec725937db82af69306c02107
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-06 09:28:54 -04:00
Android (Google) Code Review
89062ab89e Merge change I0f10425e into eclair
* changes:
  Add some logging to help diagnose b/2164183
2009-10-05 16:33:16 -04:00
Mike Lockwood
206f07d3be Add some logging to help diagnose b/2164183
Change-Id: I0f10425e89cba9e9ddbd3ce58ad1ae0a3ae74f34
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-05 16:03:31 -04:00
Fred Quintana
261259b673 account manager api review changes 2009-10-05 10:00:08 -07:00
Dianne Hackborn
73b1ec8961 Work on issue #2163789: Way too much logging
Dr.No from mcleron.

Change-Id: I44d49221b15a6ae2c22504869b14d610d234ccc9
2009-10-04 13:44:16 -07:00
Jim Miller
36931ac9b3 Fix for 2129239: Always enable the menu hard key in LockScreen when 'ro.monkey' is set.
BUG=2129239
DRNO=discussed with hiroshi/mcleron who gave thumbs up.
2009-10-02 17:51:30 -07:00
Android (Google) Code Review
9227af0571 Merge change I46ea3489 into eclair
* changes:
  Make sure we wake up the screen if the keyguard is not visible when we think it should be.
2009-10-02 14:03:43 -04:00
David Brown
4c48b6b410 Add placeholder onGrabbedStateChange() method.
Update LockScreen to implement the latest RotarySelector
OnDialTriggerListener interface.  In a followup CL we'll use this to
display onscreen hint text while dragging.

BUG=2158434
DRNO=timsullivan
TESTED=exercised the lock screen widget, confirmed there's no new behavior.
2009-10-01 19:27:44 -07:00
Mike Lockwood
3754b0d563 Make sure we wake up the screen if the keyguard is not visible when we think it should be.
I am hoping this will fix bug b/2155529

Change-Id: I46ea34898864d7b39391d76b802858c0f092b578
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-01 14:50:15 -04:00
Mike Lockwood
db460fe7cf Move status bar disabling from KeyguardViewMediator to Phone app
This allows us to disable the keyguard while docked without disabling the status bar.

Change-Id: I06ff48dcb1922a26e356faee0aefa91b7c871e6a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-01 08:15:40 -04:00
Costin Manolache
563b3e61ca Remove GAIA string 2009-09-29 22:49:09 -07:00
Android (Google) Code Review
39187ab260 Merge change I880426e8 into eclair
* changes:
  Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices
2009-09-29 21:20:25 -04:00
Dianne Hackborn
63b90f2885 Fix issue #2153749: Window manager deadlock around the Eclair lock screen
Don't synchronously call into the account manager from the lock screen.

Change-Id: I2741c81bb31537ddfcce96b1b199ac50fd48e727
2009-09-29 17:44:09 -07:00
Jim Miller
8ed9870f54 Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices
Changed to use config.xml and overlays to enable.
2009-09-29 17:05:50 -07:00
Android (Google) Code Review
2034804356 Merge change Ie3edea1f into eclair
* changes:
  Fix for 2137900: Be more conservative about poking the wakelock
2009-09-29 18:41:48 -04:00
Dianne Hackborn
b1a7980800 Whoops forgot the change to actually check for safe mode!
Change-Id: Iba0ad151ed786be8ae8659bfefe2a29776ce6311
2009-09-29 15:18:31 -07:00
Jim Miller
72f230e32e Fix for 2137900: Be more conservative about poking the wakelock 2009-09-29 14:16:41 -07:00
Dianne Hackborn
d7f7deb286 Fix potential race when removing keyguard view.
Change-Id: Ia636bc8a73d18b8ebe2dca2b29bb74793a3f0396
2009-09-25 17:35:10 -07:00
Dan Murphy
cd3d3f22ab fw/policy/base:Phonewindowmanager: Make vkey button haptics part of global haptic setting
This change ties the virtual key haptics to the global haptics settings

Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
2009-09-25 14:10:44 -07:00
Android (Google) Code Review
74711dc7b8 Merge change 27039 into eclair
* changes:
  Fix volume key handling when in-call and screen is off due to proximity sensor.
2009-09-25 14:54:56 -04:00
Mike Lockwood
a53e381665 Fix volume key handling when in-call and screen is off due to proximity sensor.
Fixes bug b/2136633

Change-Id: If963d0267496878978ad82d915f821af2bd03383
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-25 14:47:10 -04:00
Karl Rosaen
a35d753add Remove keyguard view after a delay instead of just hiding it.
The delay should make sure the animation works, and by still removing it, we
preserve the initialization logic that depends on being reinstantiated each time
the screen turns off.  The logic could be adjusted to work without this, but
seems safer to maintain the existing behavior. Also reduces risk from having
keyguard around all the time.
2009-09-25 10:26:22 -07:00
Dianne Hackborn
d0071448cc Maybe fix #2127747: IllegalStateException from window manager when resuming from sleep
It looks like there may have been a race when restoring that would allow
you to show the menu before it is restored.  I couldn't repro on my current
device before the fix, though.

Change-Id: I624e1306871344d3ee39f69dde832b3db2530a5f
2009-09-25 01:35:29 -07:00
Dianne Hackborn
01ad2f4a2d Implement fade out of lock screen.
Change-Id: I516aa2257c788a9fb618ac37c9d227b1e7a3c2ae
2009-09-24 19:33:30 -07:00
Karl Rosaen
b17dc443c6 Initialze battery state properly in pattern unlock screen. 2009-09-24 18:11:28 -07:00