OSDN Git Service
Jim Miller [Wed, 24 Feb 2010 23:37:00 +0000 (15:37 -0800)]
Fix
2336057: Provide a way for the user to return to a call from LockScreen.
This makes the "Emergency call" button dual-purpose. If there's a call in progress,
the button will show "Return to call" and take them back to the call.
Dianne Hackborn [Thu, 25 Feb 2010 04:03:34 +0000 (20:03 -0800)]
Update to reflect android-common no longer in framework.
Daniel Sandler [Sat, 20 Feb 2010 06:05:22 +0000 (01:05 -0500)]
Move lockscreen sound effects to the system stream.
Bug:
2458106,
2451532
Change-Id: I01869e3fd461dc24aa3157bf38aba9d2967526ec
Daniel Sandler [Mon, 22 Feb 2010 18:09:48 +0000 (13:09 -0500)]
Suppress unlock noises while in-call.
Bug:
2458106
Jim Miller [Sat, 20 Feb 2010 02:18:14 +0000 (18:18 -0800)]
Merge "Fix
2448345: Fix tactile feedback bug in password/PIN and pattern unlock."
Jim Miller [Fri, 19 Feb 2010 03:55:29 +0000 (19:55 -0800)]
Fix
2448345: Fix tactile feedback bug in password/PIN and pattern unlock.
Daniel Sandler [Thu, 18 Feb 2010 16:42:36 +0000 (11:42 -0500)]
Suppress screen lock sound effect on first boot.
Bug:
2453032
Jim Miller [Wed, 17 Feb 2010 07:30:40 +0000 (23:30 -0800)]
Merge "Partial Fix for
2416967: Fix potential memory leak in PasswordUnlockScreen."
Jim Miller [Sat, 13 Feb 2010 02:56:03 +0000 (18:56 -0800)]
Partial Fix for
2416967: Fix potential memory leak in PasswordUnlockScreen.
PasswordUnlockScreen was previously registering for multiple callbacks which *sometimes*
caused a memory leak because a reference stuck around in the callback list. I wasn't able to
track down the cause, but it looks like an interaction between switching between various lockscreen
modes and ordering of CONFIGURATION_CHANGED events.
I found one instance where the callback was being registered twice (fixed). However, I'm
still able to reproduce the bug but far less frequently.
As a workaround, I've added code to prevent adding additional callbacks and added logging to
detect when a callback is already registered.
Also fixed an instance where we'd recreate the password unlock screen in LockPatternKeyguardView.updateScreen()
so it should be quite a bit faster switching orientations now.
Renamed UnlockScreen.java to PatternUnlockScreen.java for consistency.
Daniel Sandler [Sat, 13 Feb 2010 04:33:46 +0000 (20:33 -0800)]
Merge "Support for lockscreen/keyguard sound effects."
Wink Saville [Sat, 13 Feb 2010 00:02:27 +0000 (16:02 -0800)]
am
79484171: am
f010b5d2: Change EndCallBehavior while in UTS test mode.
Merge commit '
794841710d11f59fd1736d1c889cc9b91f38f78e'
* commit '
794841710d11f59fd1736d1c889cc9b91f38f78e':
Change EndCallBehavior while in UTS test mode.
Wink Saville [Fri, 12 Feb 2010 23:57:25 +0000 (15:57 -0800)]
am
f010b5d2: Change EndCallBehavior while in UTS test mode.
Merge commit '
f010b5d26f1e1c93b93576995e76ffd63db2f96e' into eclair-plus-aosp
* commit '
f010b5d26f1e1c93b93576995e76ffd63db2f96e':
Change EndCallBehavior while in UTS test mode.
Amith Yamasani [Wed, 10 Feb 2010 23:21:49 +0000 (15:21 -0800)]
Add a new KEYBOARD_TAP haptic feedback type for very short, low-latency vibration.
The minimum value varies from device to device, so this is useful for defining
the shortest and most efficient vibration. The VibratorService creates a Thread
when playing back vibration patterns, so this allows you to avoid thread creation
and associated scheduling delays by specifying a one-shot duration in the config
file.
Daniel Sandler [Thu, 11 Feb 2010 20:27:37 +0000 (15:27 -0500)]
Support for lockscreen/keyguard sound effects.
See sibling change to frameworks/base (including basic
lockscreen sounds).
Change-Id: I62bb16b90c47353a3ca4a531e7f7d5b446486dde
Dianne Hackborn [Fri, 12 Feb 2010 21:07:59 +0000 (13:07 -0800)]
Add pointer location to window manager.
Wink Saville [Fri, 12 Feb 2010 20:12:06 +0000 (12:12 -0800)]
Change EndCallBehavior while in UTS test mode.
When in UTS test mode this reverts the behavior
of the end key as it was in cupcake. When not in
UTS test mode the behavior is as before the change.
The UTS test mode is enabled when presist.sys.uts-test-mode is 1.
Bug:
2402366
Change-Id: I81359f3870a1e4da513f76c32aecdb7dfdf3bacf
Adam Powell [Fri, 12 Feb 2010 18:28:27 +0000 (10:28 -0800)]
Merge "Added haptic feedback support for scroll barriers"
Jim Miller [Thu, 11 Feb 2010 23:39:45 +0000 (15:39 -0800)]
Fix
2431663: Ensure password field retains focus in PasswordUnlockScreen.
Adam Powell [Wed, 10 Feb 2010 19:39:57 +0000 (11:39 -0800)]
Added haptic feedback support for scroll barriers
Jim Miller [Tue, 9 Feb 2010 05:05:43 +0000 (21:05 -0800)]
Merge "Fix
2402303: Split Keyboard widget from LatinIME into reusable PasswordEntryKeyboardView"
Jim Miller [Sat, 6 Feb 2010 02:59:25 +0000 (18:59 -0800)]
Fix
2402303: Split Keyboard widget from LatinIME into reusable PasswordEntryKeyboardView
- Added new PasswordEntryKeyboardView to internal/widgets. Widget supports:
- alpha mode with symbols (latin-1 only).
- a numeric keyboard
- IME emulation that applies keyboard input to arbitrary top-level view widget.
- Added new transparent assets to framework resources.
- Modified Keyguard and Keyguard layouts to use new PasswordEntryKeyboardView.
Daniel Sandler [Fri, 5 Feb 2010 21:26:28 +0000 (13:26 -0800)]
New "device is locked" status bar icon, part 2.
Shown whenever the secure lockscreen is (a) visible, or (b)
active but hidden due to a FLAG_SHOW_WHEN_LOCKED Activity.
Change-Id: I0e08a952904cc4728621953a42806edf26eb8e46
The Android Open Source Project [Fri, 5 Feb 2010 22:16:10 +0000 (14:16 -0800)]
am
c5908853: am
1fb2a6cd: reconcile main tree with open-source eclair
Merge commit '
c5908853dfd8ea68e81a17e4d57b1fdf76349373'
* commit '
c5908853dfd8ea68e81a17e4d57b1fdf76349373':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:45:31 +0000 (08:45 -0800)]
am
1fb2a6cd: reconcile main tree with open-source eclair
Merge commit '
1fb2a6cd4c27847f8de8369b497f37d3d47c622f' into eclair-plus-aosp
* commit '
1fb2a6cd4c27847f8de8369b497f37d3d47c622f':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:09:38 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 29 Jan 2010 22:09:18 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
Mike Lockwood [Thu, 28 Jan 2010 16:54:40 +0000 (11:54 -0500)]
Add implementation for ALLOW_LOCK_WHILE_SCREEN_ON flag to PhoneWindowManager
This allows the lockscreen to activate after the normal screen timeout while the
screen is on. Needed for dock apps, screen savers, etc.
Change-Id: I25c3579e4363c2b19d503fdbd45d2ff41cdd11bb
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jim Miller [Thu, 28 Jan 2010 04:26:42 +0000 (20:26 -0800)]
Fix
2402303: Show pmf3k in front of PIN/Password unlock screens.
This came down to a decision; if we want to show other information (owner id, current playing song, etc.)
as well as continue to have an easy way to silence the device, we need to have two unlock screens in these cases.
We simply don't have enough room on these screens to show anything but the unlock widget and a small bit of text.
This change *does not* affect pattern unlock, which will continue to be a single unlock screen.
Jim Miller [Thu, 28 Jan 2010 20:37:42 +0000 (12:37 -0800)]
am
fe22c504: am
f2be271d: Fix
2287263: Change carrier TextView to be 1 line and marquee if text is too long.
Merge commit '
fe22c50410029eaf37f3e8e910a8c5fdd5769c70'
* commit '
fe22c50410029eaf37f3e8e910a8c5fdd5769c70':
Fix
2287263: Change carrier TextView to be 1 line and marquee if text is too long.
Jean-Baptiste Queru [Thu, 28 Jan 2010 17:57:00 +0000 (09:57 -0800)]
resolved conflicts for merge of
27b0373f to master
Change-Id: I49fc5a1bf545814449f0c89c7a69ef75cf71d00c
Jean-Baptiste Queru [Thu, 28 Jan 2010 16:15:50 +0000 (08:15 -0800)]
resolved conflicts for merge of
f05f7ab1 to master
Change-Id: Id39b4f1f0aefb387261bbe721050814d5517cea1
Jean-Baptiste Queru [Thu, 28 Jan 2010 16:08:35 +0000 (08:08 -0800)]
resolved conflicts for merge of
73f1d8e4 to master
Change-Id: I7a7b3cc68124a0cd3fde220e22a05a914b4c0fce
Jim Miller [Thu, 28 Jan 2010 03:08:31 +0000 (19:08 -0800)]
Merge "Fix
2385283,
2379269: report unlock attempt success/fail to DevicePolicyManager Reports success/fail for password, pattern and account unlock. Tweak pattern timeout a bit to avoid timeouts."
Jim Miller [Thu, 28 Jan 2010 01:53:18 +0000 (17:53 -0800)]
Fix
2385283,
2379269: report unlock attempt success/fail to DevicePolicyManager
Reports success/fail for password, pattern and account unlock.
Tweak pattern timeout a bit to avoid timeouts.
The Android Open Source Project [Thu, 28 Jan 2010 00:15:13 +0000 (16:15 -0800)]
am
44f9f23e: merge from open-source master
Merge commit '
44f9f23ea227c62ce9250f49f5bf338cbb5f5dd7'
* commit '
44f9f23ea227c62ce9250f49f5bf338cbb5f5dd7':
Added missing media keycode (KEYCODE_MEDIA_REWIND), removed duplicate keycode (KEYCODE_MEDIA_PREVIOUS)
Jim Miller [Sat, 23 Jan 2010 04:23:32 +0000 (20:23 -0800)]
am
f2be271d: Fix
2287263: Change carrier TextView to be 1 line and marquee if text is too long.
Merge commit '
f2be271d1dd84d09ee55041d61ac9b2b4ed4ba31' into eclair-plus-aosp
* commit '
f2be271d1dd84d09ee55041d61ac9b2b4ed4ba31':
Fix
2287263: Change carrier TextView to be 1 line and marquee if text is too long.
Jim Miller [Sat, 23 Jan 2010 03:07:47 +0000 (19:07 -0800)]
Fix
2287263: Change carrier TextView to be 1 line and marquee if text is too long.
This is intended as a workaround for the long text lines introduced in https://android-git.corp.google.com/g/#change,38100.
Added explicit TextView.setColor() to workaround bug with TextView.setSelected().
John Wang [Fri, 22 Jan 2010 18:24:27 +0000 (10:24 -0800)]
am
36a6ec17: Merge "Update carrier display in lockscreen." into eclair
Merge commit '
36a6ec17ba8dc655d0bd1d9bc92afb1699e3aafe' into eclair-plus-aosp
* commit '
36a6ec17ba8dc655d0bd1d9bc92afb1699e3aafe':
Update carrier display in lockscreen.
John Wang [Fri, 22 Jan 2010 18:08:23 +0000 (10:08 -0800)]
Merge "Update carrier display in lockscreen." into eclair
Mike Lockwood [Fri, 22 Jan 2010 02:27:50 +0000 (18:27 -0800)]
am
ccd5aeef: Workaround for a keyguard problem that appeared in the in call screen.
Merge commit '
ccd5aeef0bccfa7963a3dc5d33d467a1446865f1' into eclair-plus-aosp
* commit '
ccd5aeef0bccfa7963a3dc5d33d467a1446865f1':
Workaround for a keyguard problem that appeared in the in call screen.
Jim Miller [Fri, 22 Jan 2010 02:27:47 +0000 (18:27 -0800)]
am
a3b4a811: Merge "Fix for
2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
Merge commit '
a3b4a8111c47852e212032008732e143636151e4' into eclair-plus-aosp
* commit '
a3b4a8111c47852e212032008732e143636151e4':
Fix for
2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
John Wang [Fri, 22 Jan 2010 01:30:07 +0000 (17:30 -0800)]
Update carrier display in lockscreen.
For bug
2352904, lockscreen need clearly show "Emergency Calls Only" status no matter with SIM status.
The change is to show both SIM card status and carrier PLMN including "Emergency Calls Only" status.
Mike Lockwood [Thu, 21 Jan 2010 22:29:32 +0000 (14:29 -0800)]
am
5fdf6a91: am
5b2151ae: Do not turn off screen immediately after undocking.
Merge commit '
5fdf6a917c563df953c5215fe00b6ae8fe70a501'
* commit '
5fdf6a917c563df953c5215fe00b6ae8fe70a501':
Do not turn off screen immediately after undocking.
Mike Lockwood [Thu, 21 Jan 2010 21:38:44 +0000 (16:38 -0500)]
Workaround for a keyguard problem that appeared in the in call screen.
While in call, pressing the power key to turn off the screen caused the Home button
to no longer work after rewaking the screen due to the KeyguardViewMediator mHidden flag not being set.
Change-Id: I322317671b2e5e32de23ed524f6e4808b0334c12
BUG:
2382766
Signed-off-by: Mike Lockwood <lockwood@android.com>
The Android Open Source Project [Thu, 21 Jan 2010 19:21:25 +0000 (11:21 -0800)]
merge from open-source master
Jim Miller [Wed, 20 Jan 2010 23:00:23 +0000 (15:00 -0800)]
Fix
2385283: Add DevicePolicyManager calls to LockScreen.
Jim Miller [Sat, 16 Jan 2010 01:20:35 +0000 (17:20 -0800)]
Merge "Fix for
2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
Jim Miller [Sat, 16 Jan 2010 00:39:16 +0000 (16:39 -0800)]
Fix for
2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
The previous workaround for this race condition prevented glitches by postponing drawing the SlidingTab until the internal state was consistent. Unfortunately, the InCallScreen seems to trigger this most of the time if the keyboard is open or the last application was in landscape mode.
Instead, we'll handle this separately in lockscreen.
Mike Lockwood [Fri, 15 Jan 2010 01:24:48 +0000 (17:24 -0800)]
am
5b2151ae: Do not turn off screen immediately after undocking.
Merge commit '
5b2151ae8654f63bd25e05e87f872ec6f78f0519' into eclair-plus-aosp
* commit '
5b2151ae8654f63bd25e05e87f872ec6f78f0519':
Do not turn off screen immediately after undocking.
Mike Lockwood [Thu, 14 Jan 2010 05:11:08 +0000 (21:11 -0800)]
Do not turn off screen immediately after undocking.
Change-Id: I1d01d141961d1e26d814a202745ce77678fd4518
BUG:
2356385
Signed-off-by: Mike Lockwood <lockwood@android.com>
The Android Open Source Project [Tue, 12 Jan 2010 23:19:04 +0000 (15:19 -0800)]
android-2.1_r1 snapshot
Jim Miller [Wed, 23 Dec 2009 03:04:23 +0000 (19:04 -0800)]
Fix
2332563: Add password-lock support to lockscreen
Romain Guy [Fri, 8 Jan 2010 23:06:37 +0000 (15:06 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #
2361749.
Ying Wang [Wed, 6 Jan 2010 21:57:46 +0000 (13:57 -0800)]
Ying Wang [Wed, 6 Jan 2010 21:46:00 +0000 (13:46 -0800)]
am
27517b21: Still use ro.monkey
Merge commit '
27517b2158a7fcdae13ff02d4cbefa79afbdb838' into eclair-plus-aosp
* commit '
27517b2158a7fcdae13ff02d4cbefa79afbdb838':
Still use ro.monkey
Ying Wang [Tue, 5 Jan 2010 02:49:49 +0000 (18:49 -0800)]
Still use ro.monkey
http://b/issue?id=
1681101
Johan Redestig [Tue, 5 Jan 2010 07:45:33 +0000 (08:45 +0100)]
Added missing media keycode (KEYCODE_MEDIA_REWIND), removed duplicate keycode (KEYCODE_MEDIA_PREVIOUS)
Jim Miller [Tue, 5 Jan 2010 02:02:09 +0000 (18:02 -0800)]
Merge "Fix
2338170: Fix a bug where adding a SAML account would cause the fallback unlock to break."
Ying Wang [Mon, 4 Jan 2010 21:49:30 +0000 (13:49 -0800)]
am
596a4233: am
4d3a9728: Rename ro.monkey to monkey.running
Merge commit '
596a4233846492ee3c3d63fd7c7cf56796960c92'
* commit '
596a4233846492ee3c3d63fd7c7cf56796960c92':
Rename ro.monkey to monkey.running
Ying Wang [Mon, 4 Jan 2010 20:58:49 +0000 (12:58 -0800)]
am
4d3a9728: Rename ro.monkey to monkey.running
Merge commit '
4d3a9728c27ff8959b8da93325b52e8ff7b67b12' into eclair-plus-aosp
* commit '
4d3a9728c27ff8959b8da93325b52e8ff7b67b12':
Rename ro.monkey to monkey.running
Ying Wang [Mon, 4 Jan 2010 19:57:30 +0000 (11:57 -0800)]
Rename ro.monkey to monkey.running
So that Monkey can set it before running and reset it after running.
Jim Miller [Sat, 19 Dec 2009 03:57:07 +0000 (19:57 -0800)]
Fix
2338170: Fix a bug where adding a SAML account would cause the fallback unlock to break.
Adding a SAML account to the system would cause the current test to fail because it expected to have
only one account on the system. Instead, ensure that the device has at lease one non-SAML account.
Fixed update bug where having a single SAML account still showed the "Forgot pattern" button.
Tested:
- Wipe device and add pattern lock
- Add SAML account, verify "forgot pattern" doesn't appear.
- Add GAIA account, verify "forgot pattern" appears.
- Wipe device and add pattern lock
- Add GAIA account, verify "forgot pattern" appears
- Add SAML account, verify "forgot pattern" doesn't go away.
Dianne Hackborn [Mon, 21 Dec 2009 20:16:51 +0000 (12:16 -0800)]
Don't perform app transition if app is not currently visible.
Tell the window manager if we are not visible due to the lock screen
or status bar.
Dianne Hackborn [Wed, 16 Dec 2009 16:07:00 +0000 (08:07 -0800)]
am
b728c072: am
ab4b6c42: Add replace flag to a few more broadcasts.
Merge commit '
b728c072e98ee560dc97744c85d914bd550a8a43'
* commit '
b728c072e98ee560dc97744c85d914bd550a8a43':
Add replace flag to a few more broadcasts.
Dianne Hackborn [Tue, 15 Dec 2009 18:45:34 +0000 (10:45 -0800)]
am
ab4b6c42: Add replace flag to a few more broadcasts.
Merge commit '
ab4b6c42d78b3d8230d8b444e301f2691884980e' into eclair-mr2-plus-aosp
* commit '
ab4b6c42d78b3d8230d8b444e301f2691884980e':
Add replace flag to a few more broadcasts.
Android Git Automerger [Tue, 15 Dec 2009 08:44:44 +0000 (00:44 -0800)]
Merge commit 'goog/eclair-plus-aosp'
Dianne Hackborn [Fri, 11 Dec 2009 19:12:02 +0000 (11:12 -0800)]
Add replace flag to a few more broadcasts.
Daniel Sandler [Thu, 10 Dec 2009 22:38:22 +0000 (14:38 -0800)]
am
c6ee16fc: am
3d22e182: Prevent NPE in recent apps dialog.
Merge commit '
c6ee16fc0e8b14c373d54cf89c29d7faa4930d1c'
* commit '
c6ee16fc0e8b14c373d54cf89c29d7faa4930d1c':
Prevent NPE in recent apps dialog.
Daniel Sandler [Thu, 10 Dec 2009 14:57:14 +0000 (06:57 -0800)]
am
beae79df: am
97467c6f: Move emergency call button to top-right when no SIM.
Merge commit '
beae79dfcac8ba09069a80b4f129feb8b585b480'
* commit '
beae79dfcac8ba09069a80b4f129feb8b585b480':
Move emergency call button to top-right when no SIM.
Daniel Sandler [Thu, 10 Dec 2009 00:51:29 +0000 (16:51 -0800)]
am
3d22e182: Prevent NPE in recent apps dialog.
Merge commit '
3d22e1825b86567048117207ee0654d59fef69a6' into eclair-mr2-plus-aosp
* commit '
3d22e1825b86567048117207ee0654d59fef69a6':
Prevent NPE in recent apps dialog.
Daniel Sandler [Wed, 9 Dec 2009 23:45:06 +0000 (15:45 -0800)]
am
97467c6f: Move emergency call button to top-right when no SIM.
Merge commit '
97467c6fd99f67bb0a7024533ea8cc1626c41ac8' into eclair-mr2-plus-aosp
* commit '
97467c6fd99f67bb0a7024533ea8cc1626c41ac8':
Move emergency call button to top-right when no SIM.
Daniel Sandler [Tue, 8 Dec 2009 19:05:39 +0000 (14:05 -0500)]
Prevent NPE in recent apps dialog.
Bug:
2284111
Daniel Sandler [Mon, 7 Dec 2009 20:48:05 +0000 (15:48 -0500)]
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
Dianne Hackborn [Fri, 4 Dec 2009 12:24:14 +0000 (04:24 -0800)]
am
2d7f5931: am
3e5eceb9: am
4dbf514c: Fix issue #
2302336: System dialogs are not being given a layer
Merge commit '
2d7f59319ad81139b826dff79e97cf7263832014'
* commit '
2d7f59319ad81139b826dff79e97cf7263832014':
Fix issue #
2302336: System dialogs are not being given a layer
Mike Lockwood [Fri, 4 Dec 2009 12:24:10 +0000 (04:24 -0800)]
am
d1fc1c07: am
57932798: am
db0ec648: Merge change I85572973 into eclair
Merge commit '
d1fc1c077b96b1f7f7a58318bd2fc2449315ed84'
* commit '
d1fc1c077b96b1f7f7a58318bd2fc2449315ed84':
Do not show keyguard if screen is turned off by proximity sensor.
Daniel Sandler [Fri, 4 Dec 2009 12:06:20 +0000 (04:06 -0800)]
Dianne Hackborn [Fri, 4 Dec 2009 00:37:56 +0000 (16:37 -0800)]
am
3e5eceb9: am
4dbf514c: Fix issue #
2302336: System dialogs are not being given a layer
Merge commit '
3e5eceb93ccdb00296e96154cbc0491a5516538b' into eclair-mr2-plus-aosp
* commit '
3e5eceb93ccdb00296e96154cbc0491a5516538b':
Fix issue #
2302336: System dialogs are not being given a layer
Mike Lockwood [Fri, 4 Dec 2009 00:32:16 +0000 (16:32 -0800)]
am
57932798: am
db0ec648: Merge change I85572973 into eclair
Merge commit '
57932798cf11d72e656fd6e315b83e2c571cd129' into eclair-mr2-plus-aosp
* commit '
57932798cf11d72e656fd6e315b83e2c571cd129':
Do not show keyguard if screen is turned off by proximity sensor.
Dianne Hackborn [Thu, 3 Dec 2009 20:29:23 +0000 (12:29 -0800)]
am
4dbf514c: Fix issue #
2302336: System dialogs are not being given a layer
Merge commit '
4dbf514c6c73832630e4c9bb068cf950ff044a34' into eclair-plus-aosp
* commit '
4dbf514c6c73832630e4c9bb068cf950ff044a34':
Fix issue #
2302336: System dialogs are not being given a layer
Dianne Hackborn [Thu, 3 Dec 2009 20:28:53 +0000 (12:28 -0800)]
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
Dianne Hackborn [Thu, 3 Dec 2009 19:37:44 +0000 (11:37 -0800)]
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
Mike Lockwood [Thu, 3 Dec 2009 19:12:04 +0000 (11:12 -0800)]
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.
Mike Lockwood [Thu, 3 Dec 2009 19:09:10 +0000 (11:09 -0800)]
am
db0ec648: Merge change I85572973 into eclair
Merge commit '
db0ec6480b806799f05f3d6fd04d742564af8f2f' into eclair-plus-aosp
* commit '
db0ec6480b806799f05f3d6fd04d742564af8f2f':
Do not show keyguard if screen is turned off by proximity sensor.
Android (Google) Code Review [Thu, 3 Dec 2009 19:00:06 +0000 (11:00 -0800)]
Merge change I85572973 into eclair
* changes:
Do not show keyguard if screen is turned off by proximity sensor.
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:40:27 +0000 (08:40 -0800)]
am
30429ac6: Tiny code fix required for b/
2260798 .
Merge commit '
30429ac60e512453d4d7af212788819754b24691' into eclair-plus-aosp
* commit '
30429ac60e512453d4d7af212788819754b24691':
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 [Thu, 3 Dec 2009 13:41:44 +0000 (08:41 -0500)]
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>
Mike Lockwood [Thu, 3 Dec 2009 04:32:39 +0000 (20:32 -0800)]
am
6965e466: am
6f277195: am
15ee33d4: Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."
Merge commit '
6965e466f5feb4d69b8585513d6b605899b74b06'
* commit '
6965e466f5feb4d69b8585513d6b605899b74b06':
Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."
Mike Lockwood [Thu, 3 Dec 2009 04:26:23 +0000 (20:26 -0800)]
am
81c95088: am
70d1fe38: am
e7ef4241: Fix volume keys when in-call and screen is off due to proximity sensor.
Merge commit '
81c950884faa981214ce7635afe9a65eae468697'
* commit '
81c950884faa981214ce7635afe9a65eae468697':
Fix volume keys when in-call and screen is off due to proximity sensor.
Mike Lockwood [Thu, 3 Dec 2009 04:26:19 +0000 (20:26 -0800)]
am
1fef781f: am
a492c9b0: am
b684251e: Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.
Merge commit '
1fef781f14615395a917f5cef1bc6c6946700e27'
* commit '
1fef781f14615395a917f5cef1bc6c6946700e27':
Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.
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 19:35:46 +0000 (11:35 -0800)]
am
15ee33d4: Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."
Merge commit '
15ee33d4d475dc31709808a64120e56d555e992e' into eclair-plus-aosp
* 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.