Commit Graph

183597 Commits

Author SHA1 Message Date
Mike Lockwood
eebc98ff18 MidiDeviceService: Add getDeviceInfo() accessor method
so service implementations can access their own device info object.

Change-Id: I93e0c449e72d76568d7b4c9f7f7db00a846b5a33
2015-03-06 08:17:33 -08:00
Mike Lockwood
35110d1ed7 Add MidiDevice.close() method so we can clean up our ServiceConnection
Change-Id: I65cd4cfd940b02709daeffef6dab814305b8a6b0
2015-03-04 20:38:42 -08:00
Mike Lockwood
3b7664589b Make MidiSender and MidiReceiver abstract classes, rename MidiReceiver.post() to receive()
Change-Id: I1cef3bd48ca0acf2968c9de223f78445f3434404
2015-03-04 20:38:37 -08:00
Mike Lockwood
20821ecbe8 Eliminate MidiPort base class for MidiInputPort and MidiOutputPort
Change-Id: I628c0468ac980eee909add53a4d6e55e9b358603
2015-03-04 16:15:45 -08:00
Adam Powell
27b7c1f526 Merge "Add ChooserTargetService API" 2015-03-05 00:07:53 +00:00
Mike Lockwood
c623ec973b Merge "MidiManager: Virtual MIDI devices are now implemented as Services" 2015-03-05 00:01:33 +00:00
Chris Craik
ef7aa4fc19 Merge "Patch cleanup, reenable Patch Glops" 2015-03-04 23:41:42 +00:00
Chris Craik
8820fd1d82 Patch cleanup, reenable Patch Glops
bug:19597454

Change-Id: If12b95e83588b81a553210cd8c2437c6c771073a
2015-03-04 15:32:47 -08:00
John Spurlock
f0f293f0fa Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-03-04 23:26:01 +00:00
Glenn Kasten
fad60c343a Merge "soundpool: update sample rate when reusing audiotrack" 2015-03-04 23:25:28 +00:00
Glenn Kasten
9e9e2f7014 Merge "soundpool: reuse channel for same sample if available" 2015-03-04 23:25:03 +00:00
John Spurlock
1bea125ca8 am 3bedeb01: am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit '3bedeb010103f4da26241c23929aa38598758f93':
  MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:24:53 +00:00
John Spurlock
3bedeb0101 am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit 'bd438742870a51eacea3554376f671bd1be0e30c':
  MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:15:51 +00:00
John Spurlock
bd43874287 am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit 'b879e7395fa9446952b840b1d576ff225b039774':
  MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:09:19 +00:00
John Spurlock
b879e7395f am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit 'c974ac11f808968648d26e83a0b64a7fba02ad15':
  MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:01:26 +00:00
John Spurlock
75328b703f Merge "Audio: Remove the concept of master volume." 2015-03-04 22:59:41 +00:00
John Spurlock
ee5ad729b9 Audio: Remove the concept of master volume.
- Remove two config resources (use master volume, and volume ramp).
- Remove master volume adjustments / getters / intents.
- Retain @hidden setMasterMute, needed for device admin
- Remove master volume logic in AudioService.
- Remove master volume logic in VolumePanel.
- Rename "getMasterStreamType" to "getUiSoundsStreamType" to avoid confusion.

Bug: 19582978
Change-Id: Id02c8fa4898cff3b913147f5ac1b4038e2e7cc24
2015-03-04 17:51:44 -05:00
Julia Reynolds
a9b33ddf31 Merge "DOs can clear the DI; rehide hasUserSetupCompleted." 2015-03-04 22:38:23 +00:00
Julia Reynolds
e925440a55 DOs can clear the DI; rehide hasUserSetupCompleted.
Bug: 19230954
Change-Id: I97467229b23f3c9be1c3c4fff1c888a812f14a95
2015-03-04 17:36:00 -05:00
Chris Craik
92c2ca9526 Merge "Temporarily disable Patch glops" 2015-03-04 22:31:00 +00:00
Raph Levien
35091569b9 Merge "Some refactoring of StaticLayout" 2015-03-04 22:28:19 +00:00
Chris Craik
a9761e698e Temporarily disable Patch glops
bug:19597454

