git.osdn.net Git - android-x86/frameworks-base.git/log

Narayan Kamath [Fri, 18 Jul 2014 16:41:35 +0000 (16:41 +0000)]

am 7de6bafb: am 3b29a424: am 8ebfdcbc: Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev

* commit '7de6bafb551e35ff8972be59d62e13b9dafd9263':
Fix broken locale related assumptions in TextServicesManager.

commit | commitdiff | tree

Narayan Kamath [Fri, 18 Jul 2014 16:38:01 +0000 (16:38 +0000)]

am 3b29a424: am 8ebfdcbc: Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev

* commit '3b29a42453c798bbaa8a37ce415cd72ca7b1a2c6':
Fix broken locale related assumptions in TextServicesManager.

commit | commitdiff | tree

Narayan Kamath [Fri, 18 Jul 2014 16:33:41 +0000 (16:33 +0000)]

am 8ebfdcbc: Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev

* commit '8ebfdcbce191ec6d6203df727225584798ebe90b':
Fix broken locale related assumptions in TextServicesManager.

commit | commitdiff | tree

Yigit Boyar [Fri, 18 Jul 2014 16:26:10 +0000 (16:26 +0000)]

am 1fe98ecf: am 15b4f0e0: am d81c4869: Update RecyclerView scroll listener to the new API

* commit '1fe98ecfae4dde3321259d7ecd7d1e57f2eaee98':
Update RecyclerView scroll listener to the new API

commit | commitdiff | tree

Yigit Boyar [Fri, 18 Jul 2014 16:23:23 +0000 (16:23 +0000)]

am 15b4f0e0: am d81c4869: Update RecyclerView scroll listener to the new API

* commit '15b4f0e09ed2a21230a7591618adc4772570f031':
Update RecyclerView scroll listener to the new API

commit | commitdiff | tree

Yigit Boyar [Fri, 18 Jul 2014 16:17:59 +0000 (16:17 +0000)]

am d81c4869: Update RecyclerView scroll listener to the new API

* commit 'd81c4869401b42bec84c935a1223134862089547':
Update RecyclerView scroll listener to the new API

commit | commitdiff | tree

Yigit Boyar [Mon, 14 Jul 2014 22:40:36 +0000 (15:40 -0700)]

Update RecyclerView scroll listener to the new API

Bug: 16054949
Change-Id: I264a701e8b298a08f09bb30284099734054d518c

commit | commitdiff | tree

Niels Egberts [Fri, 18 Jul 2014 16:03:31 +0000 (16:03 +0000)]

am 80f946af: am 9a35945f: am 8fe5ff89: Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev

* commit '80f946af928fad7f4f66adc99642e7451d1d5865':
New TtsSpan builders for types measure, time, date, digits and verbatim.

commit | commitdiff | tree

John Spurlock [Fri, 18 Jul 2014 16:03:27 +0000 (16:03 +0000)]

am 29f75ce7: am fc785e85: am 59371a77: Merge "Volume: Dismiss shade when launching settings from rocker." into lmp-dev

* commit '29f75ce71d37723e9b064c7c66c842a8b45716fe':
Volume: Dismiss shade when launching settings from rocker.

commit | commitdiff | tree

Niels Egberts [Fri, 18 Jul 2014 15:58:42 +0000 (15:58 +0000)]

am 9a35945f: am 8fe5ff89: Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev

* commit '9a35945f774b94abfadff485e6f90de49938c402':
New TtsSpan builders for types measure, time, date, digits and verbatim.

commit | commitdiff | tree

John Spurlock [Fri, 18 Jul 2014 15:58:38 +0000 (15:58 +0000)]

am fc785e85: am 59371a77: Merge "Volume: Dismiss shade when launching settings from rocker." into lmp-dev

* commit 'fc785e857dc417538a41acec3befbea4dec2aef3':
Volume: Dismiss shade when launching settings from rocker.

commit | commitdiff | tree

Niels Egberts [Fri, 18 Jul 2014 15:53:48 +0000 (15:53 +0000)]

am 8fe5ff89: Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev

* commit '8fe5ff8954a8d08f488a313dd6b6cc28b3447121':
New TtsSpan builders for types measure, time, date, digits and verbatim.

commit | commitdiff | tree

John Spurlock [Fri, 18 Jul 2014 15:53:44 +0000 (15:53 +0000)]

am 59371a77: Merge "Volume: Dismiss shade when launching settings from rocker." into lmp-dev

* commit '59371a77eeede48b98d51c5914e8ffd290f630ff':
Volume: Dismiss shade when launching settings from rocker.

