1092 Commits

Author SHA1 Message Date
Dianne Hackborn
b8678d76c3 resolved conflicts for merge of 210c1a26 to master
Change-Id: Ic44193e62215086c22225f2def5eee3159d26ae8
2012-02-23 10:54:06 -08:00
Adam Powell
40eec4c0f1 Fix the size of DialogWhenLarge windows
Change-Id: I8c9588e958d8fb9c45b1cdb235cced48ba508dd3
2012-02-21 15:32:26 -08:00
Dianne Hackborn
01011c3d7c Fix issue #6037252: Screen shifts after all apps are upgraded
Two things: (1) make sure the boot message is always positioned within
the entire unrestricted display, and (2) allow the dim background to go
on top of the nav bar when being used for the boot message (this latter
is really a hack that should be more generally fixed in the future).

Change-Id: I7261b044eb802a39cadff931b50a679ff18781d6
2012-02-21 13:54:21 -08:00
Mike Lockwood
ce952c8e13 AudioManager: Add support for master mute
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 14:44:05 -08:00
Mike Lockwood
f5f4ec9791 PhoneWindowManager: stifle warning that ITelephony service does not exist
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 14:44:04 -08:00
Mike Lockwood
d747dc8179 Fix problems dispatching media button events on headless devices
Signed-off-by: Mike Lockwood <lockwood@android.com>

Conflicts:

	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
2012-02-10 10:51:24 -08:00
Mike Lockwood
3a74bd36f8 Add headless mode for running the framework without the surface flinger
Enabled by setting system property ro.config.headless to 1
This will allow the framework to run without starting activities,
system UI and the keyguard.
Framework can still run services, content providers and broadcast receivers.

Signed-off-by: Mike Lockwood <lockwood@android.com>

Conflicts:

	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/PowerManagerService.java
	services/java/com/android/server/am/ActivityManagerService.java
2012-02-10 10:51:24 -08:00
Mike Lockwood
aa5bf14e21 PhoneWindowManager: Disable boot progress dialog on headless builds
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 10:51:21 -08:00
Craig Mautner
61ac6bb250 Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods.
Change-Id: I80152c38741ce73b92da9483cfed84efbac34f89
2012-02-06 16:52:16 -08:00
Amith Yamasani
742a671273 Multi-user - 1st major checkin
Switching activity stacks
Cache ContentProvider per user
Long-press power to switch users (on phone)

Added ServiceMap for separating services by user
Launch PendingIntents on the correct user's uid
Fix task switching from Recents list
AppWidgetService is mostly working.

Commands added to pm and am to allow creating and switching profiles.

Change-Id: I15810e8cfbe50a04bd3323a7ef5a8ff4230870ed
2012-02-03 12:01:47 -08:00
Jim Miller
118bb2bd86 Fix 5906830: Don't crash on lock screens that lack a clock.
This fixes a crash seen in SIM unlock screen where the
layout doesn't have a clock to update.

Change-Id: Ic1473b60f6d32f3feae9e7aa4510f6e435fa9a73
2012-01-27 17:59:49 -08:00
Jim Miller
ce4a0c6f16 Fix 5906830: Update the clock earlier when lock screen comes back from suspend.
This attempts to fix an issue where sometimes the time shown on lock
screen was really old.  The code now sets the time immediately when the
screen turns on.

Change-Id: Ic4649ea342499aea82f997ba488bc2cb45987739
2012-01-27 17:15:18 -08:00
Jim Miller
fb9e364380 Merge "Fix 5620754: don't show pattern unlock after SIM unlock if not enabled." 2012-01-26 14:30:49 -08:00
Jim Miller
93708af132 Fix 5620754: don't show pattern unlock after SIM unlock if not enabled.
This fixes a bug where the device would show pattern unlock after the user
entered the SIM PUK unlock code.  The code now correctly determines that
the device isn't secure and thus shouldn't show the unlock screen.

