Commit Graph

184 Commits

Author SHA1 Message Date
Dianne Hackborn
91c3f2a0b3 am 2c4d954e: am f4b40de6: Merge "Fix issue #5445966: WindowManager reporting -long on prime when it shouldn\'t be." into ics-mr0
* commit '2c4d954ece25324dee2b5f4dc08bd8fb3f5e3dfb':
  Fix issue #5445966: WindowManager reporting -long on prime when it shouldn't be.
2011-10-12 21:11:36 -07:00
Jeff Brown
8324d388a8 am 2b5b83bd: Merge "Improve screenshot chord debouncing. Bug: 5011907"
* commit '2b5b83bda80253a6ff0925ae65da636ed2856def':
  Improve screenshot chord debouncing. Bug: 5011907
2011-10-12 20:43:15 -07:00
Jamie Gennis
b001cfb4da am c2091130: am 075e4c3d: Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0
* commit 'c2091130ae1a1b37956f49d0fe81fb82413cd2dd':
  SurfaceFlinger: update orientation via transactions
2011-10-12 20:42:40 -07:00
Dianne Hackborn
f4b40de684 Merge "Fix issue #5445966: WindowManager reporting -long on prime when it shouldn't be." into ics-mr0 2011-10-12 17:01:18 -07:00
Dianne Hackborn
36991744a2 Fix issue #5445966: WindowManager reporting -long on prime when it shouldn't be.
The window manager now uses the app screen dimensions to compute
the various configuration properties, as it should.

This means that prime is official a "not long" device.  Poor prime.
It probably feels inadequate now.

Because it is.

Oh and all that other stuff?  Debugging logs.  Turned off.  And
why the heck not, debugging logs are great.

Change-Id: Iaaf8ef270d986d34fd046d699ef4c0ecea1981fc
2011-10-12 15:17:11 -07:00
Jeff Brown
d5bb82d18c DO NOT MERGE. Improve screenshot chord debouncing.
Bug: 5011907

Introduce a 150ms delay in handling volume down keys
while waiting to see if a power key will follow.

Don't trigger the screenshot chord if both volume up and
volume down are pressed together.

Don't trigger the long-press power menu if volume keys are
also pressed.

Require the user to press both keys in the chord within
the debounce time and continue long-pressing them in order
to trigger the screenshot action.

Change-Id: I248968d37b73c09d6d08e7f62667c443eba32da0
2011-10-12 15:05:59 -07:00
Jeff Brown
2b5b83bda8 Merge "Improve screenshot chord debouncing. Bug: 5011907" 2011-10-12 14:49:57 -07:00
Jeff Brown
905805ad7c Improve screenshot chord debouncing.
Bug: 5011907

Introduce a 150ms delay in handling volume down keys
while waiting to see if a power key will follow.

Don't trigger the screenshot chord if both volume up and
volume down are pressed together.

Don't trigger the long-press power menu if volume keys are
also pressed.

Require the user to press both keys in the chord within
the debounce time and continue long-pressing them in order
to trigger the screenshot action.

Change-Id: I248968d37b73c09d6d08e7f62667c443eba32da0
2011-10-12 14:34:23 -07:00
Jamie Gennis
e2909e121c SurfaceFlinger: update orientation via transactions
This change merges the ISurfaceComposer::setOrientation functionality
into ISurfaceComposer::setTransactionState.  It enables the window
manager to atomically update both the display orientation and the
position and size of the windows in a single transaction with
SurfaceFlinger.

Bug: 5439574
Change-Id: I18a8ccc564d7d760ef8afb2d015ccdb7a7963900
2011-10-11 13:34:01 -07:00
Dianne Hackborn
091ff486ab am 94e8471a: Merge "Fix issue #5405788: Device continuously opening and closing..."
* commit '94e8471a956d46f4fae3da2b1e79862e07209efa':
  Fix issue #5405788: Device continuously opening and closing...
