Commit Graph

235 Commits

Author SHA1 Message Date
David Brown
ec1ccf633e am 93303df4: Add placeholder onGrabbedStateChange() method.
Merge commit '93303df4771c99d57bcfab47ce4ee2a72e0b7a8b'

* commit '93303df4771c99d57bcfab47ce4ee2a72e0b7a8b':
  Add placeholder onGrabbedStateChange() method.
2009-10-12 11:24:06 -07: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
29748bfc67 am fcb96b2f: Move status bar disabling from KeyguardViewMediator to Phone app
Merge commit 'fcb96b2f8762276b1d3a38fb1b73eda977348e0f'

* commit 'fcb96b2f8762276b1d3a38fb1b73eda977348e0f':
  Move status bar disabling from KeyguardViewMediator to Phone app
2009-10-01 15:11:18 -07:00
Costin Manolache
49af23384b am 56755f77: Remove GAIA string
Merge commit '56755f77eb93310aab45013b29fd9614ebb72282'

* commit '56755f77eb93310aab45013b29fd9614ebb72282':
  Remove GAIA string
2009-10-01 11:51:06 -07:00
Jim Miller
35c914f2f1 am 4f91a2b7: Merge change I880426e8 into eclair
Merge commit '4f91a2b7446f919a6315202e9a714286418d8f8c'

* commit '4f91a2b7446f919a6315202e9a714286418d8f8c':
  Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices
2009-10-01 11:45:10 -07:00
Dianne Hackborn
1a73689602 am 9d9b5427: Fix issue #2153749: Window manager deadlock around the Eclair lock screen
Merge commit '9d9b5427c628c52549d259d7ea7908ec5a16efcd'

* commit '9d9b5427c628c52549d259d7ea7908ec5a16efcd':
  Fix issue #2153749: Window manager deadlock around the Eclair lock screen
2009-10-01 11:43:33 -07:00
Jim Miller
18f0c07222 am fbe21943: Merge change Ie3edea1f into eclair
Merge commit 'fbe21943e0cfa093318fb856824a143b03b97a72'

* commit 'fbe21943e0cfa093318fb856824a143b03b97a72':
  Fix for 2137900: Be more conservative about poking the wakelock
2009-10-01 11:40:26 -07:00
Dianne Hackborn
3f3fcb3b68 am 086d8850: Whoops forgot the change to actually check for safe mode!
Merge commit '086d88503e589f14560209000724fe5215a10937'

* commit '086d88503e589f14560209000724fe5215a10937':
  Whoops forgot the change to actually check for safe mode!
2009-10-01 11:39:19 -07: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
b596aaf4f5 am 3e1ae648: Fix potential race when removing keyguard view.
Merge commit '3e1ae648d66e3eaa7da6187b6afdbe95d902dbef'

* commit '3e1ae648d66e3eaa7da6187b6afdbe95d902dbef':
  Fix potential race when removing keyguard view.
2009-09-28 01:08:26 -07:00
Dan Murphy
60ce8c2ec3 am c759ed68: fw/policy/base:Phonewindowmanager: Make vkey button haptics part of global haptic setting
Merge commit 'c759ed684857a085e5cf74f5a62bc98e78abd660'

* commit 'c759ed684857a085e5cf74f5a62bc98e78abd660':
  fw/policy/base:Phonewindowmanager: Make vkey button haptics part of global haptic setting
2009-09-27 15:38:27 -07:00
Mike Lockwood
90f07ba37e am 7833c22d: Merge change 27039 into eclair
Merge commit '7833c22d43dc5abbbfff500b641e31897996d265'

* commit '7833c22d43dc5abbbfff500b641e31897996d265':
  Fix volume key handling when in-call and screen is off due to proximity sensor.
2009-09-27 15:36:28 -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
181d6b55ff am 9e22bd9a: Remove keyguard view after a delay instead of just hiding it.
Merge commit '9e22bd9ab0b51370a3b2c3ea9b8263ca44548a9b'

* commit '9e22bd9ab0b51370a3b2c3ea9b8263ca44548a9b':
  Remove keyguard view after a delay instead of just hiding it.
2009-09-25 11:26:47 -07:00
Dianne Hackborn
4b67254d24 am 7371b040: Maybe fix #2127747: IllegalStateException from window manager when resuming from sleep
Merge commit '7371b040bc00a92f371bb8755878261add2e55c6'

* commit '7371b040bc00a92f371bb8755878261add2e55c6':
  Maybe fix #2127747: IllegalStateException from window manager when resuming from sleep
2009-09-25 11:23:21 -07:00
Dianne Hackborn
97f5542845 am 01f08aa7: Implement fade out of lock screen.
Merge commit '01f08aa7f5f24beb2432bb104a981567f925b40c'

* commit '01f08aa7f5f24beb2432bb104a981567f925b40c':
  Implement fade out of lock screen.
2009-09-25 11:23:11 -07:00
Karl Rosaen
5a3fb3a24c am a4ce23e0: Initialze battery state properly in pattern unlock screen.
Merge commit 'a4ce23e062cbce1781f0b96b3b7a81026714dd59'

* commit 'a4ce23e062cbce1781f0b96b3b7a81026714dd59':
  Initialze battery state properly in pattern unlock screen.
2009-09-25 11:15:36 -07:00
Karl Rosaen
4735983fcd am 2d52a18c: Whoops, count down text is not updating... fixed!
Merge commit '2d52a18c872c1cada6a2e6b482cc14fd7b91424c'