Change-Id: I9dbe781a714582717a5585113b9a56821265b36e
2015-03-04 14:25:10 -08:00
Adam Powell
e30c9af356 Add ChooserTargetService API
A ChooserTargetService can be implemented by apps that wish to offer
additional deep-link targets for the system intent chooser to in turn
offer to the user. This allows apps to create contextually relevant
shortcuts for UI flows that would otherwise require several steps of
explicit disambiguation. For example, a chat app might offer one-touch
access to recent conversations when sharing a photo to it from
elsewhere.

The chooser implementation must limit the number of
ChooserTargetServices it elects to query in order to respect available
system resources. Only the system chooser is permitted to bind to a
ChooserTargetService.

Change-Id: Ia7e075ee649c51cf2035f20aee166c5a27d91aeb
2015-03-04 14:23:30 -08:00
Raph Levien
d3ab692d28 Some refactoring of StaticLayout
This patch refactors construction of StaticLayout to use an explicit
Builder object, which is intended to hold state used for constructing
the layout but not needed for merely reading out the results.

Builder objects are allocated from a pool and explicitly recycled,
so there is insignificant additional allocation cost.

This patch has very little impact on performance (it does avoid
allocating a FontMetricsInt object) but opens the way for significant
performance and functionality improvements as more of the Builder
functionality migrates to native code.

Change-Id: I2a576643e573a38b61f895a80d5d92a85c94b6b4
2015-03-04 13:49:12 -08:00
Mike Lockwood
11fd96d6ff MidiManager: Virtual MIDI devices are now implemented as Services
To implement a virtual MIDI device, include a subclass of MidiDeviceService in
your application.  This service is identified by an intent filter and meta-data
in the application's manifest to allow the MIDI manager to register the virtual device
without actually running the application. Instead, the application's MidiDeviceService
subclass is started on demand when MIDI manager clients want to open the device.

Here is an example of how the MidiDeviceService might be described in the application manifest:

    <service android:name="VirtualDeviceService">
        <intent-filter>
            <action android:name="android.media.midi.MidiDeviceService" />
        </intent-filter>
        <meta-data android:name="android.media.midi.MidiDeviceService"
            android:resource="@xml/device_info" />
    </service>

and the device_info.xml meta-data:

<devices>
    <device manufacturer="Sample Manufacturer" model="Sample Model" private="false">
        <input-port name="my input port" />
        <output-port name="my output port" />
    </device>
</devices>

(note that the <input-port> and <output-port> names are not currently used, but support for these
will be added in a subsequent change)

Client's of the virtual device will bind directly to the hosting application's MidiDeviceService subclass.
To support this, MidiManager.openDevice() now returns the MidiDevice asynchronously via a callback.

This change also adds a utility class called MidiDispatcher, which is a MidiReceiver
that dispatches all data it receives to a list of other MidiReceivers.
We now use this internally in MidiInputPort and MidiDeviceServer, but developers
may use it for other purposes as well.

Change-Id: Ic3009f06d56f3d5edbd87de3f0c330b51a1c217d
2015-03-04 13:45:38 -08:00
Dianne Hackborn
e56301f16a Merge "Fix reading of daily data." 2015-03-04 21:34:12 +00:00
Dianne Hackborn
8cfb58bd58 Fix reading of daily data.
Change-Id: I1f581197c938109cfe5cc21109eea57b4e0434dc
2015-03-04 13:28:36 -08:00
Julia Reynolds
aa7e7318e3 Merge "Allow the device initializer to perform user setup tasks." 2015-03-04 19:01:31 +00:00
John Spurlock
c974ac11f8 MediaProjectionPermissionActivity: Fix NPE.
Avoid dismissing a null dialog.

Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit 3d332f4e67)
2015-03-04 18:58:18 +00:00
Chris Wren
d17696904d Merge "Remove spammy notification_cancel event log." 2015-03-04 18:40:21 +00:00
Amith Yamasani
f834c282aa Merge "Fix a regression in UsbDebuggingManager" 2015-03-04 18:04:02 +00:00
Amith Yamasani
f4a8df4c7e Fix a regression in UsbDebuggingManager
Catch NPE as well if socket object is null.

Bug: 19602060
Change-Id: I7cf9cb16abc3fde626170c1aefeba5fc91c5734f
2015-03-04 10:00:11 -08:00
Andrew Shulaev
2de257f083 Merge "Revert "Added function to render a drawable in all available states"" 2015-03-04 17:44:12 +00:00
Evan Charlton
a71a79dea3 Merge "Fix some javadocs typos" 2015-03-04 17:43:39 +00:00
Andrew Shulaev
01cdf8b135 Revert "Added function to render a drawable in all available states"
This reverts commit 63483e17de.

