Commit Graph

7959 Commits

Author SHA1 Message Date
Wonsik Kim
25d39bc334 am e1b81079: am 480dd588: am 5fec7afe: Merge "TIF: change onCreateSession() method signature" into lmp-dev
* commit 'e1b810793924956eb5517cd4e2c57a721e8f750e':
  TIF: change onCreateSession() method signature
2014-07-18 13:13:37 +00:00
Youngsang Cho
f5eb7e4870 am 860ba40c: am f6a118b2: am ad67fc6f: Fix a build breakage
* commit '860ba40c471521489fc5d6f753f93045ed088618':
  Fix a build breakage
2014-07-18 13:13:33 +00:00
Youngsang Cho
3b0f928475 Fix a build breakage
Updated current.txt.

Change-Id: Ib1434da2345aa349e5fc3112bf38dbba9955c885
2014-07-17 21:27:00 -07:00
Youngsang Cho
c941837cc1 am a2fb0d77: am 33b7885e: am d81f1075: Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev
* commit 'a2fb0d77795c4129382fcf930f03a79bd0cf76c2':
  TIF: Change the parameter of TvInputInfo.loadLabel/Icon
2014-07-18 03:45:52 +00:00
Youngsang Cho
96cdc2327c am 38683808: am eede71e5: am aa5dbe63: Merge "TIF: Hide TvContract.Channels.COLUMN_BROWSABLE" into lmp-dev
* commit '38683808a6b14a1a26ebddcba60f2261ff997054':
  TIF: Hide TvContract.Channels.COLUMN_BROWSABLE
2014-07-18 03:45:48 +00:00
Youngsang Cho
32e9d53123 am 9f4847e1: am 9dc7566a: am 57df5b3d: Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev
* commit '9f4847e138f5b5fd641b20cf4fd98f2eabe12d3a':
  TIF: Add a notification for surface change from TvView to TvInputService
2014-07-18 03:45:43 +00:00
Jae Seo
2bf0cf0207 am 326896be: am eb39352e: am cd12bfc7: TIF: Add a method to get TvInputInfo for a given TV input
* commit '326896be4943dc33965a13bd57eacf41b18ba11c':
  TIF: Add a method to get TvInputInfo for a given TV input
2014-07-18 03:41:34 +00:00
Jae Seo
136a546099 am 0d9329d2: am e2ef18ce: am 27d12ca6: TIF: Add buildInputId()
* commit '0d9329d24cf6c6f01576cf276bdd995f2f53eed4':
  TIF: Add buildInputId()
2014-07-18 03:41:25 +00:00
Jae Seo
c2809b7597 am cdc49c6c: am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev
* commit 'cdc49c6c4a9e106b220b29a7da68141489a0d175':
  TIF: Add TvParentalControlManager
2014-07-18 03:37:10 +00:00
Jae Seo
b375805f3b TIF: Add a method to get TvInputInfo for a given TV input
This is going to be needed by applications to get information about the
inputs that are just added thus not included in the previously retrieved
input list.

Bug: 16166859, Bug: 15838097
Change-Id: Icecd03fcea208a0c4d41caab1eec64e574f40877
2014-07-17 20:25:01 -07:00
Jae Seo
5507bd7688 TIF: Add buildInputId()
A recent change mandated that we should provide "input ID" instead of
ComponentName when building URIs for channels/programs while there is no
direct way to get one to use with. This CL added a method to build an ID
from a ComponentName.

Change-Id: Ia7f868cf241bb44ca0d4f689dc15326ce6944468
2014-07-17 20:23:52 -07:00
Tyler Gunn
439a6f9644 am 612354c2: am 6edbc6ed: am 1a0365fd: Merge "Wiring video state through from Connection" into lmp-dev
* commit '612354c2967226daa41334faea060da61d7eb033':
  Wiring video state through from Connection
2014-07-18 03:19:12 +00:00
Marcin Kosiba
b04162ab75 am 6ee098ec: am 8ea71bf3: am 231d57e2: Add a WebView.zoomBy API.
* commit '6ee098ec1ebc15e8816eebd519fbe90c40c7c90d':
  Add a WebView.zoomBy API.
