5755 Commits

Author SHA1 Message Date
Michael Wright
8e3a41738f Merge "Expose API to query devices for supported keys" into klp-dev 2013-08-22 21:08:02 +00:00
Satoshi Kataoka
2b10b52f6c Add new API shouldOfferSwitchingToNextInputMethod
Bug: 8364845
Change-Id: I6767f5640a07aa515a930645b0cf0b36fbe94831
2013-08-22 15:51:13 +09:00
Jeff Tinker
7cda491321 Add ability to test supported content types to MediaDrm
bug: 10244066
Change-Id: Ic96c2e23f36809faf1c88ede500f4bc2bad4142a
2013-08-21 17:30:06 -07:00
Sam Blitzstein
435e7dfd92 Extend AlarmClock API (just slightly)
Add some extras to SET_ALARM action.
Add SET_TIMER action.

Change-Id: I436864ca875a7eb1c424d0d21882d624780d6ff1
(cherry picked from commit fe7dedefe9c146209f73306dbd1584f251f85d1c)
2013-08-21 21:41:46 +00:00
Sam Blitzstein
0fb6488e0a Merge "Extend AlarmClock API (just slightly)" 2013-08-21 21:39:52 +00:00
Eino-Ville Talvala
10558bc856 am b5d4ce96: am ba75bbe3: Camera2: Fix build: add temperature entry to camera public API
* commit 'b5d4ce966ba4a6f149846c2af64f3f2306c59b71':
  Camera2: Fix build: add temperature entry to camera public API
2013-08-21 11:40:23 -07:00
Eino-Ville Talvala
ba75bbe3ce Camera2: Fix build: add temperature entry to camera public API
Change-Id: I2722b80a38e0c844611f34e85697735982bf1fa0
2013-08-21 11:31:54 -07:00
Chris Craik
ed2515e853 am 908d9bfa: am dc70afae: Merge "Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap" into klp-dev
* commit '908d9bfafd576755d06f0566fc4cac3831476f63':
  Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap
2013-08-21 10:26:23 -07:00
Chris Craik
1abf5d6242 Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap
bug:2248948

Change-Id: I8fdd649332667598504a1076d5a447572bd53086
2013-08-20 18:29:33 -07:00
Tom O'Neill
b8fbe8d74f am 1e698982: am a37e2346: Merge "Warn that SettingInjectorService must be fast" into klp-dev
* commit '1e698982c9277c291e8eeedf1e80d7905040e421':
  Warn that SettingInjectorService must be fast
2013-08-20 17:51:49 -07:00
Tom O'Neill
a37e2346f8 Merge "Warn that SettingInjectorService must be fast" into klp-dev 2013-08-21 00:47:32 +00:00
Alan Viverette
c742bf1054 am cd38fdb2: am 59bbba7c: Merge "Add implicit parent dependency for Preferences" into klp-dev
* commit 'cd38fdb2de55f666f6c268549d3f5bdced616fda':
  Add implicit parent dependency for Preferences
2013-08-20 16:34:00 -07:00
Alan Viverette
59bbba7c37 Merge "Add implicit parent dependency for Preferences" into klp-dev 2013-08-20 23:28:16 +00:00
Svetoslav
04f7c6417b am be88e35d: am d3092167: Merge "Implemented advanced printer selection and API refactoring." into klp-dev
* commit 'be88e35d61d06be4987167b468708f6cc937845b':
  Implemented advanced printer selection and API refactoring.
2013-08-20 13:47:36 -07:00
Svetoslav
d30921672c Merge "Implemented advanced printer selection and API refactoring." into klp-dev 2013-08-20 20:42:05 +00:00
Matthew Xie
682e00e84d am 74f5c5d3: am 23657458: Merge "Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()" into klp-dev
* commit '74f5c5d37fd7a3456774af3d3d9a38b1e48517f3':
  Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()
2013-08-20 12:53:41 -07:00
Matthew Xie
2365745855 Merge "Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()" into klp-dev 2013-08-20 19:47:29 +00:00
Chong Zhang
ec818c6f4a am 1cb4d42c: am a3132d97: Merge "MediaPlayer.TrackInfo: add getFormat() method" into klp-dev
* commit '1cb4d42c562fc53bee7779815b6c791f9aa00b3e':
  MediaPlayer.TrackInfo: add getFormat() method
2013-08-20 11:30:29 -07:00
Chong Zhang
a3132d975b Merge "MediaPlayer.TrackInfo: add getFormat() method" into klp-dev 2013-08-20 18:23:12 +00:00
Tom O'Neill
38a310aa0a am 19eefb20: am f23993fb: Merge "Add the API to set and read the location mode" into klp-dev
* commit '19eefb2033a6cb0542bea6baa4767e55fc1dd477':
  Add the API to set and read the location mode