Change-Id: I07fced229759e63d4fa4f94b7dac48b3e9342b18
2015-03-04 17:43:19 +00:00
Dhananjay Kumar
a7d57a6f00 soundpool: update sample rate when reusing audiotrack
User might update playback rate while calling Play on a sample.
Update sample rate if reusing existing audio track.

Change-Id: I7007c335fa405baf663a322408b92b9df53efdb0
Signed-off-by: Glenn Kasten <gkasten@google.com>
2015-03-04 09:22:18 -08:00
Haynes Mathew George
570576b51b soundpool: reuse channel for same sample if available
Reuse channel for same sample if the channel completed
current playback and is not reallocated to another sample,
i.e. not stolen by other sample.

authored-by: Ashish Jain <ashishj@codeaurora.org>

Change-Id: Ibe7ee318c7dc11f3c4fd3a2f57d861318b10973b
Signed-off-by: Glenn Kasten <gkasten@google.com>
2015-03-04 09:16:28 -08:00
Andrew Shulaev
14ef3ae59e Merge "Added function to render a drawable in all available states" 2015-03-04 16:59:30 +00:00
Andrew Shulaev
63483e17de Added function to render a drawable in all available states
Change-Id: I230cc5775a09120efe9c82a4017b001aa510ddff
2015-03-04 16:57:06 +00:00
Chris Wren
bddb5bc846 Remove spammy notification_cancel event log.
We also log when notifications are actually canceled,
so this only tells us how often clients cancel non-existent
notifications.  The answer: quite often.

Bug: 19599876
Change-Id: I812866cb080d51974d4db0b6e6b3eb50c3aeb560
2015-03-04 08:48:42 -08:00
Adrian Roos
f855b0d2d0 Merge "Update immersive cling visuals" 2015-03-04 16:30:19 +00:00
Adrian Roos
62b65e4a8f Update immersive cling visuals
Also enables the swipe from top gesture for revealing
the navigation bar, even if the status bar is visible.

Bug: 19282730
Change-Id: I7b562c2f0f00ff3f05b8b1e44657efe79b45f9c7
2015-03-04 17:28:14 +01:00
Geoff Mendal
cdcbe17a65 Merge "Import translations. DO NOT MERGE" 2015-03-04 15:33:42 +00:00
Geoff Mendal
9bf06d83ce Import translations. DO NOT MERGE
Change-Id: Ie73169cd2ccab4f812f7cabbf30d0c0adb570c65
Auto-generated-cl: translation import
2015-03-04 07:31:55 -08:00
Julia Reynolds
20118f18c1 Allow the device initializer to perform user setup tasks.
A device initializer is an application that is allowed to run
during user provisioning on device owner devices. During
device provisioning (or, user provisioning of the first user
of the device), a device initializer is granted device owner
permissions. During secondary user provisioning, a device
initializer is granted profile owner permissions. Once
provisioning is complete for a user, all elevated permissions
are removed from the device initializer and the device admin
component of the app is disabled.

Bug: 19230954
Change-Id: Ib6725fb3b09bb21e4198a5dc0b445ccebb40b27e
2015-03-04 10:25:43 -05:00
Andrei Kapishnikov
d5fe9f60b3 Merge "Replace absolute_uri with absolute_path when HTTP request is forwarded to non-proxy server." 2015-03-04 14:56:31 +00:00
Geoff Mendal
a337b60097 Merge "Import translations. DO NOT MERGE" 2015-03-04 14:55:12 +00:00
Geoff Mendal
a4f2c41ebf Import translations. DO NOT MERGE
Change-Id: I7b7b245ade1c83878576c5e9e489a4506bfd7538
Auto-generated-cl: translation import
2015-03-04 06:50:38 -08:00
Geoff Mendal
e901c4262b am 850fd489: (-s ours) am b214417a: (-s ours) am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '850fd489dea0cdf7199cce73027fc95658b0993f':
  Import translations. DO NOT MERGE
2015-03-04 14:20:25 +00:00
Geoff Mendal
aee73e3d11 am 116b9336: (-s ours) am bb9360e3: (-s ours) am 63069cc9: (-s ours) Import translations. DO NOT MERGE
* commit '116b9336e2798fdbdea1b98aa4455b485268587b':
  Import translations. DO NOT MERGE
2015-03-04 14:20:19 +00:00