143221 Commits

Author SHA1 Message Date
Santos Cordon
6aac0f52e1 Merge "Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)" into lmp-dev 2014-07-19 22:40:06 +00:00
Jae Seo
a759b111a1 TIF: Add sendAppPrivateCommand()
Added a way to send a private command from the application to the TV
input. This can be used to provide domain-specific features that are
only known between certain TV inputs and their clients.

Change-Id: I7548311a64147b8ff27562ec680b941e2ec10bc0
2014-07-20 19:16:15 -07:00
Santos Cordon
5c6fa95e37 Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)
Bug: 16416927
Change-Id: If2d1c19134d2245677f7e0b3d94b118d9b50e751
2014-07-21 01:43:30 +00:00
Evan Charlton
a37cb8b6e3 Merge "@hide CAPABILITY_CALL_PROVIDER" into lmp-dev 2014-07-18 22:16:50 +00:00
Evan Charlton
7800fb7518 @hide CAPABILITY_CALL_PROVIDER
Until this API is fleshed out, leave ourselves room to tweak it.

Change-Id: Iddedb629d6fa02a56cd2041686dbe54ea5e4793b
2014-07-20 18:18:23 -07:00
Santos Cordon
88b771d8cd Rename InCallCall to ParcelableCall (1/2)
Bug: 16416927
Change-Id: Iae97d83ce74b4395d6877cc167d7e5057dac201b
2014-07-21 01:15:32 +00:00
Jesse Hall
7f51706265 Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A
Bug: 15593761
Change-Id: Id1865cbf27c98a611cc6414fe47ee979c1d7cee2
2014-07-18 14:24:36 -07:00
Winson Chung
3e3365babd Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100) 2014-07-18 18:49:53 +00:00
Youngsang Cho
6f306e21f4 Merge "TIF: Add unblock content" into lmp-dev 2014-07-17 21:58:28 +00:00
Youngsang Cho
427f74293b Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev 2014-07-18 18:24:25 +00:00
Jaewan Kim
903d6b72cd TIF: Add unblock content
When a TV content is blocked by the parental control settings,
TV input service will notify TV to request user's PIN code verification.

If the verification succeeds, TV input service will be notified back
that content is unblocked so it can keep playing the content.

Bug: 13172379
Change-Id: I7b31d762eb54612c4d8779ee133211f32fb73b05
2014-07-18 11:11:38 -07:00
Jaewan Kim
8e6b51b0fb TIF: Add onInputAdded and onInputRemoved
Bug: 16166859
Change-Id: I51bd87aded3e8619e36be200009e924e73cd348e
2014-07-18 15:35:25 +09:00
Evan Charlton
2c4b812a29 Merge "Rename setDestroy() to destroy()" into lmp-dev 2014-07-17 21:15:46 +00:00
Evan Charlton
36a713431c Rename setDestroy() to destroy()
Change-Id: I6bb46e679f55547b902d5850ab450e5d3818fa63
2014-07-20 15:20:29 -07:00
Wonsik Kim
5b2295a521 Merge "TIF: change onCreateSession() method signature" into lmp-dev 2014-07-17 21:07:39 +00:00
Youngsang Cho
3b0f928475 Fix a build breakage
Updated current.txt.

Change-Id: Ib1434da2345aa349e5fc3112bf38dbba9955c885
2014-07-17 21:27:00 -07:00
Wonsik Kim
1032f034ff TIF: change onCreateSession() method signature
Bug: 16138420
Change-Id: I73f4992bd76b888c7e5bc6260b3ed849760ee707
2014-07-18 12:00:20 +09: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
Deepanshu Gupta
d3ac01ff76 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev 2014-07-17 21:04:20 +00:00
Ricardo Cervera
9c36b83519 am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs
* commit '7a4253608397e647e2f04a1b14d0f02f3d695336':
  docs: Fixed RecyclerView example. Bug: 15973665
2014-07-17 20:34:58 +00:00
Ricardo Cervera
7a42536083 am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs
* commit '25303a980c026aab3ba0a01ce2a51122eb9982c2':
  docs: Fixed RecyclerView example. Bug: 15973665
2014-07-17 20:31:01 +00:00
Robert Ly
ee65b63d25 am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs
* commit '049cadd8c965ad69b875cd5ed7768c1b162acb39':
  docs: Fix typo in Wear docs. Bug: 16327298
2014-07-17 20:30:32 +00:00
Robert Ly
049cadd8c9 am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs
* commit 'f1b18ded01adf94ee34dbd95a86616d8eadbdf06':
  docs: Fix typo in Wear docs. Bug: 16327298
2014-07-17 20:27:03 +00:00
Prashant Malani
162d943350 am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev
* commit '9353e1a2b2e8f02377c3f73565964ffb0927c776':
  Make the booting flag update unconditional
2014-07-17 19:55:32 +00:00
Filip Gruszczynski
bbc499415c am a76164e1: Merge "Only use bottom outset for main display." into klp-modular-dev
* commit 'a76164e1d0d283baf412c18999e680d93bd50f01':
  Only use bottom outset for main display.