2013-08-20 11:18:33 -07:00
Tom O'Neill
f23993fb52 Merge "Add the API to set and read the location mode" into klp-dev 2013-08-20 18:13:09 +00:00
Sam Blitzstein
fe7dedefe9 Extend AlarmClock API (just slightly)
Add some extras to SET_ALARM action.
Add SET_TIMER action.

Change-Id: I436864ca875a7eb1c424d0d21882d624780d6ff1
2013-08-20 10:32:43 -07:00
Romain Guy
c9031a0939 Merge "Make color filters mutable" 2013-08-20 01:21:22 +00:00
Romain Guy
13656743cc Make color filters mutable
Change-Id: I3d035d24a75e09db13d136a22bd7dbd326d0ce36
2013-08-19 18:18:00 -07:00
Tom O'Neill
1f48b78e99 Add the API to set and read the location mode
- This will be more future-proof than the current GPS/NLP API

Change-Id: I9defe505e1372d9b601c3190eb49bd71604f04d1
2013-08-19 18:14:56 -07:00
Michael Wright
b7b2d4b490 Expose API to query devices for supported keys
Change-Id: I29f230e19c6f851b4b72b2fc8dd41f5abcba4631
2013-08-19 17:06:03 -07:00
Jeff Brown
194c140c34 Merge changes Id3815fe8,I90a85921 into klp-dev
* changes:
  Define AudioSource.REMOTE_SUBMIX.
  Remove setRemoteSubmixOn method.
2013-08-19 23:57:11 +00:00
Jeff Brown
64dfb604e7 Define AudioSource.REMOTE_SUBMIX.
Add an API to allow applications to record from the remote
submix when they have the required permissions.

Bug: 10265163
Change-Id: Id3815fe82a6713e058ce4b8ab6128a898481df7e
2013-08-19 16:42:07 -07:00
Alan Viverette
02f5680363 Add implicit parent dependency for Preferences
Also removes unused dependency change listener interface.

BUG: 10117838
Change-Id: I03f0eb37e7ba69942f7997a8b32adb38a3dee0bd
2013-08-19 16:32:56 -07:00
John Du
48f8b5dbf6 Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()
BluetoothGatt.abortReliableWrite() should not take a BluetoothDevice
parameter. Instead, it should use mDevice instance variable.
bug 10152994

Change-Id: I7fc79b9011cf878414128cc9f1696e5ccc597056
2013-08-19 16:01:24 -07:00
Svetoslav
269403b032 Implemented advanced printer selection and API refactoring.
1. Added past printer history tracking and merging favorite printers
   with discovered printers.

2. Added save as PDF support.

3. Added all printers activity with search capability and optional
   add printers chooser (if any print service provides add printers
   activity)

4. Refactored the printer discovery session APIs. Now one session
   can have multiple window discovery windows and the session stores
   the printers found during past discovery periods.

5. Merged the print spooler and the print spooler service - much
   simpler and easier to maintain.

Change-Id: I4830b0eb6367e1c748b768a5ea9ea11baf36cfad
2013-08-19 13:24:11 -07:00
Tom O'Neill
184e75146c Warn that SettingInjectorService must be fast
- Move UPDATE_INTENT to SettingInjectorSErvice

Change-Id: I9c8f8dc0878647a051cb852721b3436e9d55b391
2013-08-19 13:13:21 -07:00
Martijn Coenen
b6e8943933 Merge "NFC: Allow HostApduService to indicate transaction unhandled." into klp-dev 2013-08-19 20:11:09 +00:00
Vinit Deshapnde
4d0145add1 Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev 2013-08-19 19:14:03 +00:00
Martijn Coenen
583fe9d22b NFC: Allow HostApduService to indicate transaction unhandled.
This will cause the OS to show UI that allows the user to pick
another application that could potentially handle the transaction.

Also, tweak processCommandApdu() method to take a Bundle to be more
future-proof.

Bug: 10262585
Change-Id: If9d060341b472fac0349f539c04b87e85fe79dfb
2013-08-19 11:52:27 -07:00
Andreas Huber
e79ba15453 Merge "Expose KEY_REPEAT_PREVIOUS_FRAME_AFTER and KEY_PUSH_BLANK_BUFFERS_ON_STOP" into klp-dev 2013-08-19 15:39:29 +00:00
Jeff Sharkey
5851493762 Merge "Resized thumbnails; async; extend MatrixCursor." into klp-dev 2013-08-18 20:53:29 +00:00
Jeff Sharkey
9d0843df7e Resized thumbnails; async; extend MatrixCursor.
When requesting thumbnails, check if their dimensions are larger
than requested, and downscale to avoid memory pressure.  Load them
async and with LruCache.

Extend MatrixCursor so that RowBuilder can offer() columns without
requiring they know the projection map.  This makes it easier to
respond to query() calls, where the remote side controls the
projection map.  Use it to handle custom projections in external
storage backend.

