81109 Commits

Author SHA1 Message Date
Xavier Ducrohet
58a8d8d2d4 am 0e302bc8: Merge "Disable debug output in SDK layoutlib." into jb-dev
* commit '0e302bc884fa4b25eb391d625f2fb0eddc25d9b7':
  Disable debug output in SDK layoutlib.
2012-06-19 18:06:37 -07:00
Xavier Ducrohet
0e302bc884 Merge "Disable debug output in SDK layoutlib." into jb-dev 2012-06-19 18:04:19 -07:00
Xavier Ducrohet
4d7f301f94 Disable debug output in SDK layoutlib.
Bug: 6697442

Change-Id: I9741761342ea220c158aa124089430b0db80bf7e
2012-06-19 18:02:21 -07:00
Dianne Hackborn
6e2281d44c Fix issue #6686339: 2 taps required to launch notification...
...or settings from lock screen

When a window is drawn, the code to determine whether it should now
be shown was calling WindowState.isReadyForDisplay().  Part of the
condition of this function is that it is not ready if a policy is
forcing the window to be hidden -- which is the case when the lock
screen is shown.  As a result, we wouldn't show the window at that
point, so wouldn't tell the activity manager that the token's windows
are visibible, and wouldn't tell the lock screen to go away.

This adds a new variation WindowState.isReadyForDisplayIgnoringKeyguard(),
which is the same as the original method but ignores the policy visibility
for app windows.  This allows windows to be go through the complete
path of handling when the window is finally drawn and telling the
activity manager about it, even if behind the lock screen.  By making it
a separate function, we don't impact any other code that is calling the
old function and may be relying on its behavior.

Also cleaned up a little of the dumpsys output.  Most important, the
new ANR section is now moved to the top, since we want
"adb shell dumpsys window" to still give a nice summary of what we
normally care about -- the window stack and important global state.

Change-Id: Ica3ea85ce46f3f5f5cd2cc30fbd9de13d3885a57
2012-06-19 17:54:24 -07:00
Adam Powell
849df0b5a7 Add an XML attribute for controlling which route types a
MediaRouteButton in a layout will alter.

Change-Id: I897a68188fa87e4c2dbc88794117a3ef87ffaab0
2012-06-19 17:47:48 -07:00
Irfan Sheriff
e66ad7c900 Merge "Remove unusued scan stats" 2012-06-19 17:43:12 -07:00
Irfan Sheriff
07f834d487 Merge "Cleanup softap interface to netd" 2012-06-19 17:43:06 -07:00
Kevin Hester
d3782b26b2 Exit boot animation cleanly.
The desc.txt file can now mark parts as 'must finish cleanly' by using
'c' as the part line prefix rather than 'p'.  If so indicated, if the
bootanimation is asked to quit it will do so only after waiting to
finish that part.

I considered either making init.c service killing smarter or promoting
bootanim to be a bindable service with a requestExit method.  However,
these changes are probably too big/risky given our ship date.  So
I used a property as a mailbox between SurfaceFlinger and bootanim.

Bug: 6679877
Change-Id: I1f8dd9e7da1ea80a483b31fa14c4a5645922d774
2012-06-19 17:38:43 -07:00
Todd Poynor
12da27224d Merge "Battery stats: parse wakeup sources stats for android-3.4" 2012-06-19 17:27:15 -07:00
Adam Powell
ec23ce5cb4 am f99e81a6: am 2a2b021a: Merge "Permit MediaRouteButton to select system routes in toggle mode." into jb-dev
* commit 'f99e81a6ff22b6b93dd057802e553f66c0a7b97b':
  Permit MediaRouteButton to select system routes in toggle mode.
2012-06-19 17:05:01 -07:00
Adam Powell
f99e81a6ff am 2a2b021a: Merge "Permit MediaRouteButton to select system routes in toggle mode." into jb-dev
* commit '2a2b021a2133b769e0b82fd6edc166ba98129680':
  Permit MediaRouteButton to select system routes in toggle mode.