2014-07-17 19:55:27 +00:00
Yorke Lee
8319317e5a Merge "Add call log entries to all currently running users" into lmp-dev 2014-07-17 19:26:18 +00:00
Yorke Lee
158c5e41d4 Add call log entries to all currently running users
When a call log entry is inserted by Telecomm as the primary user,
insert the entry for all other currently running users as well.

Bug: 16298776
Change-Id: Ie48049d7e1847bff03d4f96eb644d27b8dd0c1cd
2014-07-21 09:54:34 -07:00
Guang Zhu
b477fc6c2f Merge "add command to enable bt snoop log" into klp-modular-dev 2014-07-17 19:26:18 +00:00
Guang Zhu
946f207d3d add command to enable bt snoop log
Change-Id: I22a6482a90c2bb976a5ce44946e9f0fb8b59e6b2
2014-07-17 20:24:56 -07:00
Dan Sandler
5598216931 Merge "Deprecate and stop generating tickerViews." into lmp-dev 2014-07-17 19:20:15 +00:00
Dan Sandler
5fcdf6e81d Deprecate and stop generating tickerViews.
Tickers have been replaced in the UI by heads-up
notifications (and not creating the tickerView will save
memory, almost 150k if you have an xhdpi largeIcon).

Update docs to explain that tickers are just for
accessibility now.

Bug: 16395266
Change-Id: Ib1372b34c1c261f64228bbe705d174675cd007dc
2014-07-18 12:11:58 -04:00
Narayan Kamath
e7d1f16fa9 Merge "Unhide." into lmp-dev 2014-07-17 19:45:26 +00:00
Narayan Kamath
b91ca2d880 Unhide.
Change-Id: Ie5788bfdde7ec7394dbd6e11e63e3044ccc5a802
2014-07-18 14:54:24 +01:00
Ji-Hwan Lee
d811af223e Fix android_system_stubs build
Change-Id: I52c42b5d781b5c07481cdce598d2ebc340d57850
2014-07-18 21:39:57 +09:00
Christoph Studer
329a85ba90 Merge "Cancel notification group children when summary is canceled" into lmp-dev 2014-07-17 19:55:10 +00:00
Bryan Mawhinney
8a97d9dfc5 Merge "Default MediaStyled notifications to CATEGORY_TRANSPORT" into lmp-dev 2014-07-17 19:45:26 +00:00
Bryan Mawhinney
6be8de36e6 Default MediaStyled notifications to CATEGORY_TRANSPORT
This makes it easier to identify them later (e.g., for filtering).
The developer can always specify a different category if preferred.

Also fixed some javadoc related to setMediaSession()

Change-Id: I5f28514758218ff66fdbaa9fd37ccb19f12d4852
2014-07-18 10:35:12 +01:00
Dongwon Kang
eea9743ba5 TIF: introduce TvContract.buildChannelUriForPassthroughTvInput()
This change adds a way to get a dummy channel for starting pass-through
TV inputs which don't have real channels in TvProvider.
Bug: 15496325

Change-Id: I7a6b99964319f12a0f8692b4e307e03480119a69
2014-07-18 16:24:57 +09:00
Dan Sandler
2083deb8f9 Merge "Actually show secret notifications sometimes." into lmp-dev 2014-07-17 19:26:18 +00:00
Dan Sandler
1b71878e4e Actually show secret notifications sometimes.
Factor out the "should we be hiding sensitive data"
predicate so we get it right everywhere.

Show visibility stuff in Notification.toString().

Bug: 16307122
Change-Id: Ifd16d073c4595add2ac3582ffc0d0179e55246e5
2014-07-18 13:37:33 -04:00
Dan Sandler
78f92eef03 Merge "Shrink user profile bitmaps to 48dp^2." into lmp-dev 2014-07-17 19:20:15 +00:00
Dan Sandler
4d75c079f3 Shrink user profile bitmaps to 48dp^2.
Can save megabytes of memory.

Bug: 16371371
Change-Id: Ifec5cff3a3376d045ee4e3b605edeb8d9ac93799
2014-07-18 15:26:48 +02:00
Tyler Gunn
76291774d0 Merge "Wiring video state through from Connection" into lmp-dev 2014-07-17 18:11:21 +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
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
Sandeep Siddhartha
d167224510 Merge "Test hotword flow" into lmp-dev 2014-07-17 21:15:46 +00:00
Sandeep Siddhartha
7444c906fa Test hotword flow
- Also fix a few StrictMode violations in DatabaseHelper

Change-Id: I93f27407dae34cc0dca5e9f891d4ca718d6010a5
2014-07-17 18:44:12 -07:00
RoboErik
ca58ddf7c8 Fix crash when calling MediaSession callback
bug:16311395
Change-Id: Ice52d2da63933af881dd95fa8c6f59a6fe27e0df
2014-07-18 01:40:09 +00:00
Wonsik Kim
61635036ac Merge "TIF: one-to-many relationship for TvInputService to TvInputInfo" into lmp-dev 2014-07-17 21:11:29 +00:00