2014-07-18 03:18:54 +00:00
Marcin Kosiba
3ee06efef3 Add a WebView.zoomBy API.
The WebView has zoomIn/zoomOut APIs which zoom in/out by a fixed
amount. This adds a more flexible API.

BUG: 13399510
Change-Id: Ia505048d5b1c48f9a3ff1c4ce7129ed2f55804f8
2014-07-18 02:18:44 +01:00
Youngsang Cho
2b8aa9903a Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev 2014-07-17 21:58:28 +00:00
Youngsang Cho
abebf6df87 TIF: Change the parameter of TvInputInfo.loadLabel/Icon
Labels and icons will be extracted from URI in the future.
To acheive it, we need Context rather than PackageManager.

Bug: 16166859
Change-Id: I20f0506fba5876a6cf21b70e44bb3a2265f723d7
2014-07-17 17:49:29 -07:00
Youngsang Cho
c66ca1267c Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev 2014-07-17 21:58:28 +00:00
Youngsang Cho
e821d711db TIF: Add a notification for surface change from TvView to TvInputService
Bug: 15447352
Change-Id: I3e91609c5eb03be84cc7c88507457b9e74750de8
2014-07-17 17:30:36 -07:00
Wonsik Kim
5b2295a521 Merge "TIF: change onCreateSession() method signature" into lmp-dev 2014-07-17 21:07:39 +00:00
Wonsik Kim
1032f034ff TIF: change onCreateSession() method signature
Bug: 16138420
Change-Id: I73f4992bd76b888c7e5bc6260b3ed849760ee707
2014-07-18 12:00:20 +09:00
Youngsang Cho
cdc4e42265 Merge "TIF: Hide TvContract.Channels.COLUMN_BROWSABLE" into lmp-dev 2014-07-17 18:11:21 +00:00
Youngsang Cho
6440db358c TIF: Hide TvContract.Channels.COLUMN_BROWSABLE
TODO: Remove BROWSABLE in TvContract, TvProvider and TV app.

Bug: 16195951
Change-Id: I20e8e1e2f93e0133eba3694e0c1724d443250e59
2014-07-17 20:27:46 -07:00
Jae Seo
54a4634983 Merge "TIF: Add TvParentalControlManager" into lmp-dev 2014-07-17 18:11:21 +00:00
Jae Seo
6057102dbb TIF: Add TvParentalControlManager
Each TV input service is now required to query the system whether the
user is allowed to watch the current program before showing it to the
user if the parental control is turned on, which can be checked by
calling TvParentalControlManager.isEnabled(). Whether the TV input
service should block the content or not is determined by invoking
TvParentalControlManager.isRatingBlocked() with the content rating for
the current program. Then the TvParentalControlManager makes a judgment
based on the user blocked ratings stored in the secure settings and
returns the result. If the rating in question turns out to be blocked,
the TV input service must immediately block the content and call this
method with the content rating of the current program to prompt the PIN
verification screen.

Each TV input service also needs to continuously listen to any changes
made to the parental control settings by registering a
TvParentalControlManager.ParentalControlCallback() to the manager and
immediately reevaluate the current program with the new parental control
settings.

Bug: 13172379
Change-Id: I8e1900d4b8d28c56798986d5c3906bd418ab97ac
2014-07-17 16:29:36 -07:00
Michael Wright
1da8349645 am a2ed68e5: am e9f933cd: am 4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev
* commit 'a2ed68e55381450b9259c8399082fd48155b0c64':
  Add MediaProjection APIs.
2014-07-18 00:37:44 +00:00
Andrew Lee
5cd2fac7e2 am ba09e36f: am 3441f3c5: am 9eb532f5: Merge "Pass through video state when answering a call." into lmp-dev
* commit 'ba09e36f0c84507823a51ba58fdf59b70ec28d5b':
  Pass through video state when answering a call.