Update date/time formatting to match spec.

Bug: 10333418, 10331689
Change-Id: I7e947a8e8068af8a39b55e6766b3241de4f3fc16
2013-08-17 19:05:07 -07:00
Vinit Deshapnde
b676a4a70d Expose WifiManager.setTdlsEnabled public API
Bug: 10221775

Change-Id: I559e4a2afd525a03c8a13fd151eca4638426d03e
2013-08-16 17:16:45 -07:00
Jeff Sharkey
d1da67017f Merge "Richer ParcelFileDescriptor close events." into klp-dev 2013-08-17 00:05:36 +00:00
Chet Haase
d1477e7460 Merge "Better Transition interruption" into klp-dev 2013-08-16 23:41:29 +00:00
Jeff Sharkey
da5a3e12f4 Richer ParcelFileDescriptor close events.
When reading from the end of a pipe or socket, there is no way to
tell if the other end has finished successfully, encountered an error,
or outright crashed.  To solve this, we create a second socketpair()
as a communication channel between the two ends of a pipe or
socket pair, sending a status code with details about why the
ParcelFileDescriptor was closed.

The writer end of a pipe or socket can closeWithError() to send a
message to the reader end.  When the reader encounters EOF, they
call checkError() to detect if any error occured.  This also detects
the case where the remote process died without sending a success
message.

This design is also extended to support regular files on disk, using
the communication channel above to detect various remote close events
or crashes, and delivering that event to a supplied OnCloseListener.

Replaces JNI with best-practice Libcore.os calls, and deprecates
some flags to match Context.

Bug: 10330121
Change-Id: I8cfa1e4fb6f57397667c7f785106193e0faccad3
2013-08-16 14:34:43 -07:00
Chet Haase
199acdfcc9 Better Transition interruption
Previously, a running transition on a scene root would simply
be canceled when a new transition was started. This would result in
abrupt scene changes, especially in generic use cases where apps/widgets
would spawn multiple transitions in successive rendering frames due to
small changes in view properties.

The new approach is to check all running animations against new transitions.
If there are overlapping properties that are being set to different values,
the new animations win and the old ones are canceled. If the end values are the
same, the new animations are noop'd and the old ones are allowed to continue
as-is.

There was also improvement to capturing state while other transitions are
running, necessary in this new world where old transitions are allowed to
continue running. Now, transitions are pause()'d while values are captured,
then resume()'d after capturing is done. This allows the system to see what the
real view properties are, instead of the mid-animation values.

Change-Id: I8e77fb9c1967087a682bb26a45763005f5ca9179
2013-08-16 13:22:36 -07:00
Lajos Molnar
dad0f462ae Merge "MediaFormat: added subtitle format" into klp-dev 2013-08-16 19:18:32 +00:00
Eino-Ville Talvala
4068388bee Camera2: Add user tag to CaptureRequest
Bug: 10360518
Change-Id: I781341b4c598c28ee5dd7551b8e05ab19b8fff0d
2013-08-16 11:10:21 -07:00
Satoshi Kataoka
0a94b9ce27 Merge "Add an API supportsSwitchingToNextInput" into klp-dev 2013-08-16 07:08:52 +00:00
Jeff Sharkey
a5599ef636 Documents management mode; API adjustment.
Create documents manage mode to support Downloads and transient
storage devices.  Locks user into requested backend root, and forces
file sizes on and sorting by last modified.

Separate API constants for Documents versus Roots, and give concrete
MIME types for roots.

Treat null sizes as unknown.  Documents are always enabled in list
so that divider is drawn.  Mark external storage file as writable.

Bug: 10329983, 10332993, 10332952
Change-Id: I05f4fdf5b04041a38e1ba7fb30202a3b0c615bf6
2013-08-15 16:25:30 -07:00
Tor Norbye
831c5df603 Add @NotNull, @Nullable, and @IntDef/@StringDef annotations
This changeset adds some annotations for recording whether a
method return value or method parameter can be null (@Nullable),
can never be null (@NotNull), or must be an integer enum or flag
using one of the given constants.

Change-Id: Ic932592ea3bac781c1df364447c57042461333c5
2013-08-15 13:19:25 -07:00
Lajos Molnar
1c56a67dbb MediaPlayer.TrackInfo: add getFormat() method
This returns the MediaFormat of the track or null (for now).

Change-Id: Ib88fc229b661942b2ed136204fdc43da427d7aed
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
2013-08-15 12:35:14 -07:00
Lajos Molnar
dc775c66bf MediaFormat: added subtitle format
Added KEY_LANGUAGE that for now only refers to subtitles.
Added createSubtitleFormat() method to create base format.

Signed-off-by: Lajos Molnar <lajos@google.com>
Change-Id: I344c36a3fd0d88c285cdebf3f67e549553b37a8e
Bug: 10326117
2013-08-15 11:43:02 -07:00