2012-06-19 17:03:01 -07:00
Adam Powell
2a2b021a21 Merge "Permit MediaRouteButton to select system routes in toggle mode." into jb-dev 2012-06-19 17:00:35 -07:00
Todd Poynor
73f534a2dd Battery stats: parse wakeup sources stats for android-3.4
Change-Id: I30b2362ca7260d187e8ed4e047b30c446d32ca98
2012-06-19 16:57:39 -07:00
Jim Miller
01b8e660ef am 904f26bd: am f7e820bb: Merge "Fix 6693743: update animation ring for keyguard and search panel" into jb-dev
* commit '904f26bd2684f64ac8b3c41394f09c4143a600b5':
  Fix 6693743: update animation ring for keyguard and search panel
2012-06-19 16:45:59 -07:00
Jim Miller
904f26bd26 am f7e820bb: Merge "Fix 6693743: update animation ring for keyguard and search panel" into jb-dev
* commit 'f7e820bbc9d23e0657bbd6252fe285ba08a2551a':
  Fix 6693743: update animation ring for keyguard and search panel
2012-06-19 16:43:39 -07:00
Jim Miller
f7e820bbc9 Merge "Fix 6693743: update animation ring for keyguard and search panel" into jb-dev 2012-06-19 16:41:50 -07:00
Casey Burkhardt
ea6fbc0981 Fixing gesture recognition configuration in TouchExplorer.
This fix adjusts the sensitivity of the gesture recognizer by
eliminating gesture rotation in the recognition process.

Bug:6697119
Change-Id: Ic767f513c05210b27e583338c4f0adcaa1c4c625
2012-06-19 16:31:54 -07:00
Irfan Sheriff
c91f0595d3 Remove unusued scan stats
This is now part of BatteryStats

Change-Id: I7e16207276e28eea3be8666990ae958b8ea7a17a
2012-06-19 16:21:23 -07:00
Irfan Sheriff
90542758d4 Cleanup softap interface to netd
Change-Id: I01e6c5b5a5a8ddaf05b979f9cc6d1293c86e8773
2012-06-19 16:21:22 -07:00
Victoria Lease
e87bc5d789 am 017e9160: (-s ours) am 1b36a68f: Merge "DO NOT MERGE Engineer-asset light-theme findonpage prev/next buttons" into jb-dev
* commit '017e9160614d1a0fbb3a220141c8391f12a7ddbf':
  DO NOT MERGE Engineer-asset light-theme findonpage prev/next buttons
2012-06-19 16:20:28 -07:00
Eric Fischer
8a01499d57 Merge "Import translations. DO NOT MERGE" 2012-06-19 16:18:52 -07:00
Victoria Lease
017e916061 am 1b36a68f: Merge "DO NOT MERGE Engineer-asset light-theme findonpage prev/next buttons" into jb-dev
* commit '1b36a68f607538bd090c33b31bd418169657ff6c':
  DO NOT MERGE Engineer-asset light-theme findonpage prev/next buttons
2012-06-19 16:17:24 -07:00
Jim Miller
a7da8afe6d Fix 6693743: update animation ring for keyguard and search panel
This is a partial revert of change Ibce96f45eb6a94582c694108b99e243fd57b1955.

This change:
- shows the expanding ring animation on keyguard and navbar search
- disables the first ping wave animation on both.
- restores the outer ring

Change-Id: I429d23a49ca2868dc00872b8b8fde000d6a53a6d
2012-06-19 16:17:19 -07:00
Victoria Lease
1b36a68f60 Merge "DO NOT MERGE Engineer-asset light-theme findonpage prev/next buttons" into jb-dev 2012-06-19 16:16:00 -07:00
Chet Haase
73b21cfa50 am 3662fe5e: am ebc9d317: Merge "Handle non-started LayoutTransition animations correctly" into jb-dev
* commit '3662fe5e3507ada2a592b8df6120b8cebfb5d8d9':
  Handle non-started LayoutTransition animations correctly
2012-06-19 16:03:36 -07:00
Chet Haase
3662fe5e35 am ebc9d317: Merge "Handle non-started LayoutTransition animations correctly" into jb-dev
* commit 'ebc9d317ff61bf8907809692d3efa899550d70d9':
  Handle non-started LayoutTransition animations correctly
