Commit Graph

268 Commits

Author SHA1 Message Date
Daniel Sandler
75cbfcdf36 Prevent NPE in recent apps dialog.
Bug: 2284111
2009-12-08 14:06:31 -05:00
Daniel Sandler
e124693251 Move emergency call button to top-right when no SIM.
Also allows lockscreen's toasts to restore the previous text
in the status TextView, which is necessary for this UI. Also
added color to the toasts (another UI ask).

In conjunction with change Ifea65fb9.

http://b/2260798
2009-12-07 15:53:35 -05:00
Dianne Hackborn
0347b09958 am 4dbf514c: Fix issue #2302336: System dialogs are not being given a layer
Merge commit '4dbf514c6c73832630e4c9bb068cf950ff044a34' into eclair-mr2

* commit '4dbf514c6c73832630e4c9bb068cf950ff044a34':
  Fix issue #2302336: System dialogs are not being given a layer
2009-12-03 12:28:53 -08:00
Dianne Hackborn
6a294ce7a5 Fix issue #2302336: System dialogs are not being given a layer
Define a new dedicated layer for system dialogs and use it.

Change-Id: Iaa8b7a48617ae37ea3e83c9f77b1d357f750f5bc
2009-12-03 11:37:44 -08:00
Mike Lockwood
96eac19abd am db0ec648: Merge change I85572973 into eclair
Merge commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f' into eclair-mr2

* commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f':
  Do not show keyguard if screen is turned off by proximity sensor.
2009-12-03 11:12:04 -08:00
Android (Google) Code Review
ef469c337a Merge change I85572973 into eclair
* changes:
  Do not show keyguard if screen is turned off by proximity sensor.
2009-12-03 11:00:06 -08:00
Daniel Sandler
646ddf4e07 am 30429ac6: Tiny code fix required for http://b/2260798 .
Merge commit '30429ac60e512453d4d7af212788819754b24691' into eclair-mr2

* commit '30429ac60e512453d4d7af212788819754b24691':
  Tiny code fix required for http://b/2260798 .
2009-12-03 08:39:35 -08:00
Daniel Sandler
15620ce415 Tiny code fix required for http://b/2260798 .
(We were trying to place the emergency call button beneath a
layout object that no longer exists, which is why it was
showing up at the top of the screen on top of other things.)

Change-Id: I10b8b90f0e5923edf5d672b822ee8da6e28933d2
2009-12-03 11:17:09 -05:00
Mike Lockwood
ce27776887 Do not show keyguard if screen is turned off by proximity sensor.
Fixes bug b/2300622 (Proximity sensor always blows up the lock screen while in call)

Change-Id: I85572973c142a72b3bba0bb032e5d2f710b5e36c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-03 08:41:44 -05:00
Mike Lockwood
2f8a5cd29f am 15ee33d4: Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."
Merge commit '15ee33d4d475dc31709808a64120e56d555e992e' into eclair-mr2

* commit '15ee33d4d475dc31709808a64120e56d555e992e':
  Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."
2009-12-02 11:36:05 -08:00
Mike Lockwood
5d258b6b17 Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."
We have a better solution for this in the Phone app.
This reverts commit b684251e8f1e85ea9483af2b80bc92f0fd8ded1c.
2009-12-02 13:50:45 -05:00
Mike Lockwood
4c8156e615 am e7ef4241: Fix volume keys when in-call and screen is off due to proximity sensor.
Merge commit 'e7ef42416088235d9e220e3b031d4f612f436a06' into eclair-mr2

* commit 'e7ef42416088235d9e220e3b031d4f612f436a06':
  Fix volume keys when in-call and screen is off due to proximity sensor.
2009-12-02 09:49:45 -08:00
Mike Lockwood
fc377dfc37 am b684251e: Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.
Merge commit 'b684251e8f1e85ea9483af2b80bc92f0fd8ded1c' into eclair-mr2

* commit 'b684251e8f1e85ea9483af2b80bc92f0fd8ded1c':
  Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.