Change-Id: I49fd749592154a4c5840038b92d54ca7ca086074
2012-01-25 18:26:12 -08:00
Jim Miller
3868cee0b9 Fix 5907237: dismiss keyguard after the camera app launches.
This fixes a bug where either the home screen or the last app run shows
briefly while we wait for the camera app to launch.  Instead, we have
ActivityManager dismiss keyguard once the camera app is up and running.

Change-Id: I1c2986ad84024dce675216a76c19c937c3e2828d
2012-01-24 16:59:54 -08:00
Dianne Hackborn
8c190f76fc am 29cd79c7: am c986d6f0: Merge "Fix issue #5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1
* commit '29cd79c7b0fecd2753fc27405794c0d5b5314302':
  Fix issue #5906017: Missing menu entries in portrait when in compatibility mode
2012-01-24 11:37:24 -08:00
Dianne Hackborn
a486a53a02 Fix issue #5906017: Missing menu entries in portrait when in compatibility mode
This was a bug only when the status bar was hidden, the screen space for
the nav bar would not be correctly removed for all frames used in layout
computation.

This code really $*#&^!! needs to be cleaned up, the whole "status bar
is the system bar when on a tablet so it should take space from apps,
but status bar doesn't do that on phones but on phones there is a nav
bar that does the same thing" thing is whacked.

Proof that evolution DOESN'T WORK!!!!!!!!!!

Change-Id: I24e4994328480820cb638e7a40aa0b65b7ae2003
2012-01-23 18:02:46 -08:00
Jim Miller
d3fe9abfb9 am ab9601cd: am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1
* commit 'ab9601cdbb95ae94088750eff9a926a572c1a4d6':
  Fix 5863053: Add method to lock screen immediately.
2012-01-20 15:48:21 -08:00
Dianne Hackborn
cfbf7dedad Fix issue #5823276 again: home repaints after full-screen app is exited
Don't consider a window as a candidate for the top fullscreen window
if it is not going to be a candiate for layout.

This fix does not include the change to ignore app tokens that are
hidden.  This causes problems in some dialogs that stay hidden until
their app is ready to display, but need to perform a series of relayouts
during that time to get to the right size.  Dropping this part of
the change still (mostly?) seems to allow us to avoid the bad states.

Change-Id: Ic052cb1499d3287f47e9ffeac5cd2470ee5a308c
2012-01-20 11:01:01 -08:00
Justin Ho
170997a519 DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"
This reverts commit 01b02a734d2988c22b00f5df6346ad03d8bf52b6.

Change-Id: I848c01fc44eb9a51ead1116b2647ed838ec1825f
2012-01-19 15:41:33 -08:00
Jim Miller
230a709285 Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1 2012-01-18 16:44:52 -08:00
Jim Miller
93c518e4f8 Fix 5863053: Add method to lock screen immediately.
This fixes a bug where the device fails to lock when DevicePolicyManagerService
requests the device to be locked and the screen was off because the user hit
the power button.

The change allows DPMS to directly invoke screen lock, bypasssing the screen state.

Change-Id: Iecdda6fc61e9c519119de495be23c69c3b983921
2012-01-17 18:11:05 -08:00
Dianne Hackborn
f88d1493aa am 10065177: am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '100651779fde99f7ae2a10719d688b51115f08e9':
  Fix issue #5823276: home repaints after full-screen app is exited
2012-01-13 13:01:48 -08:00
Dianne Hackborn
2e282f35b0 Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1 2012-01-13 12:56:40 -08:00
Guang Zhu
191713a51f Move where prop dev.bootcomplete is set
Currently test harnesses depends on this flag to determine when
the system is fully booted, and start dismissing keyguard, launch
tests etc. However, the flag is usually set when the boot animation
is still running, and typically about 5 seconds before keyguard is
up etc. Moving to to when BOOT_COMPLETE broadcast is sent makes it
work more reliable.

We also discussed about using sys.boot_completed instead,
unfortunately this flag is not in all platform and we still have
backwards compatibility to maintain in order to drive unbundled
tests.