2011-10-10 16:10:02 -07:00
Dianne Hackborn
58f42a59bd Fix issue #5405788: Device continuously opening and closing...
...the "Complete action using" dialog

When an application goes idle, it sends back to the activity manager
the configuration it last used, to make sure the two don't get out
of sync.  Fix a bunch of edge cases here in dealing with that, and
be sure to also send the current configuration when launching an
activity so the client is always up-to-date when launching.

Also a small fix to not show the upgrading dialog during first boot.

Change-Id: I14ed366a87cd689d1c78787369e052422290ac6f
2011-10-10 14:53:08 -07:00
Dianne Hackborn
be870e81e8 am ba8ecd20: Merge "Fix how we hide and show the nav bar."
* commit 'ba8ecd206cc6f175767f952d380c88f70ece04cf':
  Fix how we hide and show the nav bar.
2011-10-07 15:14:55 -07:00
Dianne Hackborn
df89e65bf0 Fix how we hide and show the nav bar.
The PhoneWindowManager is now responsible for hiding and showing
the nav bar.

For hiding, it just moves it off the screen (easy way to get a
nice slide animation on and off).  At the same time, we use a
new WM facility to put up a fake input window to capture all
touch events.

When a touch event is received, we force the system UI to clear
the navigation hiding bit so it will be shown again.

This removes a bunch of code from the system UI for hiding and
showing the nav bar.  Also removes the code calling from userActivity()
to the system UI, which was bad.  (Also no longer using userActivity()
fixes bugs around re-showing the nav bar due to key presses and
other wrong things.)

Change-Id: I8c3174873b5bcaa36a92322a51e8f7993e88e551
2011-10-07 14:32:01 -07:00
Dianne Hackborn
3c32c7a92e am 85b9edf2: Merge "Fix issue #5371530: SYSTEMUI_FLAG_HIDE_NAVIGATION reasserts itself immediately"
* commit '85b9edf2da0534bc53d139bb88cda8866d265afe':
  Fix issue #5371530: SYSTEMUI_FLAG_HIDE_NAVIGATION reasserts itself immediately
2011-10-06 15:21:12 -07:00
Dianne Hackborn
85b9edf2da Merge "Fix issue #5371530: SYSTEMUI_FLAG_HIDE_NAVIGATION reasserts itself immediately" 2011-10-06 15:15:32 -07:00
Dianne Hackborn
9a230e01a1 Fix issue #5371530: SYSTEMUI_FLAG_HIDE_NAVIGATION reasserts itself immediately
This cleans up how ui flags are managed between the client and window manager.
It still reports the global UI mode state to the callback, but we now only clear
certain flags when the system goes out of a state (currently this just means the
hide nav bar mode), and don't corrupt other flags in the application when the
global state changes.

Also introduces a sequence number between the app and window manager, to avoid
using bad old data coming from the app during these transitions.

Change-Id: I40bbd12d9b7b69fc0ff1c7dc0cb58a933d4dfb23
2011-10-06 14:57:37 -07:00
Jeff Brown
b070aff670 am 219f3c71: Merge "Make SENSOR orientation modes trump rotation lock. Bug: 5371750"
* commit '219f3c71269ff0bd8949b88af07f92c4e4eddc67':
  Make SENSOR orientation modes trump rotation lock. Bug: 5371750
2011-10-05 17:27:49 -07:00
Jeff Brown
4dfce20cac Make SENSOR orientation modes trump rotation lock.
Bug: 5371750

Change-Id: I4d18b6c8ba1de0afd5929ddb8d7123272e35fbe2
2011-10-05 16:12:07 -07:00
Dianne Hackborn
3f03016ba9 am edc63317: Merge "Always unfreeze display."
* commit 'edc633170fb28fd17395472d000875f19d157e18':
  Always unfreeze display.