2009-12-02 09:49:26 -08:00
Mike Lockwood
99ff0a8290 Fix volume keys when in-call and screen is off due to proximity sensor.
Fixes bug b/2297262 (Volume keys on passion don't work while in-call and phone is pressed to my ear)

Change-Id: I775daa24295482000f87273d1f84dd796fb0f4eb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-02 01:56:24 -05:00
Mike Lockwood
3e42c35f7a Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.
Fixes b/2297221 ('Add call' button has no action, if call is answered on lockpattern screen)

Change-Id: I6df8f64dedc4d2d8b02f746213c7b1b336d6560e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-02 01:56:13 -05:00
Mike Lockwood
ea5ea98eb1 resolved conflicts for merge of b64c72df to eclair-mr2
Change-Id: If3c6a28281b08464fd3f24e752f5e07f6f8a420e
2009-12-01 21:21:06 -05:00
Mike Lockwood
f791330dd1 Remove some unused window manager methods.
Change-Id: Idd23ea4adb7328781ea81c45d61392b51dee1374
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-28 22:27:48 -05:00
Mike Lockwood
c72b15f2ee Fix bug 2290852: Screen wakes up in my pocket while listening to music
When the screen is off keyguard is open but hidden by another activity
make sure that non-waking events like volume key or track ball press
do not turn the screen back on.

Change-Id: Ie6b191360b903b54388a6f65680ccc3264a51dd8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-28 20:58:22 -05:00
Jim Miller
4ea72923ff am 760d266a: Merge change I9987ba41 into eclair
Merge commit '760d266a4195db5f3f3dee94be9e0c020cf4051f' into eclair-mr2

* commit '760d266a4195db5f3f3dee94be9e0c020cf4051f':
  Fix 2270597: Add callback to watch ringer state and update lock screen UI when it changes.
2009-11-24 14:04:13 -08:00
Android (Google) Code Review
847669031a Merge change I9987ba41 into eclair
* changes:
  Fix 2270597: Add callback to watch ringer state and update lock screen UI when it changes.
2009-11-24 14:00:23 -08:00
Joe Onorato
067bb63f39 am 5da799e0: Bug 2248173 - Tell listeners to ACTION_CLOSE_SYSTEM_DIALOGS that we\'re doing so because of the home key.
Merge commit '5da799e012cc4427a4f656e2416bcd73c22acd83' into eclair-mr2

* commit '5da799e012cc4427a4f656e2416bcd73c22acd83':
  Bug 2248173 - Tell listeners to ACTION_CLOSE_SYSTEM_DIALOGS that we're doing so because of the home
2009-11-24 13:57:33 -08:00
Joe Onorato
f275f0c0f9 Bug 2248173 - Tell listeners to ACTION_CLOSE_SYSTEM_DIALOGS that we're doing so because of the home
key.
2009-11-24 16:11:13 -05:00
Jim Miller
47088bbbef Fix 2270597: Add callback to watch ringer state and update lock screen UI when it changes. 2009-11-24 00:48:35 -08:00
Mike Lockwood
b4e2d1c2aa END_BUTTON_BEHAVIOR setting should affect end call button only (not power button)
Fixes b/2212852 ("end button behavior" in spare parts doesn't work)

Change-Id: Ia17f37ad82b17f3a0e1ceb1ab7a0211b1d3ad8be
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-23 15:54:10 -05:00
Mike Lockwood
5f892c130a When keyguard is active, only allow the status bar to be opened if it is insecure and covered by another window.
Fixes b/2215112 (When screen wakes to Playback screen, Notification Bar is active)

Change-Id: I43a8574259788d983c30b1a22e5bfc4e95d09bee
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-20 08:03:32 -05:00
Dianne Hackborn
4265f7f14b am eb8e950e: Fix issue #2264162 and #2252436: Now playing screens problems when locked.
Merge commit 'eb8e950ea446ce6a1b83c565718217d944dd3557' into eclair-mr2

* commit 'eb8e950ea446ce6a1b83c565718217d944dd3557':
  Fix issue #2264162 and #2252436: Now playing screens problems when locked.
2009-11-18 13:08:51 -08:00
Dianne Hackborn
4e3fd56a5a am bbacc28f: Fix issue #2249821: Unable to start passion in safe mode
Merge commit 'bbacc28ff4ea2892ae4c0a0d9a639a960a4dd93a' into eclair-mr2

* commit 'bbacc28ff4ea2892ae4c0a0d9a639a960a4dd93a':
  Fix issue #2249821: Unable to start passion in safe mode
2009-11-18 11:48:27 -08:00
Dianne Hackborn
9dc06cc2a8 Fix issue #2264162 and #2252436: Now playing screens problems when locked.
We now treat the case where the lock screen is hidden to be basically the same as
it being removed for purposes of event dispatching and other things in the policy.

Change-Id: I7386220594ad6e89e1493d643b1f0603663ae72a
2009-11-18 11:47:24 -08:00
Dianne Hackborn
a8730f985f Fix issue #2249821: Unable to start passion in safe mode
Change-Id: I4320b38ce0cda4dca560c07bc0378b507032598a
2009-11-18 11:42:38 -08:00
Mike Lockwood
d7fa591521 am 129b69f3: Handle KeyguardViewMediator.setHidden() asynchronously to avoid deadlocks.
Merge commit '129b69f368bd30cb1caa75cf13961b5b44982d4b' into eclair-mr2

* commit '129b69f368bd30cb1caa75cf13961b5b44982d4b':
  Handle KeyguardViewMediator.setHidden() asynchronously to avoid deadlocks.
2009-11-17 18:07:42 -08:00
Mike Lockwood
9200a3987e Handle KeyguardViewMediator.setHidden() asynchronously to avoid deadlocks.
Fixes b/2267046 (Could not shut off alarm; then device reboot)

Change-Id: Id8f3e24edc5e1242a39c5d43bd549b5cb05abb36
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-17 20:25:58 -05:00
Jim Miller
0fd1f53cdf am 263bdabc: Fix 2209086: Fix visual glitches in lockscreen.
Merge commit '263bdabc8770fed981bb52f8e3ff4110dfefc0e1' into eclair-mr2

* commit '263bdabc8770fed981bb52f8e3ff4110dfefc0e1':
  Fix 2209086: Fix visual glitches in lockscreen.
2009-11-17 00:12:23 -08:00
Jim Miller
5425930bd1 Fix 2209086: Fix visual glitches in lockscreen.
Call new setHoldAfterTrigger() method to enable feature added in https://android-git.corp.google.com/g/#change,33380.
2009-11-16 23:13:53 -08:00
Jim Miller
5abfc111a2 am a7a4e518: Fix 2209086: Fix missing callback that was preventing right tab bar text from updating.
Merge commit 'a7a4e518a61dc09e281d1072fca8ccca864d289a' into eclair-mr2

* commit 'a7a4e518a61dc09e281d1072fca8ccca864d289a':
  Fix 2209086: Fix missing callback that was preventing right tab bar text from updating.
2009-11-15 14:51:16 -08:00
Daniel Sandler
9db384c789 am f31bb1af: Fix a race condition determining whether password fallback mode is allowed.
Merge commit 'f31bb1aff8005525749df7b519fd60ef08157bfc' into eclair-mr2

* commit 'f31bb1aff8005525749df7b519fd60ef08157bfc':
  Fix a race condition determining whether password fallback mode is allowed.
2009-11-15 14:49:47 -08:00
Jim Miller
c119f1299b Fix 2209086: Fix missing callback that was preventing right tab bar text from updating. 2009-11-15 13:35:49 -08:00
Daniel Sandler
16541e4f88 Fix a race condition determining whether password fallback mode is allowed.
The fix is in LockPatternKeyguardView, whose constructor was
firing off an asynchronous request to the AccountManager to
find out about the specifics of the account on the device.
(If it's SAML, we don't have the password in cleartext and
therefore can't use it to unlock.) Unfortunately, if the
AccountManager responds too quickly, we get the answer (in
LPKV.run()) before the UnlockScreen has even been
instantiated (later in LPKV's ctor).

The fix is to create the unlock screen first and *then* ping
the AccountManager for details.

Bug: http://b/2216308
Change-Id: Iedc84675c0ab8a001d062d806e2bee7ed1a29758
2009-11-13 17:10:46 -08:00
Mike Lockwood
f885e1cdef am 1d697192: Merge change Icdb3d036 into eclair
Merge commit '1d697192404e3f556b8e87c9f048f16cb3256608' into eclair-mr2

* commit '1d697192404e3f556b8e87c9f048f16cb3256608':
  Don't trigger user activity in screenOnStoppedLw() if the screen is off.
2009-11-13 15:20:00 -08:00
Android (Google) Code Review
a40bd508e6 Merge change Icdb3d036 into eclair
* changes:
  Don't trigger user activity in screenOnStoppedLw() if the screen is off.
2009-11-13 15:18:17 -08:00
Mike Lockwood
47e5023eea Don't trigger user activity in screenOnStoppedLw() if the screen is off.
Fixes b/2260437 (device wakes itself back up when camera is last application running)

Change-Id: Icdb3d0369df752a3838fa8e58c7a4bb08efe00a6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-13 18:06:22 -05:00
Daniel Sandler
a47fc99553 am c5eb3fa4: Use new date format for lock screen.
Merge commit 'c5eb3fa4bdce22c15f4fef74a51a293399f9a980' into eclair-mr2

* commit 'c5eb3fa4bdce22c15f4fef74a51a293399f9a980':
  Use new date format for lock screen.
2009-11-13 14:59:17 -08:00
Daniel Sandler
6f2da1e578 Use new date format for lock screen.
Fixes http://b/issue?id=2247356 (well, it will once the
format is updated to include the full day-of-week).

Change-Id: Iaafbc60b7ff3edbfee7208052ecc1575cb8c226c
2009-11-13 14:17:21 -08:00
Daniel Sandler
1d7ed54139 am 96757ff1: Update LockScreen/UnlockScreen for new UX designs.
Merge commit '96757ff1498345bef8735791da1ca147b2247f13' into eclair-mr2

* commit '96757ff1498345bef8735791da1ca147b2247f13':
  Update LockScreen/UnlockScreen for new UX designs.
2009-11-12 10:38:18 -08:00
Daniel Sandler
8633ea9b7a Update LockScreen/UnlockScreen for new UX designs.
This change depends upon relevant layout changes in
frameworks/base/core/res/res.
2009-11-12 02:05:38 -08:00
Jim Miller
56e5fbecb1 am 07fba524: Fix 2209086: Update sound states in LockScreen.
Merge commit '07fba524a1dfa1a53b417a3e59c1a4797c49a9eb' into eclair-mr2

* commit '07fba524a1dfa1a53b417a3e59c1a4797c49a9eb':
  Fix 2209086: Update sound states in LockScreen.
2009-11-11 20:16:53 -08:00
Jim Miller
421db0f099 Fix 2209086: Update sound states in LockScreen. 2009-11-11 18:08:06 -08:00
Jim Miller
593b6a2060 am 9ea1107d: Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Merge commit '9ea1107df165518909883429fb5cf20fce7a81e6' into eclair-mr2

* commit '9ea1107df165518909883429fb5cf20fce7a81e6':
  Fix for 2209086:  Initial pass at new SlidingTab widget and integration into LockScreen.
2009-11-11 17:13:21 -08:00
Jim Miller
80080e54ef Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Tested:
    - unlock and mute/unmute

Not working:
	- highlighting on right tab.
2009-11-11 02:44:38 -08:00
Mike Lockwood
e9304f3b41 am c6e1493f: Restore short screen timeout when keyguard is unhidden.
Merge commit 'c6e1493f164d62f7dc99a5a9df6a064c054b219f' into eclair-mr2

* commit 'c6e1493f164d62f7dc99a5a9df6a064c054b219f':
  Restore short screen timeout when keyguard is unhidden.
2009-11-10 07:14:29 -08:00
Mike Lockwood
b17b2fbcef Restore short screen timeout when keyguard is unhidden.
This is part of a fix for bug b/2248320 (Lock screen does not time out after 5 seconds, after call-decline)

Change-Id: I9ad8cc54fe50d8c9862eec27341fabbd0e871bdd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-10 09:56:35 -05:00