Change-Id: I99b084cd70d8e4bcfe490ddeca868136d32712e2
2012-01-12 17:39:40 -08:00
Dianne Hackborn
01b02a734d Fix issue #5823276: home repaints after full-screen app is exited
Don't consider a window as a candidate for the top fullscreen window
if it is not going to be a candiate for layout.

Also don't consider windows a candidate for layout if their app token
is hidden.  This fixes a transient state where we are preparing to
unhide the window but have not done so yet.

Change-Id: Ife5299ffa003c1df1a4f787b7a2809cbf614ec16
2012-01-12 14:05:03 -08:00
Jim Miller
0b92eb4b8c am 1aff11be: am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '1aff11be4585d6ddff784d7e74188963050805fa':
  Fix 5620754: don't show pattern screen after SIM PUK unlock
2012-01-12 13:37:58 -08:00
Jim Miller
7a286d8391 Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1 2012-01-12 12:28:59 -08:00
Brian Colonna
8a1131d789 Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1 2012-01-12 06:33:49 -08:00
Jim Miller
28a0767751 Fix 5620754: don't show pattern screen after SIM PUK unlock
This fixes a bug introduced in testing 34a62348. The code now
properly invokes the callbacks before returning.

Change-Id: I637a8a792838379f0c8b42ef634da82787fcd961
2012-01-10 18:35:21 -08:00
Jim Miller
5437c220e2 am d3872f55: am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
* commit 'd3872f55045b7ce7be7dd7ae5fff37d7988bdcb2':
  Fix 4560303: Add setting to lock later when power button pressed
2012-01-10 10:34:51 -08:00
Jim Miller
a4edd151c5 Fix 4560303: Add setting to lock later when power button pressed
This adds a feature to delay locking the device when the power button
is pressed.  This fixes a use case where the user wants to turn off
the display (e.g. to save power) but doesn't want to lock the device.

For the case of a secure device (user has a pin/password/pattern),
this will lock the device immediately or not based on the setting.

For the non-secure case, this always "locks" the device to provide easy
access to the camera while preventing unwanted input.

Change-Id: Ie328485c3f7559e26896d761cbf0e69d3f4df4e2
2012-01-09 17:30:58 -08:00
Brian Colonna
7664c0e99d DO NOT MERGE cherry-picked FU framework tablet commits
- cherry-picking framework CLs from master into ics-mr1 that are
  needed for FU to work on tablets

- needed for OEM partners even FU isn't going on xoom

Squashed commit of the following:

commit 3258f2528f558efdaf34ae15c5425f2d879848fe
Author: Brian Colonna <bcolonna@google.com>
Date:   Tue Dec 13 15:49:48 2011 -0500

    Added Face Unlock to tablet lockscreen layouts

    The Face Unlock Area was not part of the tablet layouts, so prior to
    this change, Face Unlock would not show up on tablets when selected as
    the unlock method.  The backup unlock method would show up instead.

    The goal here is for the pattern and PIN unlock layouts (in both
    portrait and landscape mode) to look the same as before this change.
    This was a little harder than it was with the phone layouts for two
    reasons:

    1) For the phones it was ok for Face Unlock to be sized such that it
    just covers the backup method.  For the tablets we want Face Unlock
    to cover far more real estate.

    2) The phones were based on a grid layout, whereas the tablet is a
    linear layout.

    Note that the diff makes the modifications look way more extensive
    than they actually are.  Basically, in most cases I am putting a
    relative layout around some existing portion of the layout and
    putting the Face Unlock Area area inside of the new relative layout.

    Change-Id: I478becddf2a9ee9fe7b6d653e604fa3ad89b822f

