Commit Graph

80757 Commits

Author SHA1 Message Date
Jeff Brown
e6d2016be0 Merge "Clean up PowerManager API." 2012-06-19 18:48:20 -07:00
Romain Guy
c63c7bf944 am b56fe8ab: am f96d117e: Merge "Add extra systrace tracing" into jb-dev
* commit 'b56fe8abf6735337b65e050f44e1baf2f3f813ed':
  Add extra systrace tracing
2012-06-19 18:43:31 -07:00
Jeff Brown
1244cdaedd Clean up PowerManager API.
Mostly just moved the code around and improved the docs.

Fixed a minor inefficiency in WakeLock.setWorkSource() where
we would tell the power manager that the work source was changed
even when the old work source and new work source were both null.

Fixed a bug in WakeLock.setWorkSource() where we would not
notify the power manager that the work source was changed if
there was no work source previously specified.

Added synchronized to WakeLock.setReferenceCounted.

Added a checked in WakeLock.acquireLocked() and WakeLock.release()
to check whether the wake lock is actually not held / held
before performing the corresponding operation.  This change avoids
making redundant calls into the power manager service in the
case where the wake lock is not reference counted and acquire()
or release() have been called multiple times.

Made the PowerManager and WakeLock classes final.  They are not
directly instantiable by applications so this change does not
break the API.

Removed a little dead code (one private constructor and an
unused constant).

Change-Id: I4e10cf893506115938a35756136c101256dccf30
2012-06-19 18:42:05 -07:00
Romain Guy
b56fe8abf6 am f96d117e: Merge "Add extra systrace tracing" into jb-dev
* commit 'f96d117e9bf2d5998677521330697628c95ec3f1':
  Add extra systrace tracing
2012-06-19 18:40:50 -07:00
Romain Guy
f96d117e9b Merge "Add extra systrace tracing" into jb-dev 2012-06-19 18:39:08 -07:00
Jim Miller
ea03338dfa am 27d1916e: am fce2ec4d: Merge "Fix 6656710: center dot pattern in GlowPadView" into jb-dev
* commit '27d1916e85ad994c3a440a80066737a8492eb791':
  Fix 6656710: center dot pattern in GlowPadView
2012-06-19 18:36:04 -07:00
Jim Miller
27d1916e85 am fce2ec4d: Merge "Fix 6656710: center dot pattern in GlowPadView" into jb-dev
* commit 'fce2ec4da468c2d5ba26de8d051ff7ee64bb01c3':
  Fix 6656710: center dot pattern in GlowPadView
2012-06-19 18:33:27 -07:00
Jim Miller
fce2ec4da4 Merge "Fix 6656710: center dot pattern in GlowPadView" into jb-dev 2012-06-19 18:31:31 -07:00
Jim Miller
94754ef36d Fix 6656710: center dot pattern in GlowPadView
This fixes a bug where the dots weren't aligned with the center of the view.
The matrix should not contain the offset of the image itself since we really
want to scale about the abstract points.  The code now subtracts the image
centering positions (cx,cy) from the point to be scaled.

Change-Id: I1d46a5d51b1fd1d39944c64baf86c306c2d5e923
2012-06-19 18:28:25 -07:00
Romain Guy
77e67cf905 Add extra systrace tracing
This change shows how much time is spent updating and executing
framework display lists within a frame.
This change also fixes a crash that happnes if you attempt to
perform a dumpsys gfxinfo while the app is drawing (we are telling
developers to use this new tool.)

Change-Id: Ia4047a78a42b545ab77176ef4f371c300686548c
2012-06-19 18:21:06 -07:00
Xavier Ducrohet
752e7b3bf6 am 58a8d8d2: am 0e302bc8: Merge "Disable debug output in SDK layoutlib." into jb-dev
* commit '58a8d8d2d4b15cd4abf010680181359823ebfda4':
  Disable debug output in SDK layoutlib.
2012-06-19 18:09:14 -07:00
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
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
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
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
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
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