9669 Commits

Author SHA1 Message Date
RoboErik
ddce02f3b9 Merge "Move mute/unmute handling to adjust volume paths" 2015-01-30 18:55:10 +00:00
Alan Viverette
447590524a Merge "Add accessors for switch thumb and track tinting" 2015-01-30 18:53:14 +00:00
Alan Viverette
e7eee640f8 Add accessors for switch thumb and track tinting
Bug: 19196145
Change-Id: I5c426bc8c624c75fd27faaf6e0cbef5a0594175a
2015-01-30 10:05:24 -08:00
Alan Viverette
b59041595b Merge "Add transition support to PopupWindow" 2015-01-30 18:04:48 +00:00
Zhen Yu Song
f1a0a3f842 Merge "+ Update api file." 2015-01-30 00:37:11 +00:00
Zhen Yu Song
619ef3fe93 + Update api file.
Change-Id: I1a2abb974c6a789c3533a44d3ceb70cf6701b9f9
2015-01-29 16:28:18 -08:00
RoboErik
4197cb60bc Move mute/unmute handling to adjust volume paths
This deprecates the setStreamMute and setStreamSolo APIs. Soloing is no
longer supported and muting is redirected through the adjust volume APIs.

Also updates the hidden master versions of these APIs.

Change-Id: I65d2a5d5fc15b386bd497abf8ca6869fec75a26a
2015-01-29 16:14:30 -08:00
Zhijun He
043adafffd Merge "Camera2: metadata spec update for reprocessing" 2015-01-29 23:48:02 +00:00
Zhijun He
0e99c2260d Camera2: metadata spec update for reprocessing
Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4
2015-01-29 15:26:05 -08:00
Zhen Yu Song
72c85bbdf8 Merge "+ Add CarExtender to Notification Bug: 18316420" 2015-01-29 22:54:29 +00:00
Zhen Yu Song
9d5528ba9f + Add CarExtender to Notification
Bug: 18316420

Change-Id: Idd7a06c2271d62c603014038fbe5a0bbacb0ed78
2015-01-29 14:27:28 -08:00
Alan Viverette
5435a30ae5 Add transition support to PopupWindow
Allows framework-added windows to manually specify surface insets, which
enables us to wrap the popup window's elevated content view with a root
view, which in turn allows us to use the Transition API for popup window
transitions.

Fixes a bug where the root view's render node forced clipping.

Bug: 13211166
Change-Id: I303dfa55a052cdf5d3b1485422529123e3cc867a
2015-01-29 10:25:34 -08:00
Dianne Hackborn
8bd95f1623 Introduce new MNC API version.
Change-Id: Ib40822e82ea389092727dfc1f2f9ada5d04f2e87
2015-01-28 15:08:52 -08:00
RoboErik
c911612602 Fix build
Reran make update-api to generate the new system-current changes that
were enabled.

Change-Id: I98830fe1bc058ea97c99537bf8d64908467cdf67
2015-01-28 11:56:01 -08:00
RoboErik
66df850de2 Merge "Add getMediaItem API to MediaBrowser" 2015-01-28 18:52:41 +00:00
Chien-Yu Chen
25af2fc0cc Merge "CameraManager: add torch mode APIs for flashlight" 2015-01-28 18:24:47 +00:00
Bryce Lee
c0086ea950 am 263987f6: am 2a8ccd4b: am 1061652a: Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev
* commit '263987f6268439af69fcfa66a278103e1efe1343':
  Revert "Make THEATER_MODE_ON setting a system api."
2015-01-28 18:05:04 +00:00
Bryce Lee
1061652a37 Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev 2015-01-28 17:50:39 +00:00
Bryce Lee
034dc3839f Revert "Make THEATER_MODE_ON setting a system api."
This reverts commit 35dafda1b0357eb0f2eef766427a2b473967a918.

Change-Id: I76e72592791682e0dbee719fbd518962a1bdcd11
2015-01-28 17:45:35 +00:00
Bryce Lee
293465a75c am f2d5253b: am fdb8dff5: am d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev
* commit 'f2d5253bce5ef69cb6cb4da7697a228a47b55904':
  Make THEATER_MODE_ON setting a system api.