commit 821cfe85cf2b3daf074d9749dbf6e0a5663af0de
Author: Brian Colonna <bcolonna@google.com>
Date:   Mon Dec 19 15:51:10 2011 -0500

    Unbinding from FU when going to backup

    Lockscreen was stopping Face Unlock when going to the backup lock, but
    not unbinding from the Face Unlock service until the device was
    unlocked.

    This caused a bug on the tablets where Face Unlock would reappear when
    switching between portait and landscape orientations, even after the
    backup lock was exposed.  On an orientation change, Face Unlock is
    restarted if the service is bound to during the orientation change.
    Since it was bound to when it should not have been, Face Unlock was
    restarting when it should not have been.

    The wakelock is also now being poked on an orientation change because
    on the tablet you can keep Face Unlock alive by switching the
    orientation back and forth, but eventually the screen would go dark
    with Face Unlock running.

    Also, a conditional was moved in activateFaceLockIfAble() so the whole
    section isn't executed if Face Unlock is not in use.  Part of it was
    being executed with only the inner-most part having the check.  This
    did not cause any issues that I am aware of.

    Change-Id: Ib452b8ced28a507bf9272dbf5d3477a8abd1ba90

commit fa90bb76ac6b311d12b55d23df4ac44cec62c7b3
Author: Brian Colonna <bcolonna@google.com>
Date:   Mon Dec 12 18:02:23 2011 -0500

    Changed how Face Unlock coordinates are specified

    Was using View.getLeft() and View.getTop() to specify the upper-left
    corner of the Face Unlock area.  That gives coordinates relative the
    view, which was fine for the phones.  For the tablet it needs
    coordinates relative to the window (which still works for the phones).

    Also fixed a 'bug' where h and w were swapped.  However, it wasn't
    causing a problem because it was swapped in two places.

    Change-Id: I86c1f68439f1dcef826cfe6b8fb56c9a4a6b8dc3

Change-Id: I962c0486be85949e002b0a2701286a6a39251f36
2012-01-09 16:22:12 -05:00
Brian Colonna
edcac2aa69 Merge "Unbinding from FU when going to backup" 2012-01-03 13:42:17 -08:00
John Wang
d02c5dfd8d am c0139281: am c892e177: Merge "Hide emergency call text if not support it." into ics-mr1
* commit 'c01392816fbb16ca76c738bc801f3b2c34548c06':
  Hide emergency call text if not support it.
2011-12-20 10:45:32 -08:00
Brian Colonna
fb45f7b08b Unbinding from FU when going to backup
Lockscreen was stopping Face Unlock when going to the backup lock, but
not unbinding from the Face Unlock service until the device was
unlocked.

This caused a bug on the tablets where Face Unlock would reappear when
switching between portait and landscape orientations, even after the
backup lock was exposed.  On an orientation change, Face Unlock is
restarted if the service is bound to during the orientation change.
Since it was bound to when it should not have been, Face Unlock was
restarting when it should not have been.

The wakelock is also now being poked on an orientation change because
on the tablet you can keep Face Unlock alive by switching the
orientation back and forth, but eventually the screen would go dark
with Face Unlock running.

Also, a conditional was moved in activateFaceLockIfAble() so the whole
section isn't executed if Face Unlock is not in use.  Part of it was
being executed with only the inner-most part having the check.  This
did not cause any issues that I am aware of.

Change-Id: Ib452b8ced28a507bf9272dbf5d3477a8abd1ba90
2011-12-19 15:51:10 -05:00
Joe Onorato
44fcb83b38 Add a new ui mode for "appliance"
The idea is that this is a device which is more-or-less headless.  It
might have some limited interaction capabilities, but it's not something
that you want to rely on having.

Change-Id: Ib92f53a120bf83de781728011721a4859def7d9f
2011-12-15 16:16:14 -08:00
John Wang
088f162899 Hide emergency call text if not support it.
Show "emergency call only" text in carrier string
only if phone supports emergency calls.

bug:5570742
Change-Id: Ie826583fd55073e57c5fe4fe6e585781127caa6a
2011-12-14 19:51:37 -08:00
Dianne Hackborn
ee4d45f305 am 0be53567: am 19a06fe9: Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1
* commit '0be53567c1c2299c548d3204d2b9240108fbd53a':
  Fix issue #5755172: Soft menu key disappears when menu is open