2012-06-19 16:01:48 -07:00
Chet Haase
ebc9d317ff Merge "Handle non-started LayoutTransition animations correctly" into jb-dev 2012-06-19 15:59:27 -07:00
Chris Wren
3c148f106f One-finger notificaiton open: pop the next item too.
Bug: 6538918
Change-Id: I957b6d50220c57b588b43825767f24ecee862754
2012-06-19 15:58:41 -07:00
Adam Powell
eba1b70d7a Permit MediaRouteButton to select system routes in toggle mode.
Bug 6694917

Change-Id: I82e68aee196c72f349e7638717b727ef3f23e9b5
2012-06-19 15:58:38 -07:00
Victoria Lease
45f5a76000 DO NOT MERGE Engineer-asset light-theme findonpage prev/next buttons
This is a cherrypick of Iae2795da from master.

These are provided with the expectation that they will be replaced
with more professional assets as soon as available.

Bug: 6685279
Change-Id: Iae2795dafaffcc337b74f4a178f68de4a96b96bf
2012-06-19 15:56:20 -07:00
Victoria Lease
a129a3b0ca Merge "Engineer-asset light-theme findonpage prev/next buttons" 2012-06-19 15:42:10 -07:00
Chet Haase
ddbb346e5a Handle non-started LayoutTransition animations correctly
A recent change to LayoutTransition noop'd animations in non-visible
parents, to avoid artifacts like scaling/moving from (0,0,0,0). But there
was logic in ViewGroup that didn't account for transitions that didn't actually
run an animation, causing a disconnect between the state of a parent (getting ready
to remove an item later) and the state of the transition (not running, therefore
not needing the child to be removed later).

The fix was to detect when the transition did not start and avoid adding the
view to the list of children to be removed later.

Issue #6602502 Playing video through crackle application only audio is heard no video is displayed

Change-Id: Id5260580ab0d6dd165c62006c7bd579fd821a5f5
2012-06-19 15:39:16 -07:00
Victoria Lease
c8a9f07ab9 Engineer-asset light-theme findonpage prev/next buttons
These are provided with the expectation that they will be replaced
with more professional assets as soon as available.

Bug: 6685279
Change-Id: Iae2795dafaffcc337b74f4a178f68de4a96b96bf
2012-06-19 15:30:03 -07:00
Jim Miller
9ec426aba6 am 2b7df368: am cab997b2: Merge "Fix 6667238: allow market apps to support ACTION_ASSIST" into jb-dev
* commit '2b7df3686f24a5a653a6609556dd98210324f7bd':
  Fix 6667238: allow market apps to support ACTION_ASSIST
2012-06-19 15:26:54 -07:00
Jim Miller
2b7df3686f am cab997b2: Merge "Fix 6667238: allow market apps to support ACTION_ASSIST" into jb-dev
* commit 'cab997b2020ddb67158397dccadd28d91a7710d0':
  Fix 6667238: allow market apps to support ACTION_ASSIST
2012-06-19 15:24:45 -07:00
Jim Miller
cab997b202 Merge "Fix 6667238: allow market apps to support ACTION_ASSIST" into jb-dev 2012-06-19 15:23:03 -07:00
Craig Mautner
2fa2a52838 am 9a5a8aaf: am 5785e05d: Merge "Clear sendingToBottom when animation is complete." into jb-dev
* commit '9a5a8aafad89f3e05bb9c17c56ea4658413a4452':
  Clear sendingToBottom when animation is complete.
2012-06-19 15:13:46 -07:00
Craig Mautner
9a5a8aafad am 5785e05d: Merge "Clear sendingToBottom when animation is complete." into jb-dev
* commit '5785e05d44cd1f4453b887ac8de05ff3466b179e':
  Clear sendingToBottom when animation is complete.
