5139 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
695b2d089e am 5f77f82e: Merge "Another case of extra ">""
* commit '5f77f82e609b24504e026751228b399b8dc57ab5':
  Another case of extra ">"
2012-06-23 07:12:19 -07:00
Jean-Baptiste Queru
6c1f2b136b am b8b47c22: Merge "Remove redundant ">""
* commit 'b8b47c22c8dc1f5facfbb4729511772630cc3aa6':
  Remove redundant ">"
2012-06-23 07:12:16 -07:00
Ying Wang
5539e720b4 am ddeb7bd3: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'ddeb7bd3c7593d51d4d2bfd9fe39d5f0ffa05d89':
  Import translations. DO NOT MERGE
2012-06-22 15:01:52 -07:00
Ying Wang
8f2acd0a2b Import translations. DO NOT MERGE
Change-Id: Idcb453e08823c584fb0f748ebe46ed036046c9d4
2012-06-22 12:53:57 -07:00
RoboErik
a3bd05f212 am b047b1f7: Merge "b/6705777 Remove \'speaker\' from strings" into jb-dev
* commit 'b047b1f73800ff92eea4ff4b3adc62e5a20eb8df':
  b/6705777 Remove 'speaker' from strings
2012-06-21 17:22:50 -07:00
RoboErik
be76e21543 b/6705777 Remove 'speaker' from strings
We should just say Tablet or Phone when selecting the local
playback instead of Tablet speakers or Phone speaker.

Change-Id: Ia6c439f711bacb7b1e70fbcf4887df8141f91b61
2012-06-21 17:05:52 -07:00
Eric Fischer
242f1323d2 am cda69964: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'cda6996408d785f368e67afaca79a6afa6f57b1b':
  Import translations. DO NOT MERGE
2012-06-21 13:12:08 -07:00
Eric Fischer
cda6996408 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-21 13:10:49 -07:00
Eric Fischer
ed6103d573 Import translations. DO NOT MERGE
Change-Id: If3ebb62b4c2a912512600e51129551e23cf31553
2012-06-21 12:57:27 -07:00
Jake Hamby
dcd6e38c6a am 65d4445b: Merge "Add config option to enable links to Cell Broadcast app." into jb-dev
* commit '65d4445bfd3351609f786fdf6038ddd362a3d6ca':
  Add config option to enable links to Cell Broadcast app.
2012-06-21 12:34:35 -07:00
Jake Hamby
43af7e0756 Add config option to enable links to Cell Broadcast app.
Add "config_cellBroadcastAppLinks" internal boolean config item,
defaulting to false. For devices with the Cell Broadcast app,
setting this config option to true will add a menu item to the
MMS app to jump to the list of received cell broadcasts, and a
preferences item to Settings to jump to cell broadcast settings.

Bug: 6709985
Change-Id: I9fe1919e6d76ba1dfe1e1381e2c38ecdd5e0a867
2012-06-21 12:17:18 -07:00
Eric Fischer
7059a022fe am da036c8a: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'da036c8a5709d5b985e0dd63c379e93135768c81':
  Import translations. DO NOT MERGE
2012-06-21 11:52:11 -07:00
Eric Fischer
da036c8a57 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-20 22:42:58 -07:00
Craig Mautner
e96f06ae16 am 255cb779: Merge "Make animations persist after completion." into jb-dev
* commit '255cb7798160a083124cd2033e0619f8b3ed731c':
  Make animations persist after completion.
2012-06-20 22:31:09 -07:00
Eric Fischer
c23e54b4e1 Import translations. DO NOT MERGE
Change-Id: Ic5c7a282f3ce75cba92d8cda741ecaa9088d12be
2012-06-20 19:48:35 -07:00
Craig Mautner
255cb77981 Merge "Make animations persist after completion." into jb-dev 2012-06-20 19:28:16 -07:00
Craig Mautner
a371154f08 Make animations persist after completion.
Transition animations were set to fillAfter=false which caused them
to revert when they had completed. Normally this would not have
mattered as the final state was obscured by the new Activity. In
the case of the Phone app the Activities churn so much that the
original Activity was exposed.

Fixes bug 6691421.

Change-Id: I96b8a43d0a2cac9a34a14a309548c41451c65a57
2012-06-20 18:49:38 -07:00
Svetoslav Ganov
0a79d2fbcd am dce5af63: Merge "Fix GlowPadView accessibility behavior." into jb-dev
* commit 'dce5af632ce8899905fbf187b9505f6753d5a562':
  Fix GlowPadView accessibility behavior.
