OSDN Git Service
kwok [Tue, 21 Dec 2010 09:10:14 +0000 (10:10 +0100)]
Check setting whether reboot needs confirmation
kwok [Sat, 4 Dec 2010 17:41:21 +0000 (18:41 +0100)]
Check whether to show dialog/confirmation during power-off
Change-Id: Ica5056c6abeb533d6af11739a09ef1afa3ff54f1
kwok.wong@live.nl [Wed, 24 Nov 2010 09:40:57 +0000 (10:40 +0100)]
Check whether to skip screen lock
Change-Id: Icd0f7de16df83a46a451b232be1904793a209a9c
Jinho You [Mon, 8 Nov 2010 12:52:00 +0000 (20:52 +0800)]
PhoneWindowManager: allow wake up screen by a screen touch
Change-Id: Icd740d57426586329eb6803ac3b756a8f88b88ae
Yi Sun [Wed, 13 Jan 2010 23:40:38 +0000 (15:40 -0800)]
move the power off and reboot the upper positions
Yi Sun [Wed, 6 Jan 2010 20:04:38 +0000 (12:04 -0800)]
make nicer keyguard window for PC
Yi Sun [Tue, 5 Jan 2010 23:08:50 +0000 (15:08 -0800)]
Disable the provision check
Sometimes, the value of provision changed randomly and cause
the keyguard to not show up. Disabling the provision check
for now until I find the real bug.
Yi Sun [Fri, 18 Dec 2009 09:40:43 +0000 (01:40 -0800)]
KeyguardViewMediator: fix a race condition
There could a race condition where the lock screen does not show up before
the machine went into sleep. Remove the screenon flag check so that machine
can go back to sleep after show the lock screen.
Kelly2.Blue [Thu, 17 Dec 2009 01:30:08 +0000 (09:30 +0800)]
enable softkeyboard
Yi Sun [Tue, 15 Dec 2009 07:41:42 +0000 (23:41 -0800)]
make the mouse events wake event
Yi Sun [Mon, 14 Dec 2009 00:21:57 +0000 (16:21 -0800)]
port sleep, wifi and volume mute support from mid policy to phone policy
Yi Sun [Sun, 13 Dec 2009 07:22:03 +0000 (23:22 -0800)]
switch to use phone policy
Port the power dialog changes from mid policy.
Change-Id: I0a162f884a09d6cb603767aaeb2be5837886d600
Jean-Baptiste Queru [Thu, 18 Nov 2010 02:08:34 +0000 (18:08 -0800)]
Merge "Change hide() to dismiss() to avoid memory leak."
Yuling Liu [Tue, 9 Nov 2010 08:14:34 +0000 (09:14 +0100)]
Change hide() to dismiss() to avoid memory leak.
Change-Id: I4a5acb123c673c75a48c3e77566cdca4760d8576
Kristian Dreher [Tue, 23 Feb 2010 07:49:05 +0000 (08:49 +0100)]
Corrected repeat count for key repeat in input device.
Previously the key event repeat count was always zero when the repeated
key down events was generated by the input device in the Linux kernel.
Change-Id: I9e295ca41ffe7324f54083f0a493e073187feb28
The Android Open Source Project [Wed, 23 Jun 2010 17:54:05 +0000 (10:54 -0700)]
temporarily ignore from open-source master
Change-Id: I7729fca1b063bcd5c37b6a821f20a2cdfeb45842
Jean-Baptiste Queru [Tue, 15 Jun 2010 22:08:01 +0000 (15:08 -0700)]
Merge "Telephony : Dial emergency phone numbers when screen is locked"
Benoit Hebrard [Tue, 15 Jun 2010 14:33:26 +0000 (16:33 +0200)]
Telephony : Dial emergency phone numbers when screen is locked
The current implementation do not allow dialing emergency phone
numbers with the qwerty-keyboard when the screen is locked.
This contribution will automatically start the emergency dialer
if a valid digit (i.e. 0-9,*,+,#) is entered from the qwerty
keypad when the screen is locked. The emergency dialer appears
pre-filled with the first entered digit.
Change-Id: I136b5434f99bfab6f1908d3698e2700f7e59d036
Christian Mehlmauer [Tue, 25 May 2010 17:05:52 +0000 (19:05 +0200)]
Replaced deprecated getIntent with parseUri
Change-Id: Ie3918b5896c922403e4fb58b81aacd52d364e11d
Jim Miller [Thu, 6 May 2010 21:55:38 +0000 (14:55 -0700)]
Fix
2662816: Move UI update from async callback to ui thread. DO NOT MERGE
This fixes a bug where the view hierarchy in AccountUnlockScreen was being
modified by the async callback thread from AccountManager.
DO NOT MERGE because path has changed.
Change-Id: I32a7b5df8ade3dca376a342b4e5aee53d0c204f2
Dianne Hackborn [Tue, 13 Apr 2010 19:48:30 +0000 (12:48 -0700)]
Fix issue #
2555171: Switching to app immediately after unmounting...
...SD card causes reboot.
Deal with unavailable apps in recent tasks UI.
Change-Id: Ib85b773c5c6df7afb12db551b6cef63edbc6df64
Jim Miller [Tue, 13 Apr 2010 18:37:27 +0000 (11:37 -0700)]
Merge "Fix
2572446: Also watch keyboard changes in PIN/Password unlock. DO NOT MERGE" into froyo
Daniel Sandler [Tue, 13 Apr 2010 00:33:20 +0000 (20:33 -0400)]
Restore text field used by sliding tab to give ringer mode feedback.
Bug:
2587358
Change-Id: I5ad8745443fc97225af9efb938e4640cfc29b5d7
Jim Miller [Tue, 13 Apr 2010 02:25:15 +0000 (19:25 -0700)]
Fix
2572446: Also watch keyboard changes in PIN/Password unlock. DO NOT MERGE
The PIN/Password unlock screen was monitoring orientation changes.
However, while docked, this isn't useful since orientation remains
fixed. This change makes PasswordUnlockScreen also looks for
changes to config.hardKeyboardHidden.
Tested:
WVGA device while docked and opening/closing the keyboard.
Change-Id: Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04
Jim Miller [Tue, 13 Apr 2010 02:15:42 +0000 (19:15 -0700)]
Merge "Fix
2575838: Update emergency button in AccountUnlockScreen DO NOT MERGE" into froyo
Jim Miller [Mon, 12 Apr 2010 23:49:28 +0000 (16:49 -0700)]
Fix
2575838: Update emergency button in AccountUnlockScreen DO NOT MERGE
AccountUnlockScreen wasn't registered to receive updates from
UpdateMonitor. It now correctly updates the Emergency call button
to allow the user to return to the call in progress (InCallScreen).
Tested on WVGA device with keyboard:
- hitting Home during call, observing state, and pressing button to return to call.
- hitting Home while not in call to ensure it still invokes EmergencyDialer.
- above in various keyboard states.
Marked DO NOT MERGE since this will require manual merge to master due to framework restructuring.
Change-Id: Idf6bb25438336616e6453e7afe0e79f227af98d3
Dianne Hackborn [Fri, 9 Apr 2010 23:40:33 +0000 (16:40 -0700)]
Fix issue #
2586349: Accelerometer is enabled when in car mode
Change-Id: Iab5ca4ea9f69bd54f815fc7463df808d81c61ffd
Daniel Sandler [Thu, 8 Apr 2010 13:07:02 +0000 (06:07 -0700)]
Merge "Add emergency call button to PUK'd lockscreen." into froyo
Dianne Hackborn [Thu, 8 Apr 2010 01:15:32 +0000 (18:15 -0700)]
Fix issue #
2555171: Switching to app immediately after unmounting SD card causes reboot.
Change-Id: I509162e136dd721fecfaabc45a046537b2d19077
Daniel Sandler [Wed, 7 Apr 2010 04:22:31 +0000 (00:22 -0400)]
Add emergency call button to PUK'd lockscreen.
The user unlocks a PUK-locked SIM via the e-call dialer, so
we absolutely need the button there.
This is the code portion; it requires layout from change
I8aa0fc2223428ba15a57269ac5a624e74e91a5f3 in
frameworks/base.
Bug:
2568732
Change-Id: I6872c3ad135bc34348adafa76e08a3878f1b506f
Dianne Hackborn [Wed, 7 Apr 2010 03:24:15 +0000 (20:24 -0700)]
Fix issue #
2574016: Preferred activity setting is not persistent
The recent tasks UI was trying to retrieve the current home activity
in the wrong way, causing it to be a different match of activities and
thus clearing any preferred activity that was set.
In the future we should look at what the package manager is doing here
and make it more robust in how it clears the list... but for now,
this is the safest thing.
Change-Id: Idc917dffa7d05d62671213414387e8bdb2e34bea
Joe Onorato [Mon, 5 Apr 2010 21:15:37 +0000 (16:15 -0500)]
Redo the look of the recent apps switcher.
Change-Id: Icb523e2f5949c2b502aa8003aa14b7ac98a616f2
Jim Miller [Tue, 30 Mar 2010 02:31:26 +0000 (19:31 -0700)]
Fix
2555028: Restore showing tab unlock before PIN & password entry.
This fixes a bug introduced in change 46594 that prevents showing
the tab unlock screen before PIN & password entry.
Change-Id: Ibd603921f6a22b603652c4751fa0f2f7d9129bb2
Romain Guy [Mon, 29 Mar 2010 21:41:15 +0000 (14:41 -0700)]
Remove scroll barrier constant.
Bug #
2553595
Change-Id: Ie3bb31930b57ed1a658b79632786dfef9435ccf3
Daniel Sandler [Thu, 18 Mar 2010 01:52:35 +0000 (21:52 -0400)]
Redesigned keyguard layout in the no-SIM case. DO NOT MERGE
The emergency call button has been removed (since the user
can disable the keyguard, open the phone app, and enter the
emergency number there).
This change also restores a number of the informational &
help messages that were previously removed from the lock
screen.
Bug:
2421380
Change-Id: I4dda16be5d54c1e0ab4e26914c63d1f5b922cfe8
Jim Miller [Fri, 26 Mar 2010 01:37:48 +0000 (18:37 -0700)]
Fix
2535700: Add support for enforcing password quality
Change-Id: I945eea1a3869f48d636ed0c1172063f7bc57e889
Fred Quintana [Thu, 25 Mar 2010 21:50:20 +0000 (14:50 -0700)]
change the account unlock enabling logic use async calls rather than
blocking calls
limit the account unlocks to google accounts
Change-Id: If412a7557716503f7d122ec3ff31375f47b624b9
http://b/issue?id=
2544496
Adam Powell [Wed, 24 Mar 2010 18:17:03 +0000 (11:17 -0700)]
Fix bug
2386867 - Phone DecorViews FOCUS_AFTER_DESCENDANTS
Change-Id: Iade2c2d8ea575fc452897dbfd3d8454b5b7972ed
Mike LeBeau [Tue, 23 Mar 2010 00:40:35 +0000 (17:40 -0700)]
Tell SearchManager to stopSearch on long-press of search. Also,
do the long-press haptic feedback first, to avoid any slowdown
in the responsiveness of that.
Fixes http://b/
2526697
Change-Id: I607063b67bdde92303ee112663b76d6e4e9a369b
Dirk Balfanz [Thu, 18 Mar 2010 04:07:56 +0000 (21:07 -0700)]
Instead of asking whether accounts are SAML accounts to figure out whether they can be used for screen unlocking, we ask directly whether they support confirmCredentials().
Change-Id: Ib83c89133b67661e2eb0827baecc32910b386f63
Dianne Hackborn [Thu, 18 Mar 2010 08:04:37 +0000 (01:04 -0700)]
Policy part of fixing issue #
2519590: Lock screen stuck in landscape mode
Change-Id: Id7f3a7102a86f4fecb7f7ef40b1275b75e27dac4
Jim Miller [Thu, 18 Mar 2010 07:50:07 +0000 (00:50 -0700)]
Merge "Fix
2520598: Disable password entry in keyguard while in lockout"
Jim Miller [Thu, 18 Mar 2010 02:14:18 +0000 (19:14 -0700)]
Fix
2520598: Disable password entry in keyguard while in lockout
The password unlock wasn't abiding by the 30s lockout rule.
This change adds the necessary logic and countdown timer to
disable text entry while in lockout mode. After 30s, text entry
is re-enabled until the next lockout count is reached.
Change-Id: I4d860565cad91cb88c36615b40d1837a5d97fe21
Daniel Sandler [Tue, 16 Mar 2010 03:09:57 +0000 (23:09 -0400)]
Suppress lock sound effect on screen timeout.
Bug:
2512130
(without regressing http://b/
2453032)
Change-Id: I79c90e6f59b95c3096808ad5ee9845369a2e50ce
Daniel Sandler [Sat, 13 Mar 2010 20:44:47 +0000 (15:44 -0500)]
Remove the secure lock icon from the status bar.
Added in I0e08a952904cc4728621953a42806edf26eb8e46, but
takes up too much room.
An undocumented system setting, "show_status_bar_lock", can
be set to 1 (e.g. in Spare Parts) to bring this back.
Bug:
2511090
Change-Id: I8869ac18c303a786eeb7f1a0c4ae08529b45d59c
Jim Miller [Mon, 15 Mar 2010 22:33:44 +0000 (15:33 -0700)]
Merge "Fix
2428368: Fix most of the lockscreen orientation refresh bugs"
Jim Miller [Thu, 11 Mar 2010 23:46:29 +0000 (15:46 -0800)]
Fix
2428368: Fix most of the lockscreen orientation refresh bugs
This change removes the legacy notification of orientation and configuration changed events
from KeyguardUpdateMonitor and moves them into the individual activities. This was necessary
to guarantee order of events.
In addition, to minimize discrepencies due to notification lag, Keyguard screens (LockScreen,
PatternUnlock, etc.) are now responsible for handling onConfigurationChanged() notification and
forwarding them to LockPatternKeyguardView by a call to recreateMe() with the new configuration.
This also removes the hack that used to prevent drawing while the configuration was in flux.
Change-Id: I6b72e8c06cebb2c5c83e2debeb478e89b6f6f386
David Brown [Tue, 9 Mar 2010 05:52:59 +0000 (21:52 -0800)]
Accessibility: optionally allow Power key to end the current call.
This is part 2 of the fix for bug
2364220 "Accessibility improvements for
ending calls".
This change updates the POWER key logic in interceptKeyTq() to check the
value of Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR, which allows the
user to specify that the Power button should hang up while in-call,
instead of just turning off the screen.
Bug:
2364220
Change-Id: If6d8e3155f7d60142ab6fd61f0a9db7f0b0d95ab
Dianne Hackborn [Thu, 11 Mar 2010 00:01:58 +0000 (16:01 -0800)]
Update for new layout flow.
Now does lock screen and status bar management in the animation pass, to better
match actual changes on screen.
Change-Id: I9a68fcfa1968dfa71961bc164a6fda15b2cd7d47
Jean-Baptiste Queru [Tue, 9 Mar 2010 02:04:51 +0000 (18:04 -0800)]
Add an empty CleanSpec.mk
Change-Id: I29594c5f5438d6b7c586887e25ef84ffaf64faff
Mike Lockwood [Fri, 5 Mar 2010 20:46:24 +0000 (15:46 -0500)]
Move dock wakelock code to UiModeManagerService.
Change-Id: Ide758a9e68002b13ba2d61bd9e9701d449edb65b
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dianne Hackborn [Fri, 5 Mar 2010 04:47:56 +0000 (20:47 -0800)]
Update to use new dock broadcasts.
Daniel Sandler [Fri, 5 Mar 2010 14:34:52 +0000 (09:34 -0500)]
Use new vibrate icon in power menu.
Change-Id: I54725ae73bac731a2078a9c61d75d77c0cbb3680
Jim Miller [Thu, 4 Mar 2010 21:24:17 +0000 (13:24 -0800)]
Fix
2420689: Fix bug that prevents pattern unlock from showing lockout dialog.
This fixes the problem where the lockout dialog wasn't showing. It also fixes a problem
where the "forgot pattern" button would stop working.
Dianne Hackborn [Wed, 3 Mar 2010 07:32:01 +0000 (23:32 -0800)]
Fix issue #
2445481: onNewIntent is called twice if SEARCH button is "long-pressed"
Jim Miller [Wed, 3 Mar 2010 01:24:48 +0000 (17:24 -0800)]
Fix
2481917: allows keyboards with overlapping qwerty/numeric keys to work w/o requiring hitting the <alt> key.
Some devices have a qwerty layout without separate numeric keys. This makes PIN entry painful.
The workaround is to set an explicit numeric key listener when in numeric mode.
Jim Miller [Tue, 2 Mar 2010 21:00:17 +0000 (13:00 -0800)]
Merge "Fix
2447470: always update the battery status when it's below the threshold."
Dianne Hackborn [Tue, 2 Mar 2010 05:43:11 +0000 (21:43 -0800)]
Pointer location in framework, no longer need to link common.
Daniel Sandler [Fri, 26 Feb 2010 20:16:54 +0000 (15:16 -0500)]
Support refined vibrate/silent behavior.
See change I14cf91b0 for explanation and required framework
support.
Bug:
2457183
Change-Id: I09ad7d697ff17c24fc41744ed70add214d132bd3
Jim Miller [Tue, 2 Mar 2010 00:51:43 +0000 (16:51 -0800)]
Fix
2447470: always update the battery status when it's below the threshold.
Previously, the battery percentage was only shown when the battery level
transitioned below the LOW_BATTERY_THRESHOLD (20%). This change makes it so it gets updated
whenever we get a battery status update where the level is below LOW_BATTERY_THRESHOLD.
Note: this only applies to the pattern unlock screen.
Jim Miller [Fri, 26 Feb 2010 03:56:06 +0000 (19:56 -0800)]
Fix
2468960: Make sure unlock screen gets updated when SIM state changes.
Added code to let us lazily re-create the unlock screen when the SIM
status changes. This fixes a bug where we sometimes show the Pattern/Password unlock
instead of the SIM PIN unlock due to an ordering issue with recent changes
to the telephony layer SIM update logic. It now correctly re-evaluates the SIM state
and updates the UI accordingly.
Jim Miller [Fri, 26 Feb 2010 05:05:59 +0000 (21:05 -0800)]
Merge "Fix
2336057: Provide a way for the user to return to a call from LockScreen."
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.
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().