commit | commitdiff | tree

Jean-Michel Trivi [Fri, 18 Jul 2014 15:44:03 +0000 (15:44 +0000)]

am 873b041c: am f582d947: am 9319d51e: Merge "Unhide audio virtualizer capability query methods" into lmp-dev

* commit '873b041cfc15de07ddece33bd6594438ec640ffc':
Unhide audio virtualizer capability query methods

commit | commitdiff | tree

Niels Egberts [Fri, 18 Jul 2014 15:40:01 +0000 (15:40 +0000)]

am ebeaf8bb: am 50084b07: am bfe7d019: Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev

* commit 'ebeaf8bb6fd8d30f9c1188dbd5d7e405a133796d':
Add builders for TtsSpans of type ordinal, decimal and fraction.

commit | commitdiff | tree

Jean-Michel Trivi [Fri, 18 Jul 2014 15:37:44 +0000 (15:37 +0000)]

am f582d947: am 9319d51e: Merge "Unhide audio virtualizer capability query methods" into lmp-dev

* commit 'f582d947360aece2952e13203450d78325dbb842':
Unhide audio virtualizer capability query methods

commit | commitdiff | tree

Niels Egberts [Fri, 18 Jul 2014 15:33:41 +0000 (15:33 +0000)]

am 50084b07: am bfe7d019: Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev

* commit '50084b07ea1b513a63f236c5e75f66a521f1715e':
Add builders for TtsSpans of type ordinal, decimal and fraction.

commit | commitdiff | tree

Jean-Michel Trivi [Fri, 18 Jul 2014 15:33:12 +0000 (15:33 +0000)]

am 9319d51e: Merge "Unhide audio virtualizer capability query methods" into lmp-dev

* commit '9319d51ea80f562b176ced9559d69b5ba4652de4':
Unhide audio virtualizer capability query methods

commit | commitdiff | tree

Niels Egberts [Fri, 18 Jul 2014 15:28:15 +0000 (15:28 +0000)]

am bfe7d019: Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev

* commit 'bfe7d01977db5e2ebd27694d17ee9b32c4b93795':
Add builders for TtsSpans of type ordinal, decimal and fraction.

commit | commitdiff | tree

Narayan Kamath [Fri, 18 Jul 2014 14:15:48 +0000 (14:15 +0000)]

am b157ce37: am 0a7a175b: am c2819ea1: Merge "Unhide." into lmp-dev

* commit 'b157ce3757ac309c7769f85d3b9ca9e8630bfbc8':
Unhide.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Narayan Kamath [Fri, 18 Jul 2014 14:04:08 +0000 (14:04 +0000)]

am c2819ea1: Merge "Unhide." into lmp-dev

* commit 'c2819ea18c06d729dc3b3454c5a80135ca62bf5c':
Unhide.

commit | commitdiff | tree

Dan Sandler [Fri, 18 Jul 2014 14:00:45 +0000 (14:00 +0000)]

am 969671ab: am 26523631: am ef247c27: Merge "Shrink user profile bitmaps to 48dp^2." into lmp-dev

* commit '969671ab25a5a4911a28a2b6eaf369c1de6e34c2':
Shrink user profile bitmaps to 48dp^2.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Yohann Roussel [Fri, 18 Jul 2014 13:42:04 +0000 (13:42 +0000)]

am 11c0a64f: am 9cfbca64: (-s ours) am 3bdbf644: Merge "Add support.multidex tests app for an update bug."

* commit '11c0a64f67c6d62607d46f5813ce09c1c042a5a3':
Add support.multidex tests app for an update bug.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Ji-Hwan Lee [Fri, 18 Jul 2014 13:14:19 +0000 (13:14 +0000)]

am 12d413d8: am e030ad17: am 57b300cd: Fix android_system_stubs build

* commit '12d413d8377d2b4e993531f02d4f5ac5620df38e':
Fix android_system_stubs build

commit | commitdiff | tree

Christoph Studer [Fri, 18 Jul 2014 13:13:51 +0000 (13:13 +0000)]

am aa9d6e0b: am aa3bb5bf: am c6a6ae78: Merge "Cancel notification group children when summary is canceled" into lmp-dev

* commit 'aa9d6e0b57ae422cd3e006709023c4582e0b2b12':
Cancel notification group children when summary is canceled

commit | commitdiff | tree

Bryan Mawhinney [Fri, 18 Jul 2014 13:13:46 +0000 (13:13 +0000)]

