80720 Commits

Author SHA1 Message Date
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
Victoria Lease
a129a3b0ca Merge "Engineer-asset light-theme findonpage prev/next buttons" 2012-06-19 15:42:10 -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
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
Chris Wren
b4e2c48b4d open notifications near the top with a single finger.
Bug: 6538918
Change-Id: I824937e9acd8f20449c31f8d83dbd90ecbb75ef0
2012-06-19 11:49:23 -07:00
Dianne Hackborn
d80e7fb3f8 am ecf5bc55: am fe54cb6f: Merge "Docs only: DENSITY_TV, not just for TVs any more!" into jb-dev
* commit 'ecf5bc551eddacfb4a4041d614f8fe50672659ae':
  Docs only: DENSITY_TV, not just for TVs any more!
2012-06-19 10:59:18 -07:00
Jean-Michel Trivi
629f051f7d am 586b8ee6: am 2f442304: Merge "Remote volume handling" into jb-dev
* commit '586b8ee62e0245e3c88ce9db51e1c1c3b4f1fb2c':
  Remote volume handling
2012-06-19 10:59:15 -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
Steve Block
880c5f5aea Merge "Document missing default values in WebSettings" 2012-06-19 10:34:13 -07:00
Steve Block
b0e0f33442 Document missing default values in WebSettings
Bug: 6641511
Change-Id: I21e02a8467ee5efd104ec9da5751785284369b9d
2012-06-19 18:32:35 +01:00
Raph Levien
47ab650bca Merge "Fix bug 6688060: breakage in AndroidCharacter.mirror" 2012-06-19 08:43:56 -07:00
The Android Open Source Project
b305795967 am 345ca5a1: Reconcile with jb-release
* commit '345ca5a104eb6e867a9ad982e1b3f6d037ba0171':
2012-06-19 07:20:52 -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
Steve Block
d438710685 Merge "Clarify JavaDoc for setting database paths in WebSettings" 2012-06-19 06:42:36 -07:00
The Android Open Source Project
203ad16d29 am 5158db8b: Reconcile with jb-release
* commit '5158db8b07e9512788ecf1f887643e8bc25ce48f':
  Fix an NPE and possible unsynchronized call of Locked method.
  Fix 6665117: ACTION_ASSIST visual improvements
  Capture window manager's last ANR state in bug report.
  Capture input dispatcher's last ANR state in bug report.
  Fix issue #6636731: Mariner animation ring gets stuck
  Jelly Bean ringtone Bug: 6619980
  Remove Disco video from builds.
  Change snap behavior for lock screen
  Improve ANR diagnostics.
  Detect bad behavior earlier in Choreographer.
  Revert "Fix fake bold for fallback fonts in frameworks."
  Include important native processes in watchdog stacks.
  Fix issue #6641368: can't launch gallery
2012-06-19 06:19:56 -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
e97d222110 am 29a2f84f: am 5bb835a9: Merge "MediaRouter bluetooth a2dp selection" into jb-dev
* commit '29a2f84fbee96c1bbbcb50eceb17d9b726854146':
  MediaRouter bluetooth a2dp selection
2012-06-18 21:43:46 -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
Jeff Brown
4f8ecd8029 Move power manager to a new package.
Change-Id: I5f5a6435e64354b7d6535e8e9a63934ba7a3f448
2012-06-18 19:43:44 -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
099adfba81 am 4c268a32: am badf5a94: Merge "Fixed text rendering issue with spans." into jb-dev
* commit '4c268a32714fefe141d093abb59806a2d6f2991c':
  Fixed text rendering issue with spans.
2012-06-18 18:59:25 -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
ceeec4e6a6 am ae3e5bc9: am 89f5a462: Merge "More paths for turning on screen immediately." into jb-dev
* commit 'ae3e5bc93f1077615b4ec8f6fbd06509241d25de':
  More paths for turning on screen immediately.
2012-06-18 18:07:46 -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
4d2bef3f85 am 277c09f6: am 56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev
* commit '277c09f6c16c4adfd50407e2fa4dbf61a0e06e55':
  Added or fixed doctrings for required permissions.
2012-06-18 17:45:40 -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