2012-06-20 16:55:07 -07:00
alanv
78bfb98295 Fix GlowPadView accessibility behavior.
Bug: 6702412
Change-Id: If5ab75e77b0090a405004c66da0083e81d59deb4
2012-06-20 13:22:45 -07:00
Ying Wang
7ea4979835 am edc34cf5: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'edc34cf55482faa25b48e867bd51ecec74dbd0e8':
  Import translations. DO NOT MERGE
2012-06-20 12:28:33 -07:00
Ying Wang
ddaeed3615 Import translations. DO NOT MERGE
Change-Id: If50ab67d8bc4570a07cb2e9dba0c22ed4f7d7592
2012-06-20 11:58:21 -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
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
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
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
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
3dc1af6b68 Import translations. DO NOT MERGE
Change-Id: I050bc722a5a06acc49fc519d57bf16b14158e97a
2012-06-19 14:38:50 -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
Jean-Michel Trivi
2f4423043f Merge "Remote volume handling" into jb-dev 2012-06-19 10:54:32 -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
Jim Miller
a10b1a738d am 12da2c5e: Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev
* commit '12da2c5eeeadd6c23da5d3003d0da3b6b73d5052':
  Fix 6665117: ACTION_ASSIST visual improvements
2012-06-18 13:32:05 -07:00
Jim Miller
12da2c5eee Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev 2012-06-18 13:29:49 -07:00
Ying Wang
a5bcf81416 am c4947277: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'c4947277e821153fc01256a425e4cbbe34a06eda':
  Import translations. DO NOT MERGE
2012-06-18 12:58:59 -07:00
Ying Wang
e3efec74b3 Import translations. DO NOT MERGE
Change-Id: I0108055d8a3aa31fb8157b43e0f2224fab488642
2012-06-18 12:36:51 -07:00
Adam Powell
c92aa2e7c9 am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-dev
* commit '1b4dc0fe00805f82fb4bb89a97b6b0501e117505':
  Volume control in MediaRouter dialogs
2012-06-18 10:34:32 -07:00
Adam Powell
772ddc0cf2 am fd4df469: Merge "Remove workaround for bug that was fixed a while ago." into jb-dev
* commit 'fd4df46917c79067416985ac53a3da6b27e8c333':
  Remove workaround for bug that was fixed a while ago.
2012-06-18 10:32:46 -07:00
Ying Wang
d18d623fe9 am c1568fea: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'c1568feaba9f3c4b9f0fab5fcdf062ecb922fcaa':
  Import translations. DO NOT MERGE
2012-06-18 10:31:51 -07:00
Adam Powell
4599696591 Volume control in MediaRouter dialogs
MediaRouter dialogs now intercept the volume keys for altering the
current volume. The status icon indicates if the slider/buttons are
currently controlling the local device volume or a remote device's
volume.

Group volume for user routes is handled by using the
RemoteControlClient supplied by the first route in the group.

Change-Id: I40a0d054847ed5acce7a4c3b669487841b4dca15
2012-06-16 17:21:57 -07:00
Jim Miller
20039ad17b Fix 6665117: ACTION_ASSIST visual improvements
- add generic icon for search providers that don't supply one
- change alpha weighting factor for glow
- don't show ring background

Change-Id: I86c86dc2d623c25ec7b91e206fac8ad9cd60faac
2012-06-15 18:11:00 -07:00
Adam Powell
fd4df46917 Merge "Remove workaround for bug that was fixed a while ago." into jb-dev 2012-06-15 15:32:14 -07:00
Adam Powell
307c5cfcdd Remove workaround for bug that was fixed a while ago.
Change-Id: I368dd8fea6b33af6908b6fe3b7691104166a707a
2012-06-15 15:19:09 -07:00
Ying Wang
c1568feaba Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-15 14:19:08 -07:00
Ying Wang
249405253d Import translations. DO NOT MERGE
Change-Id: I6ab3489fe984c442dceaef41e76ee5e6783e65ef
2012-06-15 12:44:39 -07:00
Adam Powell
15635728a4 am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev
* commit '27db797e37ea16ea5db6eb3f6a32e0f116c1b824':
  Update MediaRouteChooserDialog grouping UI
2012-06-15 11:54:42 -07:00
Adam Powell
b5e2af5919 Update MediaRouteChooserDialog grouping UI
Move UserRouteInfo tag support to RouteInfo

Change-Id: Ia753924f8613462d5f74736be93a8d748689eef1
2012-06-15 00:11:34 -07:00
Eric Fischer
eb02d40c6d am 97c11fe3: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '97c11fe3255dca23dad241bf7025a88a7336f4a1':
  Import translations. DO NOT MERGE
2012-06-14 12:22:57 -07:00
Eric Fischer
97c11fe325 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-14 12:20:40 -07:00