am 334595b7: am bd7f8215: am d82b7ec9: Merge "Default MediaStyled notifications to CATEGORY_TRANSPORT" into lmp-dev

* commit '334595b702e533f142f03b1c091e6d144e7f273c':
Default MediaStyled notifications to CATEGORY_TRANSPORT

commit | commitdiff | tree

Dongwon Kang [Fri, 18 Jul 2014 13:13:42 +0000 (13:13 +0000)]

am b4a88032: am 46c65057: am 0e02f53c: TIF: introduce TvContract.buildChannelUriForPassthroughTvInput()

* commit 'b4a88032576e4af0deefc5415710f019031daaba':
TIF: introduce TvContract.buildChannelUriForPassthroughTvInput()

commit | commitdiff | tree

Wonsik Kim [Fri, 18 Jul 2014 13:13:37 +0000 (13:13 +0000)]

am e1b81079: am 480dd588: am 5fec7afe: Merge "TIF: change onCreateSession() method signature" into lmp-dev

* commit 'e1b810793924956eb5517cd4e2c57a721e8f750e':
TIF: change onCreateSession() method signature

commit | commitdiff | tree

Youngsang Cho [Fri, 18 Jul 2014 13:13:33 +0000 (13:13 +0000)]

am 860ba40c: am f6a118b2: am ad67fc6f: Fix a build breakage

* commit '860ba40c471521489fc5d6f753f93045ed088618':
Fix a build breakage

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Ji-Hwan Lee [Fri, 18 Jul 2014 12:39:57 +0000 (21:39 +0900)]

Fix android_system_stubs build

Change-Id: I52c42b5d781b5c07481cdce598d2ebc340d57850

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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()

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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()

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Youngsang Cho [Fri, 18 Jul 2014 04:24:06 +0000 (21:24 -0700)]

Fix a build breakage

Updated current.txt.

Change-Id: Ib1434da2345aa349e5fc3112bf38dbba9955c885

commit | commitdiff | tree

Youngsang Cho [Fri, 18 Jul 2014 03:45:52 +0000 (03:45 +0000)]

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

commit | commitdiff | tree

Youngsang Cho [Fri, 18 Jul 2014 03:45:48 +0000 (03:45 +0000)]

am 38683808: am eede71e5: am aa5dbe63: Merge "TIF: Hide TvContract.Channels.COLUMN_BROWSABLE" into lmp-dev

* commit '38683808a6b14a1a26ebddcba60f2261ff997054':
TIF: Hide TvContract.Channels.COLUMN_BROWSABLE

commit | commitdiff | tree

Youngsang Cho [Fri, 18 Jul 2014 03:45:43 +0000 (03:45 +0000)]

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

commit | commitdiff | tree

Jae Seo [Fri, 18 Jul 2014 03:41:34 +0000 (03:41 +0000)]

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

commit | commitdiff | tree

John Spurlock [Fri, 18 Jul 2014 03:41:29 +0000 (03:41 +0000)]

am 1a95b304: am be3417a0: am 5690da98: Merge "Volume: Rocker animation + style updates." into lmp-dev

* commit '1a95b304677c1312260d7f129f5a5dc4c734be41':
Volume: Rocker animation + style updates.

commit | commitdiff | tree

Jae Seo [Fri, 18 Jul 2014 03:41:25 +0000 (03:41 +0000)]

am 0d9329d2: am e2ef18ce: am 27d12ca6: TIF: Add buildInputId()

* commit '0d9329d24cf6c6f01576cf276bdd995f2f53eed4':
TIF: Add buildInputId()

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jae Seo [Fri, 18 Jul 2014 03:37:10 +0000 (03:37 +0000)]

am cdc49c6c: am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev

* commit 'cdc49c6c4a9e106b220b29a7da68141489a0d175':
TIF: Add TvParentalControlManager

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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()

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jae Seo [Fri, 18 Jul 2014 03:30:23 +0000 (03:30 +0000)]

am 27d12ca6: TIF: Add buildInputId()

* commit '27d12ca6b4966d6dd520fb72fb0058619a87d448':
TIF: Add buildInputId()

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Brown [Fri, 18 Jul 2014 03:24:03 +0000 (03:24 +0000)]

am 843b68d9: am 9560a079: am ce75065c: Merge "Add glance sensor for doze mode." into lmp-dev

* commit '843b68d94d3a8d4ad1960c905ad41d5cec4d3ccb':
Add glance sensor for doze mode.

commit | commitdiff | tree

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

commit | commitdiff | tree

Tyler Gunn [Fri, 18 Jul 2014 03:19:12 +0000 (03:19 +0000)]