2014-07-17 22:00:22 +00:00
Evan Charlton
d4ca3138fd am d84716e7: am 1f42afc6: am 58299755: Merge "Plumb through StatusHints change notifications" into lmp-dev
* commit 'd84716e717e28ecd4060d854898aabe9cea624c2':
  Plumb through StatusHints change notifications
2014-07-17 22:00:18 +00:00
Michael Wright
c39d47a8e7 Add MediaProjection APIs.
The new MediaProjection infrastructure allows the system to hand out
tokens granting the ability to capture the screen's contents, audio,
etc. at a granular level. It's intended to be used both for screen
casting, via the cast APIs, as well as screen sharing via third party
applications.

The screen sharing case is implemented, but all of audio capturing
is still forthcoming.

Change-Id: I4b24669bed7083e11413c10ed8d6b025f5375316
2014-07-17 14:30:19 -07:00
Eino-Ville Talvala
ef33384939 am 9971ee27: am 7e6dd457: am 97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev
* commit '9971ee27026b799f7e09fabd53ba07c5b43bfd93':
  Add PackageManager features for differentiating camera2 devices
2014-07-17 21:06:22 +00:00
Amith Yamasani
68265b0740 am 840e1535: am 562b7f0d: am 56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev
* commit '840e1535b9e607be177241552a08ac2b1cb236d6':
  Split telephony restrictions into outgoing calls and sms
2014-07-17 21:06:05 +00:00
Adam Powell
f8c8fc4c27 am 702f8297: am 35b4be8b: am 21b1b8b9: Add nested pre-fling for nested scrolling
* commit '702f82972600b6b78d5fee1d2511488ad405a1b1':
  Add nested pre-fling for nested scrolling
2014-07-17 21:06:00 +00:00
Christopher Tate
4cbb4469e6 am 0c3679f4: am 5763ad39: am e78826f6: Add BackupAgent.onRestoreFinished() callback
* commit '0c3679f423006976766c8eafbc78d7c3702990d5':
  Add BackupAgent.onRestoreFinished() callback
2014-07-17 21:05:25 +00:00
Adam Connors
fd259886cd am 23439bb9: am bab7ceaf: am d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev
* commit '23439bb9f3edcd2191aff79d57018ddaf2d74847':
  Create DPM APIs for cross profile callerId
2014-07-17 21:05:08 +00:00
Nancy Chen
bb6f311835 am 3a1fed97: am 74e775a5: am 4a9b99f5: API changes to enable account selection for a call
* commit '3a1fed9733a1bd6182ba5684cc59178c61874e59':
  API changes to enable account selection for a call
2014-07-17 21:05:00 +00:00
Jae Seo
3ee4685255 am 446039d7: am 77da1b05: am f977db2e: Merge "TIF: Add TvInputInfo.getParentId" into lmp-dev
* commit '446039d7acb0b06f3c8e00c4704e7c417393a2d5':
  TIF: Add TvInputInfo.getParentId
2014-07-17 21:04:40 +00:00
Evan Charlton
5b49adea48 Plumb through StatusHints change notifications
When StatusHints are modified, inform listeners. Also expose two
constants for passing optional strings from the CallService to
the in-call UI.

Bug: 13334257
Bug: 13334252

Change-Id: If7fde7c1ca6940cec8b7232469a22900c36dbb17
2014-07-17 12:53:39 -07:00
Adam Powell
b72be59a6a Add nested pre-fling for nested scrolling
Nested pre-fling allows a nested scrolling parent to consume a fling
operation before the child view does. If a parent has been consuming
nested pre-scroll events in a particular direction, this is generally
a good indication that it should also consume the resulting fling at
the end.

Bug 15538504

Change-Id: I88e8753a96c9b41815c3be530cafab8345164e64
2014-07-17 11:37:59 -07:00
Przemyslaw Szczepaniak
9caab369fe am 90d78fa4: am 95546693: Merge "Add AudioAttributes support in the TTS." into lmp-dev
* commit '90d78fa4ec5326d0cacfa5221c6675bc28b8c9d3':
  Add AudioAttributes support in the TTS.
