Commit Graph

23463 Commits

Author SHA1 Message Date
Hung-ying Tyan
cc9a4e3e2a am 927c7fd1: Merge "Fix crash when SimpleCursorAdapter changes cursor from null" into jb-dev
* commit '927c7fd1fec8ff26fd4bf8cc64eb12dd634cb60b':
  Fix crash when SimpleCursorAdapter changes cursor from null
2012-06-20 22:31:00 -07:00
Hung-ying Tyan
927c7fd1fe Merge "Fix crash when SimpleCursorAdapter changes cursor from null" into jb-dev 2012-06-20 17:56:40 -07:00
Amith Yamasani
1806afb2c4 am 998a6836: Merge "Add a private method to retrieve the header list from PreferenceActivity" into jb-dev
* commit '998a68369fcf7928b6fa58d6312426f88a27a39e':
  Add a private method to retrieve the header list from PreferenceActivity
2012-06-20 15:48:27 -07:00
Amith Yamasani
998a68369f Merge "Add a private method to retrieve the header list from PreferenceActivity" into jb-dev 2012-06-20 15:44:48 -07:00
Amith Yamasani
423d48bbba Add a private method to retrieve the header list from PreferenceActivity
This is required by Settings app to be able to update the header list
if the accounts list changed.

Bug: 6685701
Change-Id: If27f83ec86fe1f3519a6e25de4e4fe4864133dc8
2012-06-20 13:54:53 -07:00
Dianne Hackborn
cb1c45ed80 am b6ce1f31: Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev
* commit 'b6ce1f311ce154af713ebc4f543fc2aaed446939':
  Fix issue #6675499: java.lang.RuntimeException: Unable to start...
2012-06-20 12:08:00 -07:00
Dianne Hackborn
b6ce1f311c Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev 2012-06-20 12:06:14 -07:00
Jean-Michel Trivi
b92d2a13c4 am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into jb-dev
* commit '18ddb6ce6f3672a24a6f86ee4b28f5baa746bc20':
  Remote volume handling in MediaRouter
2012-06-20 09:10:18 -07:00
Jean-Michel Trivi
18ddb6ce6f Merge "Remote volume handling in MediaRouter" into jb-dev 2012-06-20 09:07:59 -07:00
Luca Zanolin
50ff53be52 am 17c1425f: Merge "Clone the list of listeners before notifing any event." into jb-dev
* commit '17c1425f5ab5c6f734a700d74b5bd8118f289cd5':
  Clone the list of listeners before notifing any event.
2012-06-20 02:34:33 -07:00
Luca Zanolin
17c1425f5a Merge "Clone the list of listeners before notifing any event." into jb-dev 2012-06-20 02:32:12 -07:00
Hung-ying Tyan
87ab6962e4 Fix crash when SimpleCursorAdapter changes cursor from null
when the spinner's drop-down view is shown.

Bug: 6637141

Change-Id: I62f759f778b040db386cc72a753c3b2745517b7e
2012-06-20 15:58:43 +08:00
Jean-Michel Trivi
1357012968 Remote volume handling in MediaRouter
Extend MediaRouter.UserRouteInfo to enable setting playback
 information, which includes volume. When the user route instance
 has a RemoteControlClient, forward any playback information to it.
 Enable specifying a callback to be notified of volume events
 on the route.
Extend MediaRouter.RouteInfo to enable retrieving playback
 information.

Update RemoteControlClient javadoc to reflect which parts of the
 API are not intended to be made public.

Change-Id: I59d728eb61747af6c8c89d53f0faeb07940594c3
2012-06-19 19:41:35 -07:00
Adam Powell
da8288037c am 2dde147b: Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev
* commit '2dde147b28684fc32f03ad748af8eb87d5408c7c':
  Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter.
2012-06-19 19:20:05 -07:00
Adam Powell
2dde147b28 Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev 2012-06-19 19:18:34 -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
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
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
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
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
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
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
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
Dianne Hackborn
ecf5bc551e am fe54cb6f: Merge "Docs only: DENSITY_TV, not just for TVs any more!" into jb-dev
* commit 'fe54cb6f3da7fe95d5141d97b0c6780e001ad058':
  Docs only: DENSITY_TV, not just for TVs any more!
2012-06-19 10:56:30 -07:00
Jean-Michel Trivi
586b8ee62e am 2f442304: Merge "Remote volume handling" into jb-dev
* commit '2f4423043ffeaf232ec984be03743326f08cdc8a':
  Remote volume handling
2012-06-19 10:56:28 -07:00
Dianne Hackborn
fe54cb6f3d Merge "Docs only: DENSITY_TV, not just for TVs any more!" into jb-dev 2012-06-19 10:54:42 -07:00
Jean-Michel Trivi
2f4423043f Merge "Remote volume handling" into jb-dev 2012-06-19 10:54:32 -07:00
Luca Zanolin
c20fc8daf5 Clone the list of listeners before notifing any event.
This is required, otherwise the listener cannot remove it-self from the
list of listeners during the notification.

Bug: 6692355
Change-Id: I07762feb4f9b97ec4b6148d2f604d53e266b84d7
2012-06-19 18:15:29 +01:00
Dianne Hackborn
493861dfa0 Docs only: DENSITY_TV, not just for TVs any more!
Change-Id: Id70e0bc179ab405fbb7f3b2cda7b75f44ff30b57
2012-06-18 19:29:45 -07:00
Gilles Debunne
4c268a3271 am badf5a94: Merge "Fixed text rendering issue with spans." into jb-dev
* commit 'badf5a9442e639dc6ae2c4794c202143f6d2f16d':
  Fixed text rendering issue with spans.