2011-10-05 11:26:49 -07:00
Dianne Hackborn
edc633170f Merge "Always unfreeze display." 2011-10-05 11:25:19 -07:00
Dianne Hackborn
eda74be89a am 59ba9856: Merge "Fix issue #5388352: font size change back to normal"
* commit '59ba98565d82fe7542569d1dd0847b47f30655d6':
  Fix issue #5388352: font size change back to normal
2011-10-05 06:37:00 -07:00
Dianne Hackborn
161dc80ea7 Always unfreeze display.
Change-Id: I7a0f3be49fe723fe59cf6268861bc5fe7f49bc62
2011-10-04 19:18:25 -07:00
Dianne Hackborn
09e5b9daf3 Fix issue #5388352: font size change back to normal
This is another place where we are messed up by the stupid default
Configuration having a 1.0 font scale.  Argh.

Change-Id: Iaa2550d4edab92fb8a52f98fbb9fd8ef5fab94b5
2011-10-04 16:32:01 -07:00
Romain Guy
d44413fb1e am 1867a3cd: Merge "Do not blend opaque windows."
* commit '1867a3cde6411cfa27d0339c973d94fe0287d1a8':
  Do not blend opaque windows.
2011-09-26 19:17:49 -07:00
Romain Guy
4941dea00a Do not blend opaque windows.
This change ensures the wallpaper is rendered into an opaque surface
which avoids a glClear() in SurfaceFlinger. This should save quite
a bit of work on every frame when panning the workspace in launcher.

Change-Id: I9c1b8c324edf29826d5dbb1fb39d883e43375310
2011-09-26 16:08:14 -07:00
Jeff Brown
c976aec618 am 4c253119: Merge "Prevent unintended rotations. Bug: 4981385"
* commit '4c253119db0ce753e46ec3809b54b9e357d363db':
  Prevent unintended rotations. Bug: 4981385
2011-09-23 18:29:49 -07:00
Jeff Brown
4c253119db Merge "Prevent unintended rotations. Bug: 4981385" 2011-09-23 18:28:01 -07:00
Jeff Brown
c0347aa19f Prevent unintended rotations.
Bug: 4981385

Changed the orientation listener to notify the policy whenever
its proposed orientation changes, and changes the window manager
to notify the orientation listener when the actual orientation
changes.  This allows us to better handle the case where the
policy has rejected a given proposal at one time (because the
current application forced orientation) but might choose
to accept the same proposal at another time.

It's important that the proposal always be up to date.  A proposal
becomes irrelevant as soon as the phone posture changes such
that we can no longer determine the orientation with confidence
(such as when a device is placed flat on a table).

Simplified the orientation filtering.  Now we just wait 200ms
for the device to be still before issuing a proposal.  The idea
is that if the device is moving around a lot, we assume that
the device is being picked up or put down or otherwise in
the process of being moved.  We don't want to change the rotation
until that's all settled down.  However, we do want to tolerate
a certain amount of environmental noise.

(The previous confidence algorithm was also designed along
these lines but it was less direct about waiting for things
to settle.  Instead it simply made orientation changes take
longer than usual while unsettled, but the extra delay was often
too much or too little.  This one should be easier to tune.)

Change-Id: I09e6befea1f0994b6b15d424f3182859c0d9a530
2011-09-23 17:26:09 -07:00
Dianne Hackborn
0ba3f30655 am a982ad19: Merge "Fix issue #5173952: Opening a Notification From Lock Screen..."
* commit 'a982ad19d2aee54f714fa3ad9ee4ddbac08dc0fe':
  Fix issue #5173952: Opening a Notification From Lock Screen...
2011-09-23 14:56:48 -07:00
Dianne Hackborn
90c52de286 Fix issue #5173952: Opening a Notification From Lock Screen...
...Should Skip Unsecure Lockscreen (ICS)

