OSDN Git Service
Narayan Kamath [Fri, 18 Jul 2014 14:11:18 +0000 (14:11 +0000)]
am
0a7a175b: am
c2819ea1: Merge "Unhide." into lmp-dev
* commit '
0a7a175bb7805daf4bf686a6a6c4a23def3a2a99':
Unhide.
Narayan Kamath [Fri, 18 Jul 2014 14:04:08 +0000 (14:04 +0000)]
am
c2819ea1: Merge "Unhide." into lmp-dev
* commit '
c2819ea18c06d729dc3b3454c5a80135ca62bf5c':
Unhide.
Dan Sandler [Fri, 18 Jul 2014 13:57:36 +0000 (13:57 +0000)]
am
26523631: am
ef247c27: Merge "Shrink user profile bitmaps to 48dp^2." into lmp-dev
* commit '
265236318943a4aa5d8fca7985a81a2e36e41629':
Shrink user profile bitmaps to 48dp^2.
Dan Sandler [Fri, 18 Jul 2014 13:53:20 +0000 (13:53 +0000)]
am
ef247c27: Merge "Shrink user profile bitmaps to 48dp^2." into lmp-dev
* commit '
ef247c27a250fd0f529ee214b5a95fe184749ab0':
Shrink user profile bitmaps to 48dp^2.
Yohann Roussel [Fri, 18 Jul 2014 13:36:15 +0000 (13:36 +0000)]
am
9cfbca64: (-s ours) am
3bdbf644: Merge "Add support.multidex tests app for an update bug."
* commit '
9cfbca64ac7df2e42932b679efdca251f9620ca2':
Add support.multidex tests app for an update bug.
Ji-Hwan Lee [Fri, 18 Jul 2014 13:04:49 +0000 (13:04 +0000)]
am
e030ad17: am
57b300cd: Fix android_system_stubs build
* commit '
e030ad17e373673c9dc1c1524674117c32a556c9':
Fix android_system_stubs build
Ji-Hwan Lee [Fri, 18 Jul 2014 12:54:42 +0000 (12:54 +0000)]
am
57b300cd: Fix android_system_stubs build
* commit '
57b300cd0fda909e8e59eb9df730be72942b523a':
Fix android_system_stubs build
Ji-Hwan Lee [Fri, 18 Jul 2014 12:39:57 +0000 (21:39 +0900)]
Fix android_system_stubs build
Change-Id: I52c42b5d781b5c07481cdce598d2ebc340d57850
Christoph Studer [Fri, 18 Jul 2014 11:45:17 +0000 (11:45 +0000)]
am
aa3bb5bf: am
c6a6ae78: Merge "Cancel notification group children when summary is canceled" into lmp-dev
* commit '
aa3bb5bf9f84ba195feef245ab247b4903fb7e66':
Cancel notification group children when summary is canceled
Bryan Mawhinney [Fri, 18 Jul 2014 11:45:13 +0000 (11:45 +0000)]
am
bd7f8215: am
d82b7ec9: Merge "Default MediaStyled notifications to CATEGORY_TRANSPORT" into lmp-dev
* commit '
bd7f8215c9af9c48c4d4bd802d0712a8c0eac66b':
Default MediaStyled notifications to CATEGORY_TRANSPORT
Dongwon Kang [Fri, 18 Jul 2014 11:45:08 +0000 (11:45 +0000)]
am
46c65057: am
0e02f53c: TIF: introduce TvContract.buildChannelUriForPassthroughTvInput()
* commit '
46c6505702519e7c55ed0970547c296e19f87983':
TIF: introduce TvContract.buildChannelUriForPassthroughTvInput()
Wonsik Kim [Fri, 18 Jul 2014 11:45:01 +0000 (11:45 +0000)]
am
480dd588: am
5fec7afe: Merge "TIF: change onCreateSession() method signature" into lmp-dev
* commit '
480dd588a0c67da50a671976fb643eb172d6fb11':
TIF: change onCreateSession() method signature
Youngsang Cho [Fri, 18 Jul 2014 11:44:56 +0000 (11:44 +0000)]
am
f6a118b2: am
ad67fc6f: Fix a build breakage
* commit '
f6a118b28587adc300a5fb39d17b900e3c719504':
Fix a build breakage
Christoph Studer [Fri, 18 Jul 2014 11:22:42 +0000 (11:22 +0000)]
am
c6a6ae78: Merge "Cancel notification group children when summary is canceled" into lmp-dev
* commit '
c6a6ae78af611dacc51a481f83d878a8e3fba7cb':
Cancel notification group children when summary is canceled
Bryan Mawhinney [Fri, 18 Jul 2014 11:22:33 +0000 (11:22 +0000)]
am
d82b7ec9: Merge "Default MediaStyled notifications to CATEGORY_TRANSPORT" into lmp-dev
* commit '
d82b7ec93136bf0ba5c5f66e1542d33979a76e00':
Default MediaStyled notifications to CATEGORY_TRANSPORT
Dongwon Kang [Fri, 18 Jul 2014 11:22:23 +0000 (11:22 +0000)]
am
0e02f53c: TIF: introduce TvContract.buildChannelUriForPassthroughTvInput()
* commit '
0e02f53cea21c90ec63cfb2a2f8c3ee81a3848fe':
TIF: introduce TvContract.buildChannelUriForPassthroughTvInput()
Wonsik Kim [Fri, 18 Jul 2014 11:22:02 +0000 (11:22 +0000)]
am
5fec7afe: Merge "TIF: change onCreateSession() method signature" into lmp-dev
* commit '
5fec7afe3b1bb24c9382ab59a25f5c7eb87e6344':
TIF: change onCreateSession() method signature
Youngsang Cho [Fri, 18 Jul 2014 11:21:53 +0000 (11:21 +0000)]
am
ad67fc6f: Fix a build breakage
* commit '
ad67fc6fe2994c72bd31896de25dceb0adacd3cb':
Fix a build breakage
Yohann Roussel [Fri, 18 Jul 2014 10:59:05 +0000 (10:59 +0000)]
am
3bdbf644: Merge "Add support.multidex tests app for an update bug."
* commit '
3bdbf644d61f46b531838558fabbd5b990fc4913':
Add support.multidex tests app for an update bug.
Dongwon Kang [Tue, 15 Jul 2014 12:36:43 +0000 (21:36 +0900)]
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
Youngsang Cho [Fri, 18 Jul 2014 04:24:06 +0000 (21:24 -0700)]
Fix a build breakage
Updated current.txt.
Change-Id: Ib1434da2345aa349e5fc3112bf38dbba9955c885
Youngsang Cho [Fri, 18 Jul 2014 03:40:10 +0000 (03:40 +0000)]
am
33b7885e: am
d81f1075: Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev
* commit '
33b7885eef0d4657a8bf47e99031c366df2f69fe':
TIF: Change the parameter of TvInputInfo.loadLabel/Icon
Youngsang Cho [Fri, 18 Jul 2014 03:40:05 +0000 (03:40 +0000)]
am
eede71e5: am
aa5dbe63: Merge "TIF: Hide TvContract.Channels.COLUMN_BROWSABLE" into lmp-dev
* commit '
eede71e543a07c6874636ec50cff57c4c5f8f839':
TIF: Hide TvContract.Channels.COLUMN_BROWSABLE
Youngsang Cho [Fri, 18 Jul 2014 03:39:59 +0000 (03:39 +0000)]
am
9dc7566a: am
57df5b3d: Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev
* commit '
9dc7566a2c425144fc8ca33dc68df60c85c69337':
TIF: Add a notification for surface change from TvView to TvInputService
Jae Seo [Fri, 18 Jul 2014 03:35:32 +0000 (03:35 +0000)]
am
eb39352e: am
cd12bfc7: TIF: Add a method to get TvInputInfo for a given TV input
* commit '
eb39352e64f10c086c69028b2adab259589add19':
TIF: Add a method to get TvInputInfo for a given TV input
John Spurlock [Fri, 18 Jul 2014 03:35:28 +0000 (03:35 +0000)]
am
be3417a0: am
5690da98: Merge "Volume: Rocker animation + style updates." into lmp-dev
* commit '
be3417a019bdcb1c0b49fe51fed2960a14102ad4':
Volume: Rocker animation + style updates.
Jae Seo [Fri, 18 Jul 2014 03:35:24 +0000 (03:35 +0000)]
am
e2ef18ce: am
27d12ca6: TIF: Add buildInputId()
* commit '
e2ef18ce351e08becc100e2d76b6054a8d5ae96e':
TIF: Add buildInputId()
Youngsang Cho [Fri, 18 Jul 2014 03:34:53 +0000 (03:34 +0000)]
am
d81f1075: Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev
* commit '
d81f1075c0aa5623a3fd64150e8ca5f6d04907c8':
TIF: Change the parameter of TvInputInfo.loadLabel/Icon
Youngsang Cho [Fri, 18 Jul 2014 03:34:49 +0000 (03:34 +0000)]
am
aa5dbe63: Merge "TIF: Hide TvContract.Channels.COLUMN_BROWSABLE" into lmp-dev
* commit '
aa5dbe6370213b9c18e6f34d812c055645696f58':
TIF: Hide TvContract.Channels.COLUMN_BROWSABLE
Youngsang Cho [Fri, 18 Jul 2014 03:34:45 +0000 (03:34 +0000)]
am
57df5b3d: Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev
* commit '
57df5b3db54f627345d8fe16c51fc3561f563f9e':
TIF: Add a notification for surface change from TvView to TvInputService
Jae Seo [Fri, 18 Jul 2014 03:30:41 +0000 (03:30 +0000)]
am
b719bf57: am
3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev
* commit '
b719bf5720ea501fa6324d866e49e65b59b1a182':
TIF: Add TvParentalControlManager
Jae Seo [Fri, 18 Jul 2014 03:30:31 +0000 (03:30 +0000)]
am
cd12bfc7: TIF: Add a method to get TvInputInfo for a given TV input
* commit '
cd12bfc7259cd7f38986f8a135764ab42d81e30a':
TIF: Add a method to get TvInputInfo for a given TV input
John Spurlock [Fri, 18 Jul 2014 03:30:28 +0000 (03:30 +0000)]
am
5690da98: Merge "Volume: Rocker animation + style updates." into lmp-dev
* commit '
5690da980040eb4b1a89ea903733f0cc8d247c5e':
Volume: Rocker animation + style updates.
Jae Seo [Fri, 18 Jul 2014 03:30:23 +0000 (03:30 +0000)]
am
27d12ca6: TIF: Add buildInputId()
* commit '
27d12ca6b4966d6dd520fb72fb0058619a87d448':
TIF: Add buildInputId()
Jae Seo [Fri, 18 Jul 2014 03:26:23 +0000 (03:26 +0000)]
am
3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev
* commit '
3245f3d76cc92899091f113e701a32a7eb819591':
TIF: Add TvParentalControlManager
Jae Seo [Sun, 13 Jul 2014 02:25:24 +0000 (19:25 -0700)]
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
Jae Seo [Thu, 17 Jul 2014 23:53:13 +0000 (16:53 -0700)]
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
Jeff Brown [Fri, 18 Jul 2014 03:16:58 +0000 (03:16 +0000)]
am
9560a079: am
ce75065c: Merge "Add glance sensor for doze mode." into lmp-dev
* commit '
9560a0797de1ce25952c9e8a0b124f49f8cf102e':
Add glance sensor for doze mode.
Tyler Gunn [Fri, 18 Jul 2014 03:09:55 +0000 (03:09 +0000)]
am
6edbc6ed: am
1a0365fd: Merge "Wiring video state through from Connection" into lmp-dev
* commit '
6edbc6edbfbec463efa2a364c1c8db32033b0765':
Wiring video state through from Connection
Sandeep Siddhartha [Fri, 18 Jul 2014 03:09:50 +0000 (03:09 +0000)]
am
207c076a: am
ad6bb11f: Merge "Test hotword flow" into lmp-dev
* commit '
207c076a52c74b28570ca6269e0b56bd8c886757':
Test hotword flow
Wonsik Kim [Fri, 18 Jul 2014 03:09:45 +0000 (03:09 +0000)]
am
719c0ebd: am
2a7c2e38: Merge "TIF: one-to-many relationship for TvInputService to TvInputInfo" into lmp-dev
* commit '
719c0ebdaceb1f714d66ff35c80cb3765f1caae9':
TIF: one-to-many relationship for TvInputService to TvInputInfo
RoboErik [Fri, 18 Jul 2014 03:09:35 +0000 (03:09 +0000)]
am
5f604ccf: am
2ca51276: Fix crash when calling MediaSession callback
* commit '
5f604ccf740919c294cad9403fd67c315eb20724':
Fix crash when calling MediaSession callback
Marcin Kosiba [Fri, 18 Jul 2014 03:09:31 +0000 (03:09 +0000)]
am
8ea71bf3: am
231d57e2: Add a WebView.zoomBy API.
* commit '
8ea71bf3c3e3face48160a1de82b9f2a71616c0b':
Add a WebView.zoomBy API.
Zhijun He [Fri, 18 Jul 2014 03:09:25 +0000 (03:09 +0000)]
am
fb29d478: am
93ecc474: Merge "Camera2: partialResultCount should be optional" into lmp-dev
* commit '
fb29d478e9407a6d0dc5b20bb7f2f23ecde4d3da':
Camera2: partialResultCount should be optional
Jeff Brown [Fri, 18 Jul 2014 03:08:27 +0000 (03:08 +0000)]
am
ce75065c: Merge "Add glance sensor for doze mode." into lmp-dev
* commit '
ce75065cff02b83f153306c2c2ec7e1cc3ef262b':
Add glance sensor for doze mode.
Jinsuk Kim [Fri, 18 Jul 2014 02:51:28 +0000 (02:51 +0000)]
am
eff7b1af: am
ba5ba7a2: Merge "Remove system audio output option for HdmiControlService" into lmp-dev
* commit '
eff7b1af6ab496ee64882ad21f1d58269fd37f4a':
Remove system audio output option for HdmiControlService
Craig Stout [Fri, 18 Jul 2014 02:51:12 +0000 (02:51 +0000)]
am
79de62b3: am
51ff3b68: Fix timepicker double done buttons.
* commit '
79de62b38cd94629aa09883120becec6faae2229':
Fix timepicker double done buttons.
Filip Gruszczynski [Fri, 18 Jul 2014 02:51:04 +0000 (02:51 +0000)]
am
c82b01a5: am
23c51de9: resolved conflicts for merge of
bbc49941 to lmp-dev
* commit '
c82b01a547fd94a9b042655712b82bd88e4d39af':
Only use bottom outset for main display.
John Spurlock [Fri, 18 Jul 2014 02:50:57 +0000 (02:50 +0000)]
am
b1bcf059: am
d92f55cb: Merge "Shade: Hide status icons, take 2." into lmp-dev
* commit '
b1bcf0591321914011ea0feed8e8496bbc945e05':
Shade: Hide status icons, take 2.
Christopher Tate [Fri, 18 Jul 2014 02:50:51 +0000 (02:50 +0000)]
am
85f64ae6: am
912793dc: Properly end full restore attempt if getNextFullRestoreDataChunk() fails
* commit '
85f64ae60cfe6bafd8ea2d60c45b18a531436344':
Properly end full restore attempt if getNextFullRestoreDataChunk() fails
Chris Craik [Fri, 18 Jul 2014 02:50:44 +0000 (02:50 +0000)]
am
19581d6b: am
a987914f: Merge "[HWUI]: fix residual line on FrameBuffer" into lmp-dev
* commit '
19581d6b307ef3e62d83bb890d6308a341799af4':
[HWUI]: fix residual line on FrameBuffer
Tyler Gunn [Fri, 18 Jul 2014 02:36:12 +0000 (02:36 +0000)]
am
1a0365fd: Merge "Wiring video state through from Connection" into lmp-dev
* commit '
1a0365fd820a6ab1b6a636c95cdabe55f965608a':
Wiring video state through from Connection
Sandeep Siddhartha [Fri, 18 Jul 2014 02:31:44 +0000 (02:31 +0000)]
am
ad6bb11f: Merge "Test hotword flow" into lmp-dev
* commit '
ad6bb11f0e683cf018ff34a6be50bb51a215cec3':
Test hotword flow
Wonsik Kim [Fri, 18 Jul 2014 02:23:52 +0000 (02:23 +0000)]
am
2a7c2e38: Merge "TIF: one-to-many relationship for TvInputService to TvInputInfo" into lmp-dev
* commit '
2a7c2e3895306024932a20e38dfff488436a486a':
TIF: one-to-many relationship for TvInputService to TvInputInfo
RoboErik [Fri, 18 Jul 2014 01:43:45 +0000 (01:43 +0000)]
am
2ca51276: Fix crash when calling MediaSession callback
* commit '
2ca512761bb16c2ed2136002d866cc2d7aaf79cb':
Fix crash when calling MediaSession callback
RoboErik [Fri, 18 Jul 2014 01:26:21 +0000 (18:26 -0700)]
Fix crash when calling MediaSession callback
bug:
16311395
Change-Id: Ice52d2da63933af881dd95fa8c6f59a6fe27e0df
Marcin Kosiba [Fri, 18 Jul 2014 01:23:51 +0000 (01:23 +0000)]
am
231d57e2: Add a WebView.zoomBy API.
* commit '
231d57e20d978fda6ace2457d9a5b19ee749f1cb':
Add a WebView.zoomBy API.
Marcin Kosiba [Tue, 15 Jul 2014 16:59:51 +0000 (17:59 +0100)]
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
Zhijun He [Fri, 18 Jul 2014 01:06:12 +0000 (01:06 +0000)]
am
93ecc474: Merge "Camera2: partialResultCount should be optional" into lmp-dev
* commit '
93ecc474c3cedc6511bca900590637e68c86aa05':
Camera2: partialResultCount should be optional
Michael Wright [Fri, 18 Jul 2014 00:32:13 +0000 (00:32 +0000)]
am
e9f933cd: am
4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev
* commit '
e9f933cd6bdecb96212d5edf9ba54c7c12c46f03':
Add MediaProjection APIs.
Jinsuk Kim [Fri, 18 Jul 2014 00:28:16 +0000 (00:28 +0000)]
am
ba5ba7a2: Merge "Remove system audio output option for HdmiControlService" into lmp-dev
* commit '
ba5ba7a2408de8a3ac40d3bf0ed18141bee2fada':
Remove system audio output option for HdmiControlService
Ben Murdoch [Thu, 17 Jul 2014 23:48:26 +0000 (23:48 +0000)]
am
5ba41787: am
015ca040: Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev
* commit '
5ba4178783a48d3269e3404a1ba62263afd5932e':
Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
Ying Wang [Thu, 17 Jul 2014 23:48:21 +0000 (23:48 +0000)]
destradaa [Thu, 17 Jul 2014 23:48:08 +0000 (23:48 +0000)]
am
e2383800: am
607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev
* commit '
e23838004e5db510c6e86919b2dcf16e67e3339b':
Fix exceptions in ActivityRecognition platform stack.
Craig Stout [Thu, 17 Jul 2014 23:47:57 +0000 (23:47 +0000)]
am
04e9457b: am
68e9eb34: Fix legacyMode for leanback timepicker
* commit '
04e9457bdd95a4e8c93538697c791f60b27cfc1c':
Fix legacyMode for leanback timepicker
Andres Morales [Thu, 17 Jul 2014 23:47:52 +0000 (23:47 +0000)]
am
77bf359b: am
e9f27df7: Permit settings to "wipe" the persistent partition
* commit '
77bf359b2d6b81fc18efe9ab888699df27ab81f9':
Permit settings to "wipe" the persistent partition
Zhijun He [Thu, 17 Jul 2014 23:47:45 +0000 (23:47 +0000)]
am
3bce0759: am
4c6f6ffe: Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev
* commit '
3bce07590a097d2e904daa549e3083415e3c4051':
Camera2: replace partial quirks with normal partial result
Craig Stout [Thu, 17 Jul 2014 23:33:44 +0000 (23:33 +0000)]
am
51ff3b68: Fix timepicker double done buttons.
* commit '
51ff3b686347d4b0ce638b1556ab47b5c10140be':
Fix timepicker double done buttons.
Craig Stout [Thu, 17 Jul 2014 18:32:09 +0000 (11:32 -0700)]
Fix timepicker double done buttons.
Leanback theme uses a legacy layout with a done button, but
apps won't necessarily have target apilevel L.
Change-Id: Ib38b08df1fe07bd8fb4e64e93633ce0b7eb12567
Filip Gruszczynski [Thu, 17 Jul 2014 23:24:55 +0000 (23:24 +0000)]
am
23c51de9: resolved conflicts for merge of
bbc49941 to lmp-dev
* commit '
23c51de92cf52f02b7ff014790224199abf2e86a':
Only use bottom outset for main display.
Filip Gruszczynski [Thu, 17 Jul 2014 23:20:24 +0000 (16:20 -0700)]
resolved conflicts for merge of
bbc49941 to lmp-dev
Change-Id: If8e607ab1946c3ca5bb8960d32fdefebbfb21ffe
John Spurlock [Thu, 17 Jul 2014 23:15:32 +0000 (23:15 +0000)]
am
d92f55cb: Merge "Shade: Hide status icons, take 2." into lmp-dev
* commit '
d92f55cb1169c51858152b9787ba5d3e685ae86b':
Shade: Hide status icons, take 2.
Christopher Tate [Thu, 17 Jul 2014 23:04:24 +0000 (23:04 +0000)]
am
912793dc: Properly end full restore attempt if getNextFullRestoreDataChunk() fails
* commit '
912793dc95c09d384587195c667958723cac646a':
Properly end full restore attempt if getNextFullRestoreDataChunk() fails
Christopher Tate [Thu, 17 Jul 2014 22:58:12 +0000 (15:58 -0700)]
Properly end full restore attempt if getNextFullRestoreDataChunk() fails
Don't just drop the error return on the floor and retry (forever!).
Change-Id: I5f0ef2d09ea286d813add69517f865e474341b43
Chris Craik [Thu, 17 Jul 2014 22:42:29 +0000 (22:42 +0000)]
am
a987914f: Merge "[HWUI]: fix residual line on FrameBuffer" into lmp-dev
* commit '
a987914f5c43a1651846121e5009a84bb05f87b0':
[HWUI]: fix residual line on FrameBuffer
Yohann Roussel [Fri, 18 Jul 2014 10:54:42 +0000 (10:54 +0000)]
Merge "Add support.multidex tests app for an update bug."
Michael Wright [Thu, 17 Jul 2014 22:04:05 +0000 (22:04 +0000)]
am
4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev
* commit '
4d2ee15a7dfe005461b0bdac8f518b283311fcfb':
Add MediaProjection APIs.
Youngsang Cho [Fri, 18 Jul 2014 03:30:55 +0000 (03:30 +0000)]
Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev
Youngsang Cho [Thu, 17 Jul 2014 22:24:22 +0000 (15:24 -0700)]
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
Youngsang Cho [Fri, 18 Jul 2014 03:28:15 +0000 (03:28 +0000)]
Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev
Youngsang Cho [Wed, 16 Jul 2014 21:22:19 +0000 (14:22 -0700)]
TIF: Add a notification for surface change from TvView to TvInputService
Bug:
15447352
Change-Id: I3e91609c5eb03be84cc7c88507457b9e74750de8
Chris Craik [Thu, 17 Jul 2014 21:47:39 +0000 (21:47 +0000)]
am
8470bb0a: (-s ours) am
152d9e61: Merge "[HWUI]: fix residual line on FrameBuffer"
* commit '
8470bb0ac9e5d8bc389b57b24363af31a0ec74d7':
[HWUI]: fix residual line on FrameBuffer
Ben Murdoch [Thu, 17 Jul 2014 21:41:22 +0000 (21:41 +0000)]
am
015ca040: Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev
* commit '
015ca0408e423d17dbf3b30ffa846ab6b6bd8a7a':
Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
Ying Wang [Thu, 17 Jul 2014 21:36:00 +0000 (21:36 +0000)]
Ying Wang [Thu, 17 Jul 2014 21:30:54 +0000 (14:30 -0700)]
Fix sdk build.
Change-Id: I9073747f7a12f826fabf99c34dce813edf6462c1
Andrew Lee [Thu, 17 Jul 2014 21:30:04 +0000 (21:30 +0000)]
am
3441f3c5: am
9eb532f5: Merge "Pass through video state when answering a call." into lmp-dev
* commit '
3441f3c5da64c441f1fe9c4be06e3aeac87b9f5f':
Pass through video state when answering a call.
Evan Charlton [Thu, 17 Jul 2014 21:29:51 +0000 (21:29 +0000)]
am
1f42afc6: am
58299755: Merge "Plumb through StatusHints change notifications" into lmp-dev
* commit '
1f42afc6b8a4f1e0e643167f550821fd25b3fb0a':
Plumb through StatusHints change notifications
John Spurlock [Thu, 17 Jul 2014 21:29:37 +0000 (21:29 +0000)]
am
47631221: am
d75d1ef0: Merge "QS: Fix crash switching users." into lmp-dev
* commit '
47631221aeb7839b0e790423263e50076bb4266a':
QS: Fix crash switching users.
Craig Mautner [Thu, 17 Jul 2014 21:29:32 +0000 (21:29 +0000)]
am
64dc5b09: am
20b338d9: Merge "Restore calling identity before checking permission" into lmp-dev
* commit '
64dc5b09f1d398541486dd7beb777c71c1a4f0ec':
Restore calling identity before checking permission
RoboErik [Thu, 17 Jul 2014 21:29:28 +0000 (21:29 +0000)]
am
4f4d8180: am
4e8b237d: Merge "return false for media keys if no controller" into lmp-dev
* commit '
4f4d81805635072186c4eb63d395f995d9f8db2d':
return false for media keys if no controller
Sandeep Siddhartha [Fri, 18 Jul 2014 02:28:55 +0000 (02:28 +0000)]
Merge "Test hotword flow" into lmp-dev
Sandeep Siddhartha [Thu, 17 Jul 2014 06:55:41 +0000 (23:55 -0700)]
Test hotword flow
- Also fix a few StrictMode violations in DatabaseHelper
Change-Id: I93f27407dae34cc0dca5e9f891d4ca718d6010a5
Michael Wright [Thu, 17 Jul 2014 21:59:19 +0000 (21:59 +0000)]
Merge "Add MediaProjection APIs." into lmp-dev
Michael Wright [Wed, 9 Jul 2014 01:07:36 +0000 (18:07 -0700)]
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
Wonsik Kim [Fri, 18 Jul 2014 02:19:12 +0000 (02:19 +0000)]
Merge "TIF: one-to-many relationship for TvInputService to TvInputInfo" into lmp-dev
Wonsik Kim [Wed, 25 Jun 2014 05:12:48 +0000 (14:12 +0900)]
TIF: one-to-many relationship for TvInputService to TvInputInfo
The scope of this change is to provide a skeleton code for supporting
multiple TV input per service.
Bug:
16138420
Change-Id: Ic51355902d5e0424b8fc8a75c495d4781a7ed744
Zhijun He [Fri, 18 Jul 2014 01:02:20 +0000 (01:02 +0000)]
Merge "Camera2: partialResultCount should be optional" into lmp-dev
Zhijun He [Fri, 18 Jul 2014 00:45:54 +0000 (17:45 -0700)]
Camera2: partialResultCount should be optional
Change-Id: Iacd2b5e8f388c18cbff0f1cefdb5c10812ae751e
Wonsik Kim [Fri, 18 Jul 2014 04:34:51 +0000 (04:34 +0000)]
Merge "TIF: change onCreateSession() method signature" into lmp-dev
Wonsik Kim [Fri, 18 Jul 2014 02:36:59 +0000 (11:36 +0900)]
TIF: change onCreateSession() method signature
Bug:
16138420
Change-Id: I73f4992bd76b888c7e5bc6260b3ed849760ee707