2012-06-18 18:56:12 -07:00
Gilles Debunne
badf5a9442 Merge "Fixed text rendering issue with spans." into jb-dev 2012-06-18 18:53:31 -07:00
Jean-Michel Trivi
3114ce3861 Remote volume handling
Extend RemoteControlClient class to enable an applicaton to
 specify more information about how it's playing media, now covering
 usecases where media playback happens "remotely". This playback
 information can be used to set the volume and maximum volume
 used remotely.
Declare a new intent and associated extras in Intent,
 ACTION_VOLUME_UPDATE, so an application can be notified that
 the volume it handles should be updated. It can then use
 the new RemoteControlClient.setPlaybackInformation() method
 to notify AudioService what the volume is.
Extend AudioService to maintain playback information associated
 with the RemoteControlClient information in the stack of
 media button event receivers (mRCStack). The information
 about the active remote is cached so the stack doesn't have
 to be iterated over in order to retrieve remote playback info.
 Events to "adjust" the remote volume based on hardware key
 presses cause the client application to be notified of
 volume updates, and the volume panel to display the volume
 set by the app.
 Revise which stream type is controlled when none is specified
 according to latest guidelines for remote playback.
Update VolumePanel class to support a new pseudo stream type,
 AudioService.STREAM_REMOTE_MUSIC, that corresponds to the
 remote playback volume, and uses the new "media route" icon.
 Enable it to receive asynchronously new volume values for
 the remote that will be displayed if the UI is still up,
 and ignored otherwise.
 Now supports hiding/showing sliders dynamically so remote
 volume only appears when AudioService has a remote control
 client handling remote volume.
Define new java symbols for the two media route icons.
Modify lockscreen behavior: don't automatically control music
 volume when music is active, consider also remote playback.

Still to do:
- playback information set by RemoteControlClient should post
  a message for AudioService to update playback information
  instead of updating it synchronously

Change-Id: I557aa687239f9acfe33a609f05876c67fa7eb967
2012-06-18 18:37:17 -07:00
Nicolas Falliere
277c09f6c1 am 56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev
* commit '56bb344ccfd3d261cea9987c98a17d0820279b17':
  Added or fixed doctrings for required permissions.
2012-06-18 17:42:57 -07:00
Nicolas Falliere
9530e3a22d Added or fixed doctrings for required permissions.
Bug: 6591338
Change-Id: Ia2092f9994854701b5fa1425c371817367ae07ec
2012-06-18 17:22:34 -07:00
Svetoslav Ganov
45c4a8df94 am ec7c7ebf: Merge "API for finding accessibility focus in virtual tree not needed." into jb-dev
* commit 'ec7c7ebf01121d17f7a12e827bd77c024eab54e8':
  API for finding accessibility focus in virtual tree not needed.
2012-06-18 11:30:09 -07:00
Svetoslav Ganov
ec7c7ebf01 Merge "API for finding accessibility focus in virtual tree not needed." into jb-dev 2012-06-18 11:27:44 -07:00
Svetoslav Ganov
05fa21fa77 am 4cb3b76c: Merge "Ensure WebViewClassic calls super.onHoverEvent()" into jb-dev
* commit '4cb3b76caa004867bac43f0001072e24bfa8c120':
  Ensure WebViewClassic calls super.onHoverEvent()
2012-06-18 10:36:12 -07:00
Adam Powell
8f695c525f am 706a8699: Merge "Make MediaRouter UI more robust around route count changes" into jb-dev
* commit '706a8699008ce416a7fbd9a4215726fdb00ee803':
  Make MediaRouter UI more robust around route count changes
2012-06-18 10:34:29 -07:00
Jeff Brown
7947698096 am d7a04de1: Capture window manager\'s last ANR state in bug report.
* commit 'd7a04de16798acc04ec0a89a0c7d9f1cf60d1521':
  Capture window manager's last ANR state in bug report.
2012-06-18 10:34:25 -07:00
Makoto Onuki
df6d3eebba am c4637d3e: Merge "Allow restricting the scope of a phone-filter search" into jb-dev
* commit 'c4637d3efbbeb3e204691da96c357b5fea4ae2f1':
  Allow restricting the scope of a phone-filter search
2012-06-18 10:33:45 -07:00
Adam Powell
bb20575f85 am 130b4572: ActionProvider API update
* commit '130b4572d1f3df702e5b296a655d15a41f6d4c66':
  ActionProvider API update
2012-06-18 10:33:19 -07:00
Jeff Brown
4440d158b8 am 5aa02e20: Merge "Revert "Synthesize fake vsyncs when the screen is off."" into jb-dev
* commit '5aa02e20186a9e30553a8ef0d53d5fad4c0b7597':
  Revert "Synthesize fake vsyncs when the screen is off."
2012-06-18 10:32:39 -07:00
Svetoslav Ganov
11832db437 am 531d5866: Merge "Accessibility focus search and setting it from hover are performed by the client." into jb-dev
* commit '531d5866d8e2529e2ae1c6ef12202119753bec03':
  Accessibility focus search and setting it from hover are performed by the client.
2012-06-18 10:32:16 -07:00
Teng-Hui Zhu
c1d3b23b54 am 2075f2d3: Merge "Notify Java side to start when transition into full screen mode without a reload." into jb-dev
* commit '2075f2d3e486b565c9abd2556d81dfb1449f6efb':
  Notify Java side to start when transition into full screen mode without a reload.
2012-06-18 10:31:16 -07:00
Svetoslav Ganov
4cb3b76caa Merge "Ensure WebViewClassic calls super.onHoverEvent()" into jb-dev 2012-06-18 10:20:42 -07:00