Also while I am in there, clean up logging of intent objects to include
even less sensitive information, while showing the true Intent in dump
output (since apps can't get to that).

Change-Id: I35fed714645b21e4304ba38a11ebb9c4c963538e
2011-09-23 13:39:33 -07:00
Jeff Brown
088663e846 am a829e166: Merge "Handle orientation changes more systematically. Bug: 4981385"
* commit 'a829e16681903e6a41901145195f88bf9d952f88':
  Handle orientation changes more systematically. Bug: 4981385
2011-09-21 21:11:37 -07:00
Jeff Brown
01a98ddbdf Handle orientation changes more systematically.
Bug: 4981385

Simplify the orientation changing code path in the
WindowManager.  Instead of the policy calling setRotation()
when the sensor determined orientation changes, it calls
updateRotation(), which figures everything out.  For the most
part, the rotation actually passed to setRotation() was
more or less ignored and just added confusion, particularly
when handling deferred orientation changes.

Ensure that 180 degree rotations are disallowed even when
the application specifies SCREEN_ORIENTATION_SENSOR_*.
These rotations are only enabled when docked upside-down for
some reason or when the application specifies
SCREEN_ORIENTATION_FULL_SENSOR.

Ensure that special modes like HDMI connected, lid switch,
dock and rotation lock all cause the sensor to be ignored
even when the application asks for sensor-based orientation
changes.  The sensor is not relevant in these modes because
some external factor (or the user) is determining the
preferred rotation.

Currently, applications can still override the preferred
rotation even when there are special modes in play that
might say otherwise.  We could tweak this so that some
special modes trump application choices completely
(resulting in a letter-boxed application, perhaps).
I tested this sort of tweak (not included in the patch)
and it seems to work fine, including transitions between
applications with varying orientation.

Delete dead code related to animFlags.

Handle pausing/resuming orientation changes more precisely.
Ensure that a deferred orientation change is performed when
a drag completes, even if endDragLw() is not called because the
drag was aborted before the drop happened.  We pause
the orientation change in register() and resume in unregister()
because those methods appear to always be called as needed.

Change-Id: If0a31de3d057251e581fdee64819f2b19e676e9a
2011-09-21 19:26:15 -07:00
Jason Simmons
8d3538d016 resolved conflicts for merge of 0799e951 to ics-aah
Change-Id: I4f968fa84aa395c63c28053ef0f489161530bf86
2011-09-20 14:36:22 -07:00
Dianne Hackborn
bc1aa7bbc7 Fix issue #5312624: Lock screen very flickery
The key thing was to fix isVisibleOrBehindKeyguardLw() so that it
wouldn't count a window as not visible if it was just currently
in the process of drawing due to an orientation change.

Also improve logic in deciding when to turn screen on to better ensure
the screen is in a stable state, in particular treating screen off
as a frozen screen and not allowing it to turn on until the
update of the screen due to any config change is done.

Change-Id: If82199f3773270b2d07f9c7de9da2dad8c7b28d7
2011-09-20 11:20:31 -07:00
Mike Lockwood
1e0207674d resolved conflicts for merge of 2f7d7c9b to ics-aah
Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I851866d74ff9674bfb7ff652d8be65da342273c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-09-18 18:25:44 -04:00
Dianne Hackborn
38e29a61d0 Fix issue #5242779: Device not responding to touch on unlock screen
Rework how we decide when it is okay to turn on the screen by having
the policy call back to the power manager when it knows the lock screen
has been drawn.

Change-Id: Ie8f3f72111dcf7f168723e6dce24e0343b4afe5d
2011-09-18 14:52:52 -07:00
Dianne Hackborn
7cd07b1dcc am 0db4bdb2: Merge ""Fix" issue #5276520: Noise on edges of rotation animation"
* commit '0db4bdb24dcde4cce81f3852d3eeb1caf580f2b1':
  "Fix" issue #5276520: Noise on edges of rotation animation
2011-09-16 13:44:46 -07:00
Dianne Hackborn
73db0d802e "Fix" issue #5276520: Noise on edges of rotation animation
I have no shame.

Change-Id: I9f40df670bba0f848097aad8afb978a29e42f85a
2011-09-16 01:09:40 -07:00
Dianne Hackborn
1a30857a89 am 09bd49a8: Fix issue #5328235: Wrong values for smallestScreenWidthDp
* commit '09bd49a8a74cafe7f03aee769bfe0748bf3c2b51':
  Fix issue #5328235: Wrong values for smallestScreenWidthDp
2011-09-16 00:16:48 -07:00
Dianne Hackborn
09bd49a8a7 Fix issue #5328235: Wrong values for smallestScreenWidthDp
Maybe.

Change-Id: I88dfde1626376b3003bdd7a8068c55545255851e
2011-09-15 19:12:01 -07:00
Dianne Hackborn
7b50e27ad2 am ca7b6568: Merge "Fix issue #5283365: Rotating the device to portrait mode, hides the keyboard partly"
* commit 'ca7b6568333e1446b8357a89f6bdf757fee29768':
  Fix issue #5283365: Rotating the device to portrait mode, hides the keyboard partly
2011-09-14 17:59:44 -07:00
Dianne Hackborn
1f903c3b57 Fix issue #5283365: Rotating the device to portrait mode, hides the keyboard partly
PhoneWindowManager now takes full responsibility for deciding where the
navigation bar goes.  This gets rid of a bunch of race conditions with
determining layout while the nav bar is moving itself at the same time
the window manager is computing a new configuration.

Note that this breaks the "nav bar on left" option.  The current nav
bar code could also be cleaned up some more to completely drive its
behavior based on onSizeChanged() happening during relayout.

Change-Id: I1651d74c3464ba0d588aab3049e099c78420146a
2011-09-14 17:56:40 -07:00
Dianne Hackborn
cda44ab452 am 3368a99f: Merge "Fix issue #4280324: Returning to Fullscreen Layout with WebView..."
* commit '3368a99f3cc362d2d823f06a9b1e216696c41ea6':
  Fix issue #4280324: Returning to Fullscreen Layout with WebView...
2011-09-13 14:18:56 -07:00
Mike Lockwood
1d29e2129f Fix problems dispatching media button events on headless devices
Change-Id: Ib0f8ca008c7e1325d5dc6f6534f08960c527eeac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-09-13 16:29:38 -04:00
Dianne Hackborn
f809870f11 Fix issue #4280324: Returning to Fullscreen Layout with WebView...
...Leads to Shifted Layout

Change-Id: I6cf3fd0dd066f73cd1ec6fce3d994f7e3eead293
2011-09-13 13:26:38 -07:00
Dianne Hackborn
4c34eed9ab am 1cd955b0: Merge "Get rid of some animation flickers and other bad things."
* commit '1cd955b01d8ea72009be56f4c4a93d4d79e902df':
  Get rid of some animation flickers and other bad things.
2011-09-12 14:44:11 -07:00
Dianne Hackborn
d02a9e95f4 Get rid of some animation flickers and other bad things.
Change-Id: If7606286bf0bd01cf023d57719ccb27e39d5564c
2011-09-12 13:47:31 -07:00
Dianne Hackborn
54869071db am fe75cb34: Merge "Fix inflating of animations."
* commit 'fe75cb342e33e7c465709bb34ab7abae9e9871f6':
  Fix inflating of animations.
2011-09-11 13:09:40 -07:00
Dianne Hackborn
8962028b6e Fix inflating of animations.
Need to define attributes for animation set, to have correct indices.

Also small fixes elsewhere.

Change-Id: If596147e8aee4ebffe4e184872070341eff6df73
2011-09-11 12:47:45 -07:00
Dianne Hackborn
569857cd44 am 4ee36669: Merge "Fix issue #5263361: Browser instance not created in application picker"
* commit '4ee366690111e5f71a248a2af10301db425162d5':
  Fix issue #5263361: Browser instance not created in application picker
2011-09-08 10:41:59 -07:00