7250 Commits

Author SHA1 Message Date
Jean-Michel Trivi
b45c273033 AudioAttributes: parcelable, hide support for tags
Make the AudioAttributes class parcelable.

Hide support for adding and querying tags, there is no SDK-backed
  use case for this feature.

Bug 15306334

Change-Id: Idb67a735778e687d73020ed0120643f31fc230a6
2014-06-04 17:22:16 -07:00
Leon Scroggins III
a578ab00c4 Merge "Ignore inPurgeable and inInputShareable." 2014-06-04 14:04:18 +00:00
Sander Alewijnse
1b8737ee18 Merge "Remove enableSystemApp() and enableSystemAppWithInten()." 2014-06-04 10:11:46 +00:00
Przemyslaw Szczepaniak
e3abed72d6 Add missing #isSpeaking to TTS API V2
TextToSpeech#isSpeaking queries TTS engine if it's
currently outputting any audio, it was present in the
TTS API V1.

Change-Id: Iee4a91976b9b80653811fb458ac48d75418752cf
2014-06-04 09:16:55 +00:00
Leon Scroggins III
0aa39dc2dc Ignore inPurgeable and inInputShareable.
These are discouraged anyway, due to the fact that using them may
result in decoding on the UI thread. Now that they are ignored, the
images will still be decoded; they just will never have their
memory purged, meaning there could be a RAM penalty. This is
acceptable, since apps are encouraged to instead use inBitmap to
manage bitmap memory.

This incidentally fixes BUG:15390468 by converting purgeable index8
(e.g. gif) images to non purgeable.

Change-Id: Ieaf3ab25d28d93fb94bdaea1eb3bd762f163b09a
2014-06-03 14:05:58 -04:00
Jae Seo
2e0bacc2a3 am 594ac157: Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev
* commit '594ac1575f8301023d37c329f8c676ba9bda396c':
  TvContract: Address the feedback from the API review
2014-06-03 17:17:00 +00:00
Chulwoo Lee
f573765bf1 am b9c0a8ae: Merge "Add a way to get the class name of SetupActivity and SettingsActivity" into lmp-preview-dev
* commit 'b9c0a8ae7b0e69829a663fa2ca6bbdededa02d93':
  Add a way to get the class name of SetupActivity and SettingsActivity
2014-06-03 17:16:33 +00:00
Alan Viverette
02a078d088 am 25931ade: Merge "Clean up drawable theming APIs" into lmp-preview-dev
* commit '25931adee5ba954220190f48901bb66c8c9dd462':
  Clean up drawable theming APIs
2014-06-03 17:16:27 +00:00
Nicolas Prevot
93d8c7259d Merge "Adding user consent extras to DevicePolicyManager." 2014-06-03 17:08:50 +00:00
Nicolas Prevot
3742ec394f Adding user consent extras to DevicePolicyManager.
Adding ACTION_PROVISIONING_USER_HAS_CONSENTED and EXTRA_PROVISIONING_TOKEN to DevicePolicyManager.
They can be used to tell ManagedProvisioning to skip user consent.

Change-Id: I5ef8ab2a14969bb29a2ee3dbdce5ca3225e0759a
2014-06-03 17:07:34 +00:00
Jae Seo
4c9e57f156 resolved conflicts for merge of ebe661c4 to master
Change-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4
2014-06-03 17:06:58 +00:00
Jae Seo
6fbe3982b0 Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev 2014-06-03 00:26:05 +00:00
Chulwoo Lee
6abd0d801b Merge "Add a way to get the class name of SetupActivity and SettingsActivity" into lmp-preview-dev 2014-06-02 23:59:55 +00:00
Chulwoo Lee
e7bb7d6bb2 Add a way to get the class name of SetupActivity and SettingsActivity
Now, there can be only one SetupActivity and one SettingsActivity for
one TIS apk though one TIS apk can contain several services. Each TIS
need to be able to have its own SetupActivity and SettingsActivity.