2015-01-28 17:22:22 +00:00
Bryce Lee
d8cb404035 Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev 2015-01-28 17:03:57 +00:00
Alan Viverette
5f54ecbe47 Update system-current to fix build
Change-Id: Ib8e092cf5097def96eebf85179e6daa683cd717e
2015-01-27 17:01:04 -08:00
Chien-Yu Chen
c8c109b403 CameraManager: add torch mode APIs for flashlight
Add torch mode APIs to support flashlight without opening any
camera devices.

Bug: 2682206
Change-Id: Ifb66c309f23fd7e9f124016e0d9c6b364d19acdd
2015-01-27 16:55:16 -08:00
Alan Viverette
b032cd1f52 Merge "Expose View.OnScrollChangeListener interface" 2015-01-28 00:02:21 +00:00
Alan Viverette
f9d7eedc46 Expose View.OnScrollChangeListener interface
Allows clients to observe changes to scrollX / scrollY.

Bug: 19098033
Change-Id: I070e61a9532fe1f6cb5437eab94f7fffc1b17e97
2015-01-27 15:38:19 -08:00
Jorim Jaggi
cb4f594eca Remove dead code #11: Remove more unused classes
Change-Id: Ie78d40fd20eef859e3c0ea9269b86ff1e1471a58
2015-01-27 18:15:50 +01:00
Jorim Jaggi
3cdb3b7d0d Merge "Revert "Remove dead code #11: Remove more unused classes"" 2015-01-27 16:53:02 +00:00
Jorim Jaggi
de47e3554d Revert "Remove dead code #11: Remove more unused classes"
This reverts commit 397ca8be8de407237cd293873647c182837bc032.

Change-Id: Id7f8dbe93d2a48a7f6261232499f73b7de8dd7b1
Reason: Build breakage.
2015-01-27 16:52:24 +00:00
Jorim Jaggi
ca3e3b73b3 Merge "Remove dead code #11: Remove more unused classes" 2015-01-27 16:12:25 +00:00
Brian Attwell
7ba4751e91 Merge "Add Insert.EXTRA_{ACCOUNT,DATA_SET} to API. P #1/2" 2015-01-27 00:50:01 +00:00
Brian Attwell
63f859b2b7 Add Insert.EXTRA_{ACCOUNT,DATA_SET} to API. P #1/2
Names are based on recent suggestions from the API council, such as
implemented inside ag/540453.

Bug: 18777272
Change-Id: I17a5b7cb4d4c5a0ba48936a6fc829acaab73f31d
2015-01-27 00:05:07 +00:00
RoboErik
b1c88103fe Add getMediaItem API to MediaBrowser
This adds all the plumbing for supporting a getMediaItem call in
MediaBrowser.

Will also need to add a support lib component to make it backward
compatible.

Change-Id: I528e9ebaf4e0fe386f346ef85c14973168a380df
2015-01-26 14:37:05 -08:00
Yorke Lee
3d62078498 am 6d4a6845: Merge "Update system-api for new getLine1Number() method." into lmp-mr1-dev automerge: 8df7f43
automerge: bfe3c35

* commit 'bfe3c357043badac546fbf84d28ee8a81ccc1208':
  Update system-api for new getLine1Number() method.
2015-01-26 21:59:12 +00:00
Nancy Chen
c059271ca4 Update system-api for new getLine1Number() method.
Add new method in TelecomManager to system-current.txt.

Bug: 19087382
Change-Id: Id6db61fed45301cc1a15ded6e362d7858f24a273
2015-01-26 12:35:35 -08:00
Brian Attwell
361d45e67a Merge "Unhide getOrCreateThreadId" 2015-01-26 19:32:36 +00:00
Brian Attwell
c73ae3aaf4 Unhide getOrCreateThreadId
Part 2/2 of exposing getOrCreateThreadId. Add to
current.txt and system-current.txt.

