79266 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
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
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
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
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
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
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
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
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
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
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
The Android Open Source Project
345ca5a104 Reconcile with jb-release
Change-Id: I4200341adee9a73e326fb9f0c6eefa3d8e01a2b9
2012-06-19 07:15:35 -07:00
The Android Automerger
07a70ab467 merge in jb-release history after reset to jb-dev 2012-06-19 07:03:42 -07:00
The Android Open Source Project
5158db8b07 Reconcile with jb-release
Change-Id: I451b63991c4550290f6e32f2f555f0412bf0b28c
2012-06-19 06:13:23 -07:00
Adam Powell
29a2f84fbe am 5bb835a9: Merge "MediaRouter bluetooth a2dp selection" into jb-dev
* commit '5bb835a95942b0b313b2fa4e3f05941e630f9be7':
  MediaRouter bluetooth a2dp selection
2012-06-18 21:40:19 -07:00
Adam Powell
5bb835a959 Merge "MediaRouter bluetooth a2dp selection" into jb-dev 2012-06-18 21:36:23 -07:00
Adam Powell
dd0a19266d MediaRouter bluetooth a2dp selection
Remove bluetooth permission check from internal AudioService method
setBluetoothA2dpOn

Manage BT A2DP state in MediaRouter. A2DP is only enabled or disabled
when either the system built-in audio route or the A2DP audio route is
selected; when selecting any other route the current state is left
alone.

Change-Id: Ib14274e206e79bd8762edca1205ecfa87b7a94cf
2012-06-18 19:51:02 -07: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
Craig Mautner
ae3e5bc93f am 89f5a462: Merge "More paths for turning on screen immediately." into jb-dev
* commit '89f5a4624bfa487cb5fb192d9c3c9b30937b3f26':
  More paths for turning on screen immediately.
2012-06-18 18:04:42 -07:00
Craig Mautner
89f5a4624b Merge "More paths for turning on screen immediately." into jb-dev 2012-06-18 18:01:53 -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
56bb344ccf Merge "Added or fixed doctrings for required permissions." into jb-dev 2012-06-18 17:39:48 -07:00
Jim Miller
60fd2b2de2 am ddbc85cb: Merge "Fix 6683092: tune GlowPadView wave animation" into jb-dev
* commit 'ddbc85cbfdc8ac6ed02b104f0e9c46018a0e1c53':
  Fix 6683092: tune GlowPadView wave animation
2012-06-18 17:23:28 -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
Jim Miller
ddbc85cbfd Merge "Fix 6683092: tune GlowPadView wave animation" into jb-dev 2012-06-18 17:22:10 -07:00
Jim Miller
5892e2ec25 Fix 6683092: tune GlowPadView wave animation
This adds some aesthetic changes to the wave animation for GlowPadView:
- wave shape is no longer symmetric
- disable expand in keyguard
- enable expand in SearchPanelView (when mAlwaysTrackFinger == true)
- if a current wave animation isn't finished yet, don't start a new one
- various timing changes

Change-Id: Ibce96f45eb6a94582c694108b99e243fd57b1955
2012-06-18 17:04:58 -07:00
Craig Mautner
75fc9de258 More paths for turning on screen immediately.
This fix forces the path through the updateLightsLocked method to turn
the screen on immediately if mWaitingForFirstLightSensor is true. Also
do not clear mWaitingForFirstLightSensor if mPreparingForScreenOn
is true. Wait until it turns false.

Fixes bug 6612418.

Change-Id: I03407e748cce4906a73de1f15df1654649b133c4
2012-06-18 16:53:27 -07:00
Amith Yamasani
39758edbed am 386ce58a: Merge "Don\'t backup or delete the backup file, if it\'s in the backup path." into jb-dev
* commit '386ce58a21b81390d2831b0f1107d03773af687a':
  Don't backup or delete the backup file, if it's in the backup path.
2012-06-18 16:51:41 -07:00