OSDN Git Service
Daniel Sandler [Thu, 3 Dec 2009 16:44:36 +0000 (08:44 -0800)]
am
c4663ee2: am
30429ac6: Tiny code fix required for b/
2260798 .
Merge commit '
c4663ee241328180131fd1c44f4c3e11c3e43e71' into eclair-mr2-plus-aosp
* commit '
c4663ee241328180131fd1c44f4c3e11c3e43e71':
Tiny code fix required for http://b/
2260798 .
Daniel Sandler [Thu, 3 Dec 2009 16:39:35 +0000 (08:39 -0800)]
am
30429ac6: Tiny code fix required for b/
2260798 .
Merge commit '
30429ac60e512453d4d7af212788819754b24691' into eclair-mr2
* commit '
30429ac60e512453d4d7af212788819754b24691':
Tiny code fix required for http://b/
2260798 .
Daniel Sandler [Thu, 3 Dec 2009 16:17:09 +0000 (11:17 -0500)]
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
Mike Lockwood [Wed, 2 Dec 2009 19:41:17 +0000 (11:41 -0800)]
am
6f277195: am
15ee33d4: Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."
Merge commit '
6f277195b9434c516facd33f684223a7639de0c5' into eclair-mr2-plus-aosp
* commit '
6f277195b9434c516facd33f684223a7639de0c5':
Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."
Mike Lockwood [Wed, 2 Dec 2009 19:36:05 +0000 (11:36 -0800)]
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."
Mike Lockwood [Wed, 2 Dec 2009 18:50:45 +0000 (13:50 -0500)]
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.
Mike Lockwood [Wed, 2 Dec 2009 17:55:12 +0000 (09:55 -0800)]
am
70d1fe38: am
e7ef4241: Fix volume keys when in-call and screen is off due to proximity sensor.
Merge commit '
70d1fe383e3f023e71889345ffd9b2fa921495b4' into eclair-mr2-plus-aosp
* commit '
70d1fe383e3f023e71889345ffd9b2fa921495b4':
Fix volume keys when in-call and screen is off due to proximity sensor.
Mike Lockwood [Wed, 2 Dec 2009 17:55:09 +0000 (09:55 -0800)]
am
a492c9b0: am
b684251e: Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.
Merge commit '
a492c9b07dc623c6c7beba7f9a90866053bf24f9' into eclair-mr2-plus-aosp
* commit '
a492c9b07dc623c6c7beba7f9a90866053bf24f9':
Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.
Mike Lockwood [Wed, 2 Dec 2009 17:49:45 +0000 (09:49 -0800)]
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.
Mike Lockwood [Wed, 2 Dec 2009 17:49:26 +0000 (09:49 -0800)]
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.
Mike Lockwood [Wed, 2 Dec 2009 06:37:38 +0000 (01:37 -0500)]
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>
Mike Lockwood [Wed, 2 Dec 2009 06:15:27 +0000 (01:15 -0500)]
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>
Mike Lockwood [Wed, 2 Dec 2009 02:31:12 +0000 (18:31 -0800)]
am
90bca755: resolved conflicts for merge of
b64c72df to eclair-mr2
Merge commit '
90bca75513297c2e851638f06ecc821ce75fcbe5' into eclair-mr2-plus-aosp
* commit '
90bca75513297c2e851638f06ecc821ce75fcbe5':
Fix bug
2290852: Screen wakes up in my pocket while listening to music
Mike Lockwood [Wed, 2 Dec 2009 02:21:06 +0000 (21:21 -0500)]
resolved conflicts for merge of
b64c72df to eclair-mr2
Change-Id: If3c6a28281b08464fd3f24e752f5e07f6f8a420e
Mike Lockwood [Mon, 30 Nov 2009 18:59:35 +0000 (10:59 -0800)]
am
55039bde: Remove some unused window manager methods.
Merge commit '
55039bde3ff8a76a51410b23257f71496bbdbde5' into eclair-mr2-plus-aosp
* commit '
55039bde3ff8a76a51410b23257f71496bbdbde5':
Remove some unused window manager methods.
Jim Miller [Mon, 30 Nov 2009 18:59:32 +0000 (10:59 -0800)]
am
5736e960: am
760d266a: Merge change I9987ba41 into eclair
Merge commit '
5736e96001e3c2575117505a8b8891577b61c782' into eclair-mr2-plus-aosp
* commit '
5736e96001e3c2575117505a8b8891577b61c782':
Fix
2270597: Add callback to watch ringer state and update lock screen UI when it changes.
Mike Lockwood [Sun, 29 Nov 2009 03:27:10 +0000 (22:27 -0500)]
Remove some unused window manager methods.
Change-Id: Idd23ea4adb7328781ea81c45d61392b51dee1374
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Sun, 29 Nov 2009 01:58:22 +0000 (20:58 -0500)]
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>
Jim Miller [Tue, 24 Nov 2009 22:04:13 +0000 (14:04 -0800)]
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.
Joe Onorato [Tue, 24 Nov 2009 22:00:38 +0000 (14:00 -0800)]
am
6827ece2: am
5da799e0: Bug
2248173 - Tell listeners to ACTION_CLOSE_SYSTEM_DIALOGS that we\'re doing so because of the home key.
Merge commit '
6827ece2767dc17995f43cb7d70338dcbbbb05f7' into eclair-mr2-plus-aosp
* commit '
6827ece2767dc17995f43cb7d70338dcbbbb05f7':
Bug
2248173 - Tell listeners to ACTION_CLOSE_SYSTEM_DIALOGS that we're doing so because of the home
Android (Google) Code Review [Tue, 24 Nov 2009 22:00:23 +0000 (14:00 -0800)]
Merge change I9987ba41 into eclair
* changes:
Fix
2270597: Add callback to watch ringer state and update lock screen UI when it changes.
Joe Onorato [Tue, 24 Nov 2009 21:57:33 +0000 (13:57 -0800)]
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
Joe Onorato [Tue, 24 Nov 2009 21:11:13 +0000 (16:11 -0500)]
Bug
2248173 - Tell listeners to ACTION_CLOSE_SYSTEM_DIALOGS that we're doing so because of the home
key.
Jim Miller [Tue, 24 Nov 2009 08:40:16 +0000 (00:40 -0800)]
Fix
2270597: Add callback to watch ringer state and update lock screen UI when it changes.
Mike Lockwood [Mon, 23 Nov 2009 20:59:06 +0000 (12:59 -0800)]
am
aab87690: END_BUTTON_BEHAVIOR setting should affect end call button only (not power button)
Merge commit '
aab8769005ed52a3e82aedf8d87c902d762bdb24' into eclair-mr2-plus-aosp
* commit '
aab8769005ed52a3e82aedf8d87c902d762bdb24':
END_BUTTON_BEHAVIOR setting should affect end call button only (not power button)
Mike Lockwood [Mon, 23 Nov 2009 20:54:10 +0000 (15:54 -0500)]
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>
Mike Lockwood [Fri, 20 Nov 2009 17:44:28 +0000 (09:44 -0800)]
am
6b72e9b3: When keyguard is active, only allow the status bar to be opened if it is insecure and covered by another window.
Merge commit '
6b72e9b39642fdff5aef74cd7df2fbd00b9f2257' into eclair-mr2-plus-aosp
* commit '
6b72e9b39642fdff5aef74cd7df2fbd00b9f2257':
When keyguard is active, only allow the status bar to be opened if it is insecure and covered by another window.
Mike Lockwood [Fri, 20 Nov 2009 04:39:13 +0000 (23:39 -0500)]
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>
Dianne Hackborn [Wed, 18 Nov 2009 21:13:06 +0000 (13:13 -0800)]
am
9e15ab77: am
eb8e950e: Fix issue #
2264162 and #
2252436: Now playing screens problems when locked.
Merge commit '
9e15ab773940a3e1315cd0cce6bf8e394ce2c3f6' into eclair-mr2-plus-aosp
* commit '
9e15ab773940a3e1315cd0cce6bf8e394ce2c3f6':
Fix issue #
2264162 and #
2252436: Now playing screens problems when locked.
Dianne Hackborn [Wed, 18 Nov 2009 21:08:51 +0000 (13:08 -0800)]
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.
Dianne Hackborn [Wed, 18 Nov 2009 19:53:34 +0000 (11:53 -0800)]
am
9e3c88c3: am
bbacc28f: Fix issue #
2249821: Unable to start passion in safe mode
Merge commit '
9e3c88c31c4a59e3926ac19e97693e6b6e4e6de1' into eclair-mr2-plus-aosp
* commit '
9e3c88c31c4a59e3926ac19e97693e6b6e4e6de1':
Fix issue #
2249821: Unable to start passion in safe mode
Mike Lockwood [Wed, 18 Nov 2009 19:53:31 +0000 (11:53 -0800)]
am
c40f6bf4: am
129b69f3: Handle KeyguardViewMediator.setHidden() asynchronously to avoid deadlocks.
Merge commit '
c40f6bf47ed37ff6612da8999968877382502579' into eclair-mr2-plus-aosp
* commit '
c40f6bf47ed37ff6612da8999968877382502579':
Handle KeyguardViewMediator.setHidden() asynchronously to avoid deadlocks.
Dianne Hackborn [Wed, 18 Nov 2009 19:48:27 +0000 (11:48 -0800)]
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
Dianne Hackborn [Wed, 18 Nov 2009 02:19:23 +0000 (18:19 -0800)]
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
Dianne Hackborn [Tue, 17 Nov 2009 23:53:36 +0000 (15:53 -0800)]
Fix issue #
2249821: Unable to start passion in safe mode
Change-Id: I4320b38ce0cda4dca560c07bc0378b507032598a
Mike Lockwood [Wed, 18 Nov 2009 02:07:42 +0000 (18:07 -0800)]
am
129b69f3: Handle KeyguardViewMediator.setHidden() asynchronously to avoid deadlocks.
Merge commit '
129b69f368bd30cb1caa75cf13961b5b44982d4b' into eclair-mr2
* commit '
129b69f368bd30cb1caa75cf13961b5b44982d4b':
Handle KeyguardViewMediator.setHidden() asynchronously to avoid deadlocks.
Mike Lockwood [Wed, 18 Nov 2009 01:25:58 +0000 (20:25 -0500)]
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>
Jim Miller [Tue, 17 Nov 2009 08:14:21 +0000 (00:14 -0800)]
am
86d86043: am
263bdabc: Fix
2209086: Fix visual glitches in lockscreen.
Merge commit '
86d860439a34ec8001cbedf0f5eb1a7f162eb812' into eclair-mr2-plus-aosp
* commit '
86d860439a34ec8001cbedf0f5eb1a7f162eb812':
Fix
2209086: Fix visual glitches in lockscreen.
Jim Miller [Tue, 17 Nov 2009 08:12:23 +0000 (00:12 -0800)]
am
263bdabc: Fix
2209086: Fix visual glitches in lockscreen.
Merge commit '
263bdabc8770fed981bb52f8e3ff4110dfefc0e1' into eclair-mr2
* commit '
263bdabc8770fed981bb52f8e3ff4110dfefc0e1':
Fix
2209086: Fix visual glitches in lockscreen.
Jim Miller [Tue, 17 Nov 2009 07:11:42 +0000 (23:11 -0800)]
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.
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:58:42 +0000 (14:58 -0800)]
merge from open-source master
Jim Miller [Sun, 15 Nov 2009 22:55:51 +0000 (14:55 -0800)]
am
3b378c92: am
a7a4e518: Fix
2209086: Fix missing callback that was preventing right tab bar text from updating.
Merge commit '
3b378c925560eb3f65a93d66fa8cb69582a6ac6a' into eclair-mr2-plus-aosp
* commit '
3b378c925560eb3f65a93d66fa8cb69582a6ac6a':
Fix
2209086: Fix missing callback that was preventing right tab bar text from updating.
Daniel Sandler [Sun, 15 Nov 2009 22:55:48 +0000 (14:55 -0800)]
am
5124afbc: am
f31bb1af: Fix a race condition determining whether password fallback mode is allowed.
Merge commit '
5124afbc66360234a6b9e9e4c50622fd3e0224e1' into eclair-mr2-plus-aosp
* commit '
5124afbc66360234a6b9e9e4c50622fd3e0224e1':
Fix a race condition determining whether password fallback mode is allowed.
Jim Miller [Sun, 15 Nov 2009 22:51:16 +0000 (14:51 -0800)]
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.
Daniel Sandler [Sun, 15 Nov 2009 22:49:47 +0000 (14:49 -0800)]
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.
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:06:32 +0000 (14:06 -0800)]
merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
Jim Miller [Sat, 14 Nov 2009 10:31:09 +0000 (02:31 -0800)]
Fix
2209086: Fix missing callback that was preventing right tab bar text from updating.
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:06:39 +0000 (12:06 -0800)]
merge from eclair
Daniel Sandler [Sat, 14 Nov 2009 01:07:50 +0000 (17:07 -0800)]
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
Mike Lockwood [Fri, 13 Nov 2009 23:23:15 +0000 (15:23 -0800)]
am
28d2c230: am
1d697192: Merge change Icdb3d036 into eclair
Merge commit '
28d2c23065e33c148513affd636ab6ee047d6350' into eclair-mr2-plus-aosp
* commit '
28d2c23065e33c148513affd636ab6ee047d6350':
Don't trigger user activity in screenOnStoppedLw() if the screen is off.
Mike Lockwood [Fri, 13 Nov 2009 23:20:00 +0000 (15:20 -0800)]
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.
Android (Google) Code Review [Fri, 13 Nov 2009 23:18:17 +0000 (15:18 -0800)]
Merge change Icdb3d036 into eclair
* changes:
Don't trigger user activity in screenOnStoppedLw() if the screen is off.
Mike Lockwood [Fri, 13 Nov 2009 23:06:22 +0000 (18:06 -0500)]
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>
Daniel Sandler [Fri, 13 Nov 2009 23:03:28 +0000 (15:03 -0800)]
am
df54392f: am
c5eb3fa4: Use new date format for lock screen.
Merge commit '
df54392f846881654a73c8b287cee3c5f299d31e' into eclair-mr2-plus-aosp
* commit '
df54392f846881654a73c8b287cee3c5f299d31e':
Use new date format for lock screen.
Daniel Sandler [Fri, 13 Nov 2009 22:59:17 +0000 (14:59 -0800)]
am
c5eb3fa4: Use new date format for lock screen.
Merge commit '
c5eb3fa4bdce22c15f4fef74a51a293399f9a980' into eclair-mr2
* commit '
c5eb3fa4bdce22c15f4fef74a51a293399f9a980':
Use new date format for lock screen.
Daniel Sandler [Fri, 13 Nov 2009 22:17:21 +0000 (14:17 -0800)]
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
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:46:07 +0000 (18:46 -0800)]
eclair snapshot
Daniel Sandler [Thu, 12 Nov 2009 18:41:51 +0000 (10:41 -0800)]
am
aacaf48e: am
96757ff1: Update LockScreen/UnlockScreen for new UX designs.
Merge commit '
aacaf48e4d5413e8e6357cdab130f3758c0d79fc' into eclair-mr2-plus-aosp
* commit '
aacaf48e4d5413e8e6357cdab130f3758c0d79fc':
Update LockScreen/UnlockScreen for new UX designs.
Daniel Sandler [Thu, 12 Nov 2009 18:38:18 +0000 (10:38 -0800)]
am
96757ff1: Update LockScreen/UnlockScreen for new UX designs.
Merge commit '
96757ff1498345bef8735791da1ca147b2247f13' into eclair-mr2
* commit '
96757ff1498345bef8735791da1ca147b2247f13':
Update LockScreen/UnlockScreen for new UX designs.
Daniel Sandler [Thu, 12 Nov 2009 06:23:36 +0000 (22:23 -0800)]
Update LockScreen/UnlockScreen for new UX designs.
This change depends upon relevant layout changes in
frameworks/base/core/res/res.
Jim Miller [Thu, 12 Nov 2009 04:21:00 +0000 (20:21 -0800)]
am
9191a181: am
07fba524: Fix
2209086: Update sound states in LockScreen.
Merge commit '
9191a181cceca9030250dd93b0734ac108e438d6' into eclair-mr2-plus-aosp
* commit '
9191a181cceca9030250dd93b0734ac108e438d6':
Fix
2209086: Update sound states in LockScreen.
Jim Miller [Thu, 12 Nov 2009 04:16:53 +0000 (20:16 -0800)]
am
07fba524: Fix
2209086: Update sound states in LockScreen.
Merge commit '
07fba524a1dfa1a53b417a3e59c1a4797c49a9eb' into eclair-mr2
* commit '
07fba524a1dfa1a53b417a3e59c1a4797c49a9eb':
Fix
2209086: Update sound states in LockScreen.
Jim Miller [Thu, 12 Nov 2009 02:06:35 +0000 (18:06 -0800)]
Fix
2209086: Update sound states in LockScreen.
Jim Miller [Thu, 12 Nov 2009 01:24:57 +0000 (17:24 -0800)]
am
387c66eb: am
9ea1107d: Fix for
2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Merge commit '
387c66eb290a65592cc5f8bfd2ad6a609be95b16' into eclair-mr2-plus-aosp
* commit '
387c66eb290a65592cc5f8bfd2ad6a609be95b16':
Fix for
2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Jim Miller [Thu, 12 Nov 2009 01:13:21 +0000 (17:13 -0800)]
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.
Jim Miller [Wed, 11 Nov 2009 05:44:58 +0000 (21:44 -0800)]
Fix for
2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Tested:
- unlock and mute/unmute
Not working:
- highlighting on right tab.
Mike Lockwood [Tue, 10 Nov 2009 15:17:08 +0000 (07:17 -0800)]
am
52e3b17e: am
c6e1493f: Restore short screen timeout when keyguard is unhidden.
Merge commit '
52e3b17e5f913e8f2fcb979ea38b6cb6aa3d0015' into eclair-mr2-plus-aosp
* commit '
52e3b17e5f913e8f2fcb979ea38b6cb6aa3d0015':
Restore short screen timeout when keyguard is unhidden.
Mike Lockwood [Tue, 10 Nov 2009 15:14:29 +0000 (07:14 -0800)]
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.
Mike Lockwood [Mon, 9 Nov 2009 21:01:37 +0000 (16:01 -0500)]
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>
Mike Lockwood [Mon, 9 Nov 2009 20:14:48 +0000 (12:14 -0800)]
am
1f3306c4: am
68569321: Do not apply keyguard\'s short timeout when the keyguard is hidden by another window.
Merge commit '
1f3306c4ca3bc6d291c6634ba9c19c801b46b05d' into eclair-mr2-plus-aosp
* commit '
1f3306c4ca3bc6d291c6634ba9c19c801b46b05d':
Do not apply keyguard's short timeout when the keyguard is hidden by another window.
Mike Lockwood [Mon, 9 Nov 2009 20:04:02 +0000 (12:04 -0800)]
am
68569321: Do not apply keyguard\'s short timeout when the keyguard is hidden by another window.
Merge commit '
68569321db63908a8531ff1b8ae7f9a3610d3337' into eclair-mr2
* commit '
68569321db63908a8531ff1b8ae7f9a3610d3337':
Do not apply keyguard's short timeout when the keyguard is hidden by another window.
Mike Lockwood [Sun, 8 Nov 2009 05:33:23 +0000 (00:33 -0500)]
Do not apply keyguard's short timeout when the keyguard is hidden by another window.
Fixes bug b/
2215852 (Music player doesn't grab screen wakelock)
Change-Id: I6c402cdb460d216314ad72e37dbcdc7e19518941
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jim Miller [Tue, 3 Nov 2009 23:10:55 +0000 (15:10 -0800)]
am
3f5c8c99: am
4ca21590: Fix
2129239: Add an override method for enabling the menu key on signed builds.
Merge commit '
3f5c8c99e20b1b357551b062fad6d5885bc11c89' into eclair-mr2-plus-aosp
* commit '
3f5c8c99e20b1b357551b062fad6d5885bc11c89':
Fix
2129239: Add an override method for enabling the menu key on signed builds.
Jim Miller [Tue, 3 Nov 2009 23:05:08 +0000 (15:05 -0800)]
am
4ca21590: Fix
2129239: Add an override method for enabling the menu key on signed builds.
Merge commit '
4ca21590d8b5615e6ec302c41868a40417c1d33a' into eclair-mr2
* commit '
4ca21590d8b5615e6ec302c41868a40417c1d33a':
Fix
2129239: Add an override method for enabling the menu key on signed builds.
Jim Miller [Tue, 3 Nov 2009 21:56:39 +0000 (13:56 -0800)]
Fix
2129239: Add an override method for enabling the menu key on signed builds.
There are now 3 ways to enable the menu key:
- by config file (config_disableMenuKeyInLockScreen)
- by 'adb shell setprop ro.monkey=1' (for automated testing on userdebug builds)
- by creating file '/data/local/enable_menu_key (for automated testing on signed user builds)
Security: this only affects the insecure lock screen (not lock pattern) which is generally enabled.
Jim Miller [Fri, 30 Oct 2009 01:20:09 +0000 (18:20 -0700)]
am
52a0162b: am
7526eb40: Merge change I13ea5a5a into eclair
Merge commit '
52a0162bfb08faaf93668f80fd66d269414f9eab' into eclair-mr2-plus-aosp
* commit '
52a0162bfb08faaf93668f80fd66d269414f9eab':
Fix
2201413: Enable login on Passion when there's no SIM
Jim Miller [Fri, 30 Oct 2009 01:20:04 +0000 (18:20 -0700)]
am
05d7619d: am
3179826b: Fix for
2201954: Disable haptic feedback for hard keys while keyguard is showing
Merge commit '
05d7619df5bc255ef8288bb63989995f4a98b50b' into eclair-mr2-plus-aosp
* commit '
05d7619df5bc255ef8288bb63989995f4a98b50b':
Fix for
2201954: Disable haptic feedback for hard keys while keyguard is showing
Mike Lockwood [Fri, 30 Oct 2009 01:19:59 +0000 (18:19 -0700)]
am
20618b1f: am
b17c8696: When phone is ringing, power button should only mute the ringer, not hang up.
Merge commit '
20618b1f798e5ead160e6be8f7d82117a26cf7cc' into eclair-mr2-plus-aosp
* commit '
20618b1f798e5ead160e6be8f7d82117a26cf7cc':
When phone is ringing, power button should only mute the ringer, not hang up.
Mike Lockwood [Fri, 30 Oct 2009 01:19:53 +0000 (18:19 -0700)]
am
ec7dab76: am
146ef723: When phone is ringing, power button should hang up phone in addition to turning off the screen.
Merge commit '
ec7dab76d41f07d88fc3e8932c430ef7d50fb5a7' into eclair-mr2-plus-aosp
* commit '
ec7dab76d41f07d88fc3e8932c430ef7d50fb5a7':
When phone is ringing, power button should hang up phone in addition to turning off the screen.
Jim Miller [Fri, 30 Oct 2009 01:08:12 +0000 (18:08 -0700)]
am
7526eb40: Merge change I13ea5a5a into eclair
Merge commit '
7526eb404a652e2ca9beddd79eb672a7f1069574' into eclair-mr2
* commit '
7526eb404a652e2ca9beddd79eb672a7f1069574':
Fix
2201413: Enable login on Passion when there's no SIM
Jim Miller [Fri, 30 Oct 2009 01:08:07 +0000 (18:08 -0700)]
am
3179826b: Fix for
2201954: Disable haptic feedback for hard keys while keyguard is showing
Merge commit '
3179826b1694e89ab48a487a41cf20a8d84b7822' into eclair-mr2
* commit '
3179826b1694e89ab48a487a41cf20a8d84b7822':
Fix for
2201954: Disable haptic feedback for hard keys while keyguard is showing
Android (Google) Code Review [Thu, 29 Oct 2009 00:44:45 +0000 (20:44 -0400)]
Merge change I13ea5a5a into eclair
* changes:
Fix
2201413: Enable login on Passion when there's no SIM
Jim Miller [Wed, 28 Oct 2009 23:08:15 +0000 (16:08 -0700)]
Fix
2201413: Enable login on Passion when there's no SIM
Jim Miller [Tue, 27 Oct 2009 21:54:09 +0000 (14:54 -0700)]
Fix for
2201954: Disable haptic feedback for hard keys while keyguard is showing
Mike Lockwood [Fri, 23 Oct 2009 18:54:16 +0000 (11:54 -0700)]
am
b17c8696: When phone is ringing, power button should only mute the ringer, not hang up.
Merge commit '
b17c86966b29f3b2604bc256c3ee056576133a03' into eclair-mr2
* commit '
b17c86966b29f3b2604bc256c3ee056576133a03':
When phone is ringing, power button should only mute the ringer, not hang up.
Mike Lockwood [Fri, 23 Oct 2009 15:29:52 +0000 (11:29 -0400)]
When phone is ringing, power button should only mute the ringer, not hang up.
Fixes my previous fix for bug b/
2201585 (Pressing power button when phone ringing should mute ringer)
Change-Id: I9460e21245b9719f715818f7ad878b121857d773
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Fri, 23 Oct 2009 02:53:05 +0000 (19:53 -0700)]
am
146ef723: When phone is ringing, power button should hang up phone in addition to turning off the screen.
Merge commit '
146ef723bc0fc87aba00400196a5e64ab128ee17' into eclair-mr2
* commit '
146ef723bc0fc87aba00400196a5e64ab128ee17':
When phone is ringing, power button should hang up phone in addition to turning off the screen.
Mike Lockwood [Thu, 22 Oct 2009 17:58:52 +0000 (10:58 -0700)]
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.
Mike Lockwood [Thu, 22 Oct 2009 17:49:00 +0000 (10:49 -0700)]
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.
Mike Lockwood [Thu, 22 Oct 2009 17:14:31 +0000 (13:14 -0400)]
When phone is ringing, power button should hang up phone in addition to turning off the screen.
Fixes bug b/
2201585 (Pressing power button when phone ringing should mute ringer)
Change-Id: Ief3e26044f9b0ceaf41c5dc6be52f0d1e9897810
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Thu, 22 Oct 2009 03:01:07 +0000 (23:01 -0400)]
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>
Jim Miller [Fri, 9 Oct 2009 01:33:31 +0000 (18:33 -0700)]
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':
Gil Dobjanschi [Fri, 9 Oct 2009 01:33:31 +0000 (18:33 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/policies/base into eclair-mr2-plus-aosp
Jim Miller [Fri, 9 Oct 2009 01:28:21 +0000 (18:28 -0700)]
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
Jim Miller [Wed, 7 Oct 2009 08:30:21 +0000 (01:30 -0700)]
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.
Mike Lockwood [Fri, 9 Oct 2009 00:48:43 +0000 (17:48 -0700)]
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':
Dan Murphy [Fri, 9 Oct 2009 00:48:43 +0000 (17:48 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/policies/base into eclair-mr2-plus-aosp
Mike Lockwood [Fri, 9 Oct 2009 00:30:06 +0000 (17:30 -0700)]
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.
Mike Lockwood [Thu, 8 Oct 2009 18:31:25 +0000 (14:31 -0400)]
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>
Dianne Hackborn [Thu, 8 Oct 2009 05:13:23 +0000 (22:13 -0700)]
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':