Bug: 18777272
Change-Id: Id3bb1e3f73c4826154096057a778ac97ee86abc6
2015-01-26 10:37:26 -08:00
Bryce Lee
35dafda1b0 Make THEATER_MODE_ON setting a system api.
This will allow an unbundled home to continue accessing this property.

Bug: 19043538
Change-Id: I845a8726e617ca7b6f7f7347a0ac5aa0620d6658
2015-01-26 08:21:10 -08:00
Zhijun He
efa1534817 camera2: update API txt for the API change
Change-Id: I4a9476849f5fde9dff669876bbdaf055bd3adc48
2015-01-23 17:30:31 -08:00
Zhijun He
503e815a6f Camera2: add lens facing EXTERNAL enum
This is for usb camera support

Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
2015-01-23 23:58:45 +00:00
Brian Attwell
1cf7405f1f Expose ContentProviderOperation type
CHANGE
isInsert, isDelete, isUpdate, isAssertQuery

JUSTIFICATION
The use of getType() in lots of unit tests means that
ContentProviderOperation#getType() can't practically be
removed.

Why not make it public? This allows 3p to use getType() in
unit tests. Plus it allows the unbundled contacts app
to continue using getType() in order to handle TYPE_INSERT
specially, without needing to awkwardly pass isInsert values
around.

Bug: 18777272
Change-Id: I6be5f325bbf6fbeb7817e9b1f7fa1a1ae2002e0b
2015-01-23 13:32:39 -08:00
Jean-Michel Trivi
3df96646a8 Merge "Add support for AudioAttributes in AsyncPlayer" 2015-01-23 19:09:03 +00:00
Jinsuk Kim
7127d264d1 am 3379c1cb: Fix broken build automerge: 2652c57
automerge: 304f696

* commit '304f696b34592d0eb75339da91a71864884322c1':
  Fix broken build
2015-01-23 08:27:29 +00:00
Jinsuk Kim
3379c1cb62 Fix broken build
Updated system-current.txt

Change-Id: I1f80d5543f0a828cf59d50d1271916a1210674d3
2015-01-23 17:13:50 +09:00
Ying Wang
f0ab37c2b9 Update current System API file.
The file was generated by "make update-api".
The concerned API change has actually be submitted in commit
9ffad071a9956ba2603475b060f271900a4d2e26, which didn't include the
system API update, for presumably an out-of-date build project.

Bug: 18777272
Change-Id: I32e0903afc492b61f36d29ec88e728780158a553
2015-01-22 21:44:37 -08:00
Brian Attwell
9ffad071a9 Unhide AggregationSuggestions.Builder
Additional unbundling from ContactsContract.

I'm going to remove all parameter types except name.
None of them have been implemented since they were
defined in ICS.

Bug: 18777272
Change-Id: I5c4066d1e933cc4ab18df06809687ee2b7eac91c
2015-01-23 01:54:30 +00:00
Jean-Michel Trivi
157784b575 Add support for AudioAttributes in AsyncPlayer
As an audio playback API, AsyncPlayer needs to support specifying
  AudioAttributes.
Deprecate play() method with stream type.

Change-Id: Ia9561883e7b398666a3d5d6da4e00324eda6b0e9
2015-01-22 15:32:09 -08:00
Ying Wang
fbdb2c5721 Update master System API files.
Bug: 18960664
Change-Id: I7771352cb464d3b0220222821ad026a40f16bb92
2015-01-22 13:17:08 -08:00
Ying Wang
1a3bc05a93 am 321e7246: am 301e1def: am 24328660: Merge "Check in "current" system API files." into lmp-mr1-dev
* commit '321e72461bb561ea81f8f7bfaaa0c29e0180bc75':
  Check in "current" system API files.
2015-01-22 20:58:16 +00:00
Brian Attwell
09341baa8e Merge "Revert "Expose ContentProviderOperation type"" 2015-01-22 20:54:53 +00:00
Brian Attwell
8b89f0b207 Revert "Expose ContentProviderOperation type"
This reverts commit 9986f8e85a095320afbdebb2d0dfee9a2e19e510.

Change-Id: Icdcedf485a67fff4ab5e6bab9cc3e82aa7cc8760
2015-01-22 20:54:08 +00:00