2012-06-19 15:11:33 -07:00
Craig Mautner
5785e05d44 Merge "Clear sendingToBottom when animation is complete." into jb-dev 2012-06-19 15:08:41 -07:00
Dianne Hackborn
acdfbcca6f Fix issue #6675499: java.lang.RuntimeException: Unable to start...
...activity ComponentInfo{com.google.android.gm/
com.google.android.gm.ui.MailActivityGmail}: java.lang.NullPointerException

There were a number of places in FragmentManagerImpl where we were
not dealing with mAdded being null.  In the original implementation,
mAdded would almost always be null if mActive is null.  As we have
added features, this has become a less strong guarantee (and it actually
was never completely guaranteed), but there are a lot of places where
we would check for mActive being non-null and assume this meant
mAdded is non-null.

Fix these to correctly check for mAdded.

Bug: 6675499
Change-Id: I2a6a801d8bc89550fc73e12c9c3f8bb0ad6c7fa4
2012-06-19 15:07:05 -07:00
Jim Miller
45308b1b3b Fix 6667238: allow market apps to support ACTION_ASSIST
This change allows market apps and 3rd parties to supply an activity
that responds to ACTION_ASSIST (e.g. market apps).

It also adds a test app to respond to the ASSIST intent and force
the intent disambiguation dialog to appear.

Change-Id: I5a78863c6a9546d18c66275187d178f6a1c9ee17
2012-06-19 15:00:13 -07:00
Eric Fischer
dd2a97e3ae am 7324b21c: (-s ours) am c2585467: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '7324b21ca07c89c01fd4bfea6c2d651c3e31146a':
  Import translations. DO NOT MERGE
2012-06-19 14:47:53 -07:00
Eric Fischer
562f1f462c Import translations. DO NOT MERGE
Change-Id: I748d4ec5d5dad19aa1cf7877f8ad89ceceedfa5d
2012-06-19 14:46:09 -07:00
Eric Fischer
7324b21ca0 am c2585467: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'c2585467107995f3130872eb7b721f3dbbcdf505':
  Import translations. DO NOT MERGE
2012-06-19 14:45:41 -07:00
Eric Fischer
c258546710 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-19 14:43:50 -07:00
Eric Fischer
3dc1af6b68 Import translations. DO NOT MERGE
Change-Id: I050bc722a5a06acc49fc519d57bf16b14158e97a
2012-06-19 14:38:50 -07:00
Craig Mautner
3f99fde465 Clear sendingToBottom when animation is complete.
Was counting on moving the app to the top to clear the flag
indicating that the app was being sent to the bottom. Since this
did not always happen the sendingToBottom flag was occasionally
left set. In this case the focus was skipped for that app and
consequently input was never propagated to it.

This fix clears the sendingToBottom flag each time the app
animations are completed.

Fixes bug 6691421.

Change-Id: I6f851dc5bedca95182db8490d87c876a71ad5fde
2012-06-19 14:10:01 -07:00
Jeff Sharkey
579c373bdc am de2dbfff: am 0abe556d: Handle SCREEN_ON/OFF broadcasts without blocking.
* commit 'de2dbfff537f457fdd8a5ef2145b41629a7b09a2':
  Handle SCREEN_ON/OFF broadcasts without blocking.
2012-06-19 14:05:19 -07:00
Jeff Sharkey
de2dbfff53 am 0abe556d: Handle SCREEN_ON/OFF broadcasts without blocking.
* commit '0abe556d28f5f5d395559cc6567b05939d1b2640':
  Handle SCREEN_ON/OFF broadcasts without blocking.
2012-06-19 14:02:51 -07:00
Jeff Sharkey
0abe556d28 Handle SCREEN_ON/OFF broadcasts without blocking.
NetworkPolicy currently uses a single background thread to process
various broadcasts.  When processing other broadcasts, this thread
can block our handling of SCREEN_ON/OFF, which are sent as ordered
broadcasts.

This change moves SCREEN_ON/OFF handling to the main thread, and
dispatches a one-way message to the background thread, allowing the
ordered broadcast to always proceed.

Bug: 6677047
Change-Id: I52de2c7b75beb8059bb87e123689ba4a9c4ae349
2012-06-19 13:32:22 -07:00