BUG: 15177340
Change-Id: I2d944e3ef35c3a981483ba643fd27b15925bab16
2014-06-03 08:56:35 +09:00
Jae Seo
bd23fa0ba1 TvContract: Address the feedback from the API review
This change addresses the following comments from the council:
- Provider authority should be "android.media.tv"
- Rename COLUMN_DATA to COLUMN_INTERNAL_PROVIDER_DATA and add comment to
  indicate data is internal to the provider that inserted it, and should
  not be decoded by other apps. It would be nice to restrict read access
  to this column, but not essential.
- Hide COLUMN_LOCKED since implementation isn't defined yet, also
  questions about how it interacts with Unicorn.
- Fix typo in ORIGINAL_NETWORK documentation.
- All provider MIME types need to be changed to follow platform
  conventions: "vnd.android.cursor.dir/channel",
  "vnd.android.cursor.dir/program", etc. (Notice singular tense and no
  package prefixes since they're part of the platform API.)
- Rename Programs.COLUMN_DATA to COLUMN_INTERNAL_PROVIDER_DATA, along
  with docs update, for the same reasons as above.
- Rename COLUMN_DESCRIPTION to COLUMN_SHORT_DESCRIPTION and update docs
  to indicate it's a recommended maximum length, not a hard cap.
- COLUMN_GENRE should be split into two columns: COLUMN_BROADCAST_GENRE
  (from broadcast standard) and COLUMN_CANONICAL_GENRE (from an Android
  standard). Define a subclass with the Android canonical genres, which
  are simple strings that are comma-separated when inserted into
  COLUMN_CANONICAL_GENRE.

Bug: 15345342
Change-Id: I7f8e70aef617475a59d096fd73a551e7df8a1d3a
2014-06-02 16:44:37 -07:00
Alan Viverette
5a4af17e27 Merge "Clean up drawable theming APIs" into lmp-preview-dev 2014-06-02 23:41:59 +00:00
Alan Viverette
6dbe51b50e Clean up drawable theming APIs
Removes APIs for themed creation of a drawable from a stream, since
that doesn't involve any inflation. Also cleans up tinting methods
left over from previous clean up.

BUG: 15089957
Change-Id: I2af7aa9a6d351ae61b33ee1216c674fae1bffe11
Signed-off-by: Alan Viverette <alanv@google.com>
2014-06-02 16:39:04 -07:00
Jae Seo
3c784d6359 Merge "Put TV Input Framework under android.media.tv, including TvContract" into lmp-preview-dev 2014-06-02 21:03:58 +00:00
Vinit Deshpande
d5d9e73a1a Merge "DO NOT MERGE: Accomoditing API Review feedback for WifiScanner" into lmp-preview-dev 2014-06-02 20:00:12 +00:00
Jae Seo
d5cc4a281e Put TV Input Framework under android.media.tv, including TvContract
Bug: 15345342
Change-Id: I665ca23f0f074ce29cb2e047109b209178532107
2014-06-02 11:02:52 -07:00
Alan Viverette
a81ff42474 Fix build
Change-Id: Id5dde81d71c164c5537c48b383c7b37f2b2a7327
2014-06-01 18:37:01 -07:00
Alan Viverette
c65c7ae635 Merge commit '6682183b' into manualmerge
Conflicts:
	core/res/res/values/public.xml

Change-Id: Ic91db6ee85dcd8a6b13716b600b04c78ceac4b33
2014-06-01 16:44:28 -07:00
Alan Viverette
4d2f2483f6 Fixes hotspot list transitions, update to use a single hotspot
Also updates background and button colors to match spec, removes
dependency on bouncycastle Arrays. Vastly simplifies ripple drawing.
Adds APIs for maximum ripple radius. Makes selectableItemBackground
bounded by default and adds an unbounded version and theme attribute.

BUG: 15315168
BUG: 15314684
BUG: 15314830
BUG: 15316768
BUG: 15333033
BUG: 15344050
Change-Id: Ib0619587ce78e43056b66571bae185e0f1613185
2014-06-01 15:58:04 -07:00
Amith Yamasani
f20d640fa2 Restrictions Manager
Mechanism to register a provider for requesting an
administrator to respond to permission requests.

Request format and response format constants.

Description of manifest template for static restrictions.
Int type introduced in RestrictionEntry.

Needs more javadoc and better description of manifest templates,
including specifying the XML attributes.

Change-Id: I5a654d364e98379fc60f73db2e06bf9a8310263d
2014-05-31 16:41:35 -07:00
Ihab Awad
9efdcd8a31 Allow ConnectionService to ask Telecomm for ringback
Cherry picked from branch lmp-preview-dev because checking the changes into master required an API update, whereas the relevant APIs are @hide-ed in the source branch.

Provides a pass-through from the ConnectionService API to Telecomm allowing
a ConnectionService to either play the ringbacks on its own, or ask Telecomm
to play the ringbacks on its behalf.

Bug: 15190301
Change-Id: Ib0f2ce9bf798ec0df0e6d33559174c82de059a94
(cherry picked from commit 20536bc3c4d40fa96306b0319d8313a7437fc702)
2014-05-31 11:19:54 -07:00
Dianne Hackborn
00fcdc1236 am d6f7d9b7: Merge "Clean up voice API." into lmp-preview-dev
* commit 'd6f7d9b75931d031086a744cfd18994b2673f311':
  Clean up voice API.
2014-05-31 00:00:05 +00:00
Dianne Hackborn
725010a83f Merge "Clean up voice API." into lmp-preview-dev 2014-05-30 23:54:11 +00:00
Vinit Deshpande
9542733481 DO NOT MERGE: Accomoditing API Review feedback for WifiScanner
cherry-picked from klp-wireless-dev
SHA1 8217e22356a8828a725ba7654cf25b05a49108fb

Main changes include

- hiding the API for LMP preview
- moved information elements to ScanResult object
- removed objects from events
- changed API names to be more consistent

Bug: 15191968
Change-Id: Ibe3907366aee85f7d56021a536ae0f9f9fb28b38
2014-05-30 16:53:31 -07:00
Jeff Sharkey
43e1565370 am 9a78d4de: Merge "Per-app media directories on external storage." into lmp-preview-dev
* commit '9a78d4deb2d00dc67b2c11daf76b389e0712b535':
  Per-app media directories on external storage.
2014-05-30 23:51:46 +00:00
Jeff Sharkey
05dc18d69a Merge "Per-app media directories on external storage." into lmp-preview-dev 2014-05-30 23:47:00 +00:00
Dianne Hackborn
a2c076d540 Clean up voice API.
Add various java docs.

Switch to CharSequence where appropriate.

Add new request for canceling voice interaction.

Also update test app to follow API changes and be more better.

Change-Id: If27eeba53cf6444660adb7d37ea2ce0557c6c91f
2014-05-30 16:42:57 -07:00
Jeff Sharkey
2ee3c1e189 Per-app media directories on external storage.
This change defines per-app directories on external storage that
will be scanned and included in MediaStore.  This gives apps a way
to write content to secondary shared storage in a way that can
easily be surfaced to other apps.

Bug: 14382377
Change-Id: I4cb367c870509e76f0c2c598f01e2f699780030a
2014-05-30 16:26:45 -07:00
Adam Powell
92bcf31f54 am 338382de: Merge "Fix action bar title TextAppearance usage for Toolbar decor" into lmp-preview-dev
* commit '338382de18d9df699c15eb9adbaaa50d8a6664fd':
  Fix action bar title TextAppearance usage for Toolbar decor
2014-05-30 23:25:23 +00:00
Adam Powell
ae706066e1 Merge "Fix action bar title TextAppearance usage for Toolbar decor" into lmp-preview-dev 2014-05-30 23:21:33 +00:00
Lajos Molnar
2a48d42285 am 7c9ed471: Merge changes I1fd178b6,I5093672e into lmp-preview-dev
* commit '7c9ed471c6f5e7d21b49be1105c973d3a8473d59':
  DO NOT MERGE: media.MediaCodec: hide NotificationCallback listener
  media.MediaCodec: document and fix-up setNotificationCallback
2014-05-30 23:21:09 +00:00
Adam Powell
ebba5d4edd Fix action bar title TextAppearance usage for Toolbar decor
Pass through the appropriate action bar styles for title/subtitle
TextAppearance.

Bug 15345937

Change-Id: I93c648cf60b4a63498d127dbd6eac2c1fae33aa7
2014-05-30 16:19:16 -07:00
Lajos Molnar
a6716aade1 Merge changes I1fd178b6,I5093672e into lmp-preview-dev
* changes:
  DO NOT MERGE: media.MediaCodec: hide NotificationCallback listener
  media.MediaCodec: document and fix-up setNotificationCallback
2014-05-30 23:14:55 +00:00
RoboErik
4e4160cd5e am 80ec18a9: Merge changes I16ad392e,Ie26a7d01 into lmp-preview-dev
* commit '80ec18a90a1ce3d1b68deba8bcf81abcca04e520':
  Refactor transport controls APIs
  API changes to sessions
2014-05-30 22:21:07 +00:00
RoboErik
283c907a6a Merge changes I16ad392e,Ie26a7d01 into lmp-preview-dev
* changes:
  Refactor transport controls APIs
  API changes to sessions
2014-05-30 22:18:54 +00:00
Yin-Chia Yeh
ee36492fac am 7ebaa1ef: Merge "Camera2: update the range of metering weight" into lmp-preview-dev
* commit '7ebaa1ef18fd20500efb87f75e933b9e35fb5470':
  Camera2: update the range of metering weight
2014-05-30 21:43:55 +00:00
Craig Mautner
9de076a0a1 am b01b028e: Merge "Change PersistableBundle API per council\'s request" into lmp-preview-dev
* commit 'b01b028ed9a1a5b1a585152adf182afe16135c10':
  Change PersistableBundle API per council's request
2014-05-30 21:43:49 +00:00
Yin-Chia Yeh
f41799e7f7 Merge "Camera2: update the range of metering weight" into lmp-preview-dev 2014-05-30 21:41:42 +00:00
Craig Mautner
9edc732477 Merge "Change PersistableBundle API per council's request" into lmp-preview-dev 2014-05-30 21:40:17 +00:00
Wei Wang
75f5b3a8dd am 19bdd64c: Merge "Address API review comments. 1. Moved le stuff to it\'s subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved Advertis
* commit '19bdd64c3b9dd16778575164c13c8af798832f01':
  Address API review comments. 1. Moved le stuff to it's subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved AdvertisementData and ScanRecord out and removed AdvertiseBaseData 4. Removed newBuild and use new Builder for all builders. 5. Using setxxx in builders. 6. Misc other changes.
2014-05-30 21:38:59 +00:00
Dianne Hackborn
25ceaab596 am 3a967f83: Merge "Mark getRecentTasks() and getRunningTasks() as deprecated." into lmp-preview-dev
* commit '3a967f8331a29ec1b5b8a44cda028417e0ef1e2c':
  Mark getRecentTasks() and getRunningTasks() as deprecated.
2014-05-30 21:38:49 +00:00
Santos Cordon
bf82544a96 Merge "Preempt build error from merge with CL (2/2)" 2014-05-30 21:31:57 +00:00
Santos Cordon
dd36901ac0 Preempt build error from merge with CL (2/2)
Merging CL: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657

Change-Id: Ic4944b27f9d39dbaccb6baa5ba6761dc4663cd02
2014-05-30 14:27:03 -07:00
Vinit Deshpande
e73a0ab494 Merge "Accomoditing API Review feedback for WifiScanner" 2014-05-30 21:15:13 +00:00
Craig Mautner
0a8e160eb5 Change PersistableBundle API per council's request
Fixes bug 15192573.

Change-Id: Ib98ef132c8c12e68e805cb3c0b1f7ae75940f17c
2014-05-30 13:14:44 -07:00
Wei Wang
94fec83db4 Merge "Address API review comments. 1. Moved le stuff to it's subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved AdvertisementData and ScanRecord out and removed AdvertiseBaseData 4. Removed newBuild and use new Builder for all builders. 5. Using setxxx in builders. 6. Misc other changes." into lmp-preview-dev 2014-05-30 19:39:11 +00:00