am 612354c2: am 6edbc6ed: am 1a0365fd: Merge "Wiring video state through from Connection" into lmp-dev

* commit '612354c2967226daa41334faea060da61d7eb033':
Wiring video state through from Connection

commit | commitdiff | tree

Sandeep Siddhartha [Fri, 18 Jul 2014 03:19:08 +0000 (03:19 +0000)]

am 0710c230: am 207c076a: am ad6bb11f: Merge "Test hotword flow" into lmp-dev

* commit '0710c230cd47d6c4fba43f7de5dcf260411ea210':
Test hotword flow

commit | commitdiff | tree

Wonsik Kim [Fri, 18 Jul 2014 03:19:03 +0000 (03:19 +0000)]

am 6bd44d47: am 719c0ebd: am 2a7c2e38: Merge "TIF: one-to-many relationship for TvInputService to TvInputInfo" into lmp-dev

* commit '6bd44d4707ec5fe737880f93164036e9a0e56d4d':
TIF: one-to-many relationship for TvInputService to TvInputInfo

commit | commitdiff | tree

RoboErik [Fri, 18 Jul 2014 03:18:59 +0000 (03:18 +0000)]

am 6b745791: am 5f604ccf: am 2ca51276: Fix crash when calling MediaSession callback

* commit '6b7457917ab147c91d74a2c263374b5ae02139ef':
Fix crash when calling MediaSession callback

commit | commitdiff | tree

Marcin Kosiba [Fri, 18 Jul 2014 03:18:54 +0000 (03:18 +0000)]

am 6ee098ec: am 8ea71bf3: am 231d57e2: Add a WebView.zoomBy API.

* commit '6ee098ec1ebc15e8816eebd519fbe90c40c7c90d':
Add a WebView.zoomBy API.

commit | commitdiff | tree

Zhijun He [Fri, 18 Jul 2014 03:18:50 +0000 (03:18 +0000)]

am 484bc130: am fb29d478: am 93ecc474: Merge "Camera2: partialResultCount should be optional" into lmp-dev

* commit '484bc13071781d9401b42043e3ffe277ae512ad3':
Camera2: partialResultCount should be optional

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jinsuk Kim [Fri, 18 Jul 2014 02:57:49 +0000 (02:57 +0000)]

am 2fa30b74: am eff7b1af: am ba5ba7a2: Merge "Remove system audio output option for HdmiControlService" into lmp-dev

* commit '2fa30b74b14b07fa83c811da748cf66d48018c4c':
Remove system audio output option for HdmiControlService

commit | commitdiff | tree

Craig Stout [Fri, 18 Jul 2014 02:57:45 +0000 (02:57 +0000)]

am 7a400e30: am 79de62b3: am 51ff3b68: Fix timepicker double done buttons.

* commit '7a400e3086c33c3c90b188d3ec5e8690be78ce82':
Fix timepicker double done buttons.

commit | commitdiff | tree

Filip Gruszczynski [Fri, 18 Jul 2014 02:57:40 +0000 (02:57 +0000)]

am 41ba84e5: am c82b01a5: am 23c51de9: resolved conflicts for merge of bbc49941 to lmp-dev

* commit '41ba84e5b6b763e1fe3fbc4fffa15ebf5aee074e':
Only use bottom outset for main display.

commit | commitdiff | tree

John Spurlock [Fri, 18 Jul 2014 02:57:36 +0000 (02:57 +0000)]

am d412c14d: am b1bcf059: am d92f55cb: Merge "Shade: Hide status icons, take 2." into lmp-dev

* commit 'd412c14d12639d753fcfd7e93cf0a2769165e171':
Shade: Hide status icons, take 2.

commit | commitdiff | tree

Christopher Tate [Fri, 18 Jul 2014 02:57:32 +0000 (02:57 +0000)]

am 2d3830be: am 85f64ae6: am 912793dc: Properly end full restore attempt if getNextFullRestoreDataChunk() fails

* commit '2d3830be30a45c39c232f2b2e615a721b315babd':
Properly end full restore attempt if getNextFullRestoreDataChunk() fails

commit | commitdiff | tree

Chris Craik [Fri, 18 Jul 2014 02:57:28 +0000 (02:57 +0000)]

am ce7a60ee: am 19581d6b: am a987914f: Merge "[HWUI]: fix residual line on FrameBuffer" into lmp-dev

* commit 'ce7a60ee3d9a8884c181605836687f9fe9fb567f':
[HWUI]: fix residual line on FrameBuffer

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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