2011-12-13 13:44:14 -08:00
Dianne Hackborn
73ab6a49db Fix issue #5755172: Soft menu key disappears when menu is open
We need to work more like before in determining whether the menu
key is needed -- in some cases look back in the window list to
determine this if we don't know the value from the current window.

This requires adding a new private flag indicating whether the
compat menu state is known for a window, which is set by
PhoneWindow as part of its existing process of computing the flag
for its own windows.

Now we can have a new API on WindowState to determine the value
of this flag for a window, which if needed walks back in the window list
to find a window the value is known for (or stops at what the policy
has determined is the top full-screen window, so we stop like we used
to at things like the lock screen or the bottom of an application).

Change-Id: I829de6d629b5af8bcb422cb85249ee4041c7205e
2011-12-13 11:32:11 -08:00
Brian Colonna
a44f2a59a2 Changed how Face Unlock coordinates are specified
Was using View.getLeft() and View.getTop() to specify the upper-left
corner of the Face Unlock area.  That gives coordinates relative the
view, which was fine for the phones.  For the tablet it needs
coordinates relative to the window (which still works for the phones).

Also fixed a 'bug' where h and w were swapped.  However, it wasn't
causing a problem because it was swapped in two places.

Change-Id: I86c1f68439f1dcef826cfe6b8fb56c9a4a6b8dc3
2011-12-12 18:02:23 -05:00
Steven Ross
e4067faca9 Merge "Checking whether screen is on in constructor fixes 5658742" 2011-12-09 16:28:39 -08:00
Jeff Brown
bdc18b28eb am 03e63427: am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
* commit '03e634270d880407316b51fac2278e604fc82703':
  Shortcut keys should be handled on down, not up.
2011-12-09 14:25:41 -08:00
Jeff Brown
fa7fa9a5ba am 944c985b: am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1
* commit '944c985b4199e6e029568ea87004c9727e469cc0':
  Fix system hotkey handling.
2011-12-09 14:25:38 -08:00
Steven Ross
ebc6fb46c2 Checking whether screen is on in constructor fixes 5658742
Change-Id: Ic96c8dd9ee9e86000b0cbe22a7d068a8ee424448
2011-12-09 09:28:29 -05:00
Jeff Brown
8e0ecbfc97 Merge "Shortcut keys should be handled on down, not up." into ics-mr1 2011-12-07 23:29:52 -08:00
Jeff Brown
e0e9fd981c Merge "Fix system hotkey handling." into ics-mr1 2011-12-07 23:29:45 -08:00
Jeff Brown
7bedf24490 Shortcut keys should be handled on down, not up.
Bug: 5720360
Change-Id: I3afc278e576ea992c76f024c8b6bad14b214239c
2011-12-07 21:37:19 -08:00
Jeff Brown
68b909d8ac Fix system hotkey handling.
Fixed a problem where the key up for the ALT or META key was not
delivered to the task switcher dialog because it was deemed
to be inconsistent with the window's observed state.  Consequently
the dialog would not be dismissed when the key was released.

Moved global hotkey handling for META+* shortcuts and ALT/META-TAB
into the window manager policy's interceptKeyBeforeDispatching
method.  This change prevents applications from hijacking these
keys.

The original idea was that these shortcuts would be handled only
if the application did not handle them itself.  That way certain
applications, such as remote desktop tools, could deliberately
override some of these less important system shortcuts.
Unfortunately, that does make the behavior inconsistent across
applications.  What's more, bugs in the onKeyDown handler of
applications can cause the shortcuts to not work at all, for
no good reason.

Perhaps we can add an opt-in feature later to enable specific
applications to repurpose these keys when it makes sense.

Bug: 5720358
Change-Id: I22bf17606d12dbea6549c60d20763e6608576cf7
2011-12-07 21:37:16 -08:00
Dianne Hackborn
7e05b4a309 am 7377e593: am 0e385ee4: am b32785c6: Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0
* commit '7377e59314885b8ef65bd19d04984998cb2e5ff4':
  More fixing for issue #5366535: Lockscreen has wrong layout...
2011-12-07 17:17:07 -08:00