* commit '2d52a18c872c1cada6a2e6b482cc14fd7b91424c':
  Whoops, count down text is not updating... fixed!
2009-09-25 11:15:13 -07:00
Karl Rosaen
bc4760052e am 27b0dbec: Update unlock screen logic to display battery, next alarm info.
Merge commit '27b0dbecbd6453a8d2a6f0fa40426ebb7e71fb34'

* commit '27b0dbecbd6453a8d2a6f0fa40426ebb7e71fb34':
  Update unlock screen logic to display battery, next alarm info.
2009-09-25 11:14:47 -07:00
Karl Rosaen
a4a4497db8 am f5107ee3: Tweak LockScreen to make use of landscape layout.
Merge commit 'f5107ee3f24a28174ba13eee2b731a5be5c28fc0'

* commit 'f5107ee3f24a28174ba13eee2b731a5be5c28fc0':
  Tweak LockScreen to make use of landscape layout.
2009-09-25 11:06:18 -07:00
Dianne Hackborn
0e84d6745b am b6b205ba: Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Merge commit 'b6b205bafcbf98b2d4aa12a586b2cc38137a6e32'

* commit 'b6b205bafcbf98b2d4aa12a586b2cc38137a6e32':
  Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
2009-09-25 11:01:08 -07: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
eea2c15f11 am adda0c0f: Allow dock keep screen on to select between AC and USB power.
Merge commit 'adda0c0fb04a828a71aba1bffa20689427b972bd'

* commit 'adda0c0fb04a828a71aba1bffa20689427b972bd':
  Allow dock keep screen on to select between AC and USB power.
2009-09-25 08:46:28 -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
Karl Rosaen
18fe8a5022 Whoops, count down text is not updating... fixed! 2009-09-24 17:13:56 -07:00
Karl Rosaen
add3930c01 Update unlock screen logic to display battery, next alarm info. 2009-09-24 16:48:14 -07:00
Karl Rosaen
80be841eaf Tweak LockScreen to make use of landscape layout. 2009-09-24 10:17:42 -07:00
Dianne Hackborn
4994c66c09 Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Perform clear system dialogs when turning on the lock screen.

Change-Id: I2a3104a9df942d59308a94377f93787f17dbb2ce
2009-09-23 22:21:23 -07:00
Joe Onorato
c6fce9a31c am 9217e0fc: The nosensor flag wasn\'t being honored.
Merge commit '9217e0fc7f11e53e3501b590d8c3ff848dc5dba3'

* commit '9217e0fc7f11e53e3501b590d8c3ff848dc5dba3':
  The nosensor flag wasn't being honored.
2009-09-23 11:39:56 -07:00
Dianne Hackborn
c9bd29d5ff am 6b2309f8: Fixes and improvements to lock screen hiding, dock launching.
Merge commit '6b2309f8dfeac86b825a688d48b20e12782fe135'

* commit '6b2309f8dfeac86b825a688d48b20e12782fe135':
  Fixes and improvements to lock screen hiding, dock launching.
2009-09-23 11:34:00 -07:00
Dianne Hackborn
0572658afd Allow dock keep screen on to select between AC and USB power.
Change-Id: I2309992f5ad7b93006eb52f31758f71c48ed98f1
2009-09-22 18:59:46 -07:00
Joe Onorato
1b58b3ebee The nosensor flag wasn't being honored. 2009-09-22 17:30:34 -07:00
Dianne Hackborn
39c2d71950 Fixes and improvements to lock screen hiding, dock launching.
- Implement new window flags for dismissing non-secure lock screens.

- Implement launching of docks from the home key.

Change-Id: If29f299db47e3759c3e146983f59d0f86ed22c4c
2009-09-22 13:31:29 -07:00
Dianne Hackborn
0f2b5b8440 am a0a8e154: Improvements to lock screen management:
Merge commit 'a0a8e1546a6f722cb886f3badac9de711d1b0e3b'

* commit 'a0a8e1546a6f722cb886f3badac9de711d1b0e3b':
  Improvements to lock screen management:
2009-09-21 18:38:22 -07:00
Dianne Hackborn
b446e9767a Improvements to lock screen management:
- The window flag to hide the lock screen will now allow you to press home,
and automatically dismiss the lock screen if it is not needed for security.

- When opening the lid, if the lock screen will be shown, try to avoid
turning on the screen until it is ready.  There is actually still some
problem with this.

Change-Id: I51d769b8e6cff7b439b1ffea927c0a01376427b1
2009-09-21 17:39:09 -07:00
Mike Lockwood
ce5fdc6525 am ca1a265c: Merge change 26169 into eclair
Merge commit 'ca1a265cc3a44590b685cad2d5d081565c684d83'

* commit 'ca1a265cc3a44590b685cad2d5d081565c684d83':
  Dock event overrides SCREEN_ORIENTATION_NOSENSOR so Home will rotate in the car dock.
2009-09-21 11:24:14 -07:00
Android (Google) Code Review
aa6a474309 Merge change 26169 into eclair
* changes:
  Dock event overrides SCREEN_ORIENTATION_NOSENSOR so Home will rotate in the car dock.
2009-09-21 14:09:57 -04:00
Jinghui Guo
9577a85dfd am d92636c5: Handle Emergency Callback Mode and Airplane Mode interactions
Merge commit 'd92636c584d2c91dd343015b3f80c2373a462e1d'

* commit 'd92636c584d2c91dd343015b3f80c2373a462e1d':
  Handle Emergency Callback Mode and Airplane Mode interactions
2009-09-21 10:58:20 -07:00