2014-07-17 18:23:39 +00:00
Dianne Hackborn
64cf86c96b am 2a96a389: am cf3580b0: Merge "Fix build." into lmp-dev
* commit '2a96a3890975a991cbd91e9444325b0ee879caae':
  Fix build.
2014-07-17 18:22:31 +00:00
Chulwoo Lee
a92b5d288e am 44cafdc7: am 62572cab: Merge "Pass input ID to the setup/settings activity" into lmp-dev
* commit '44cafdc73e916aa0bf6c187c2fc986947fdaa2c1':
  Pass input ID to the setup/settings activity
2014-07-17 18:22:26 +00:00
Chulwoo Lee
cf3758fa6a am 3493ee3c: am 02023167: Merge "Introduce "input_id" column to the channels table" into lmp-dev
* commit '3493ee3cc87d35a02ba1b35c3f11572c8511fb66':
  Introduce "input_id" column to the channels table
2014-07-17 18:22:22 +00:00
Dianne Hackborn
bf507a0cba am 68f35ec2: am dbec91c0: Implement issue #16330060: Inform ActivityManager about WebView...
* commit '68f35ec2d2f9950f57afa9900f16a3b29a8d55b0':
  Implement issue #16330060: Inform ActivityManager about WebView...
2014-07-17 18:22:17 +00:00
Sandeep Siddhartha
a25b93b226 am bb80d295: am aecd5383: Add recognition modes to the enrollment metadata
* commit 'bb80d295092220d204a74cca1d7d1c0fde93757b':
  Add recognition modes to the enrollment metadata
2014-07-17 18:22:07 +00:00
Alan Viverette
238673f33a am 4366255e: am bbbbb3b2: Add public attributes for TimePicker styling
* commit '4366255e3764c7e2db2221b58c9b438ac8fdc84d':
  Add public attributes for TimePicker styling
2014-07-17 18:21:59 +00:00
Ye Wen
3a3735a233 am 0353e451: Merge "Unhide new MMS API and SMS storage API (1/2)" into lmp-dev
* commit '0353e451c6ccbbce461e911162543a7c96fc5523':
  Unhide new MMS API and SMS storage API (1/2)
2014-07-17 18:15:02 +00:00
Robert Shih
ec4c43f832 am 5f48c625: MediaRecorder: added constants for WEBM output
* commit '5f48c6258ffc537454e4df9b49a3ebee652cfaee':
  MediaRecorder: added constants for WEBM output
2014-07-17 18:14:57 +00:00
Tyler Gunn
aa07df84f2 Wiring video state through from Connection
Bug: 16285417
Bug: 16013178
Change-Id: Ia48959248ca22f4569b0ffd01a1716470aa0a711
2014-07-18 01:30:34 +00:00
Sailesh Nepal
909d1b5755 resolved conflicts for merge of 03e88771 to master
Change-Id: If55838968d008043f85a3cda1a2e0f76f357aec3
2014-07-17 11:05:42 -07:00
Christopher Tate
2e40d115ca Add BackupAgent.onRestoreFinished() callback
The agent's onRestoreFinished() method is called after all available
data has been delivered to the app, whether via the key/value restore
API or the full-data file-at-a-time API.  This gives the app a stable
opportunity to do any postprocessing that might be appropriate.

Also fixes a lingering bug in the framework's handling of backup
agent lifetimes.  In cases where an existing agent instances was
being rebound, the framework was forgetting to notify the dependent
that the agent was available.  This was causing timeouts and restore
failure.

Bug 16241004

Change-Id: I3f52b299312d30d38b0cba63a2cfaeb934991ef2
2014-07-17 17:43:24 +00:00
Nancy Chen
5da0fd5e76 API changes to enable account selection for a call
If an account default is not set, the incall ui will display a dialog to
allow the user to select an account for that particular call.

Bug: 16243703

Change-Id: I8faf2f2ce0b2669a141562832f23e8f3ce88f094
2014-07-17 10:19:20 -07:00