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

Zhijun He [Sun, 20 Jul 2014 02:17:31 +0000 (02:17 +0000)]

am b6236012: am 3ea4b9d0: Camera2: send the partial result with onCaptureProgressed

* commit 'b62360123f2d4dbf191319ba671bc3781c1a3bf5':
Camera2: send the partial result with onCaptureProgressed

commit | commitdiff | tree

Sailesh Nepal [Sun, 20 Jul 2014 02:17:27 +0000 (02:17 +0000)]

am d0e9c227: am 92119b9f: Merge "Add Connection.startActivityFromInCall" into lmp-dev

* commit 'd0e9c2273cdaf9919956c5b36298ab1ba62004cf':
Add Connection.startActivityFromInCall

commit | commitdiff | tree

Jean-Michel Trivi [Sun, 20 Jul 2014 02:17:22 +0000 (02:17 +0000)]

am 4298999e: am 115bf42b: Unhide Virtualizer.getVirtualizationMode()

* commit '4298999e7500356b84bf30ef9b86a83358c2347b':
Unhide Virtualizer.getVirtualizationMode()

commit | commitdiff | tree

Sailesh Nepal [Sun, 20 Jul 2014 02:17:18 +0000 (02:17 +0000)]

am f611c799: am 0587043f: Merge "Use main thread for RemoteConnection callbacks" into lmp-dev

* commit 'f611c799340afa4f306b9286183b0f4d3eec3ddd':
Use main thread for RemoteConnection callbacks

commit | commitdiff | tree

Jim Miller [Sun, 20 Jul 2014 02:17:13 +0000 (02:17 +0000)]

am 656d09ed: am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev

* commit '656d09edfddcc748fa56acd455f579cc08057848':
Add DevicePolicyManager flag for fingerprint.

commit | commitdiff | tree

Ye Wen [Sun, 20 Jul 2014 02:17:09 +0000 (02:17 +0000)]

am 1100f339: am 2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev

* commit '1100f339df1e089d69690aae5a39ee39f1cc694f':
Unhide MMS APIs for MSIM (1/2)

commit | commitdiff | tree

Dan Sandler [Sun, 20 Jul 2014 02:17:05 +0000 (02:17 +0000)]

am cd307ff0: am 5239e4d2: Don\'t crash if user profile bitmap is null.

* commit 'cd307ff07f3d915f23bb8a2782bf9b08b39aafaf':
Don't crash if user profile bitmap is null.

commit | commitdiff | tree

Robert Greenwalt [Sun, 20 Jul 2014 02:17:01 +0000 (02:17 +0000)]

am 8a717ee8: am 721252c0: Quit NetworkMonitors at end of life.

* commit '8a717ee8b26cdd6d916818451add978c1776bd6e':
Quit NetworkMonitors at end of life.

commit | commitdiff | tree

Makoto Onuki [Fri, 18 Jul 2014 22:09:19 +0000 (22:09 +0000)]

am 24cc3627: am 38bfa1ba: Merge "Use "current" cp2 from telephony" into lmp-dev

* commit '24cc3627b4d4f62f490f56acddebe596045b3eee':
Use "current" cp2 from telephony

commit | commitdiff | tree

ztenghui [Fri, 18 Jul 2014 22:09:10 +0000 (22:09 +0000)]

am 47325dcd: am f101ebb0: Fix FIT_XY scaleType issue on VectorDrawable

* commit '47325dcd542a676a43488648e49ed794e569c844':
Fix FIT_XY scaleType issue on VectorDrawable

commit | commitdiff | tree

ztenghui [Fri, 18 Jul 2014 22:08:57 +0000 (22:08 +0000)]

am 736171e3: am 22fd0f85: Fix caching in VectorDrawable to pass the CTS test

* commit '736171e33ee60d8a047b58c3ce8dbb25fa98652f':
Fix caching in VectorDrawable to pass the CTS test

commit | commitdiff | tree

Zhijun He [Fri, 18 Jul 2014 22:04:11 +0000 (22:04 +0000)]

am 3ea4b9d0: Camera2: send the partial result with onCaptureProgressed

* commit '3ea4b9d066bffe3e2faeb49b6e8d59068e0ccdba':
Camera2: send the partial result with onCaptureProgressed

commit | commitdiff | tree

Sailesh Nepal [Fri, 18 Jul 2014 22:04:07 +0000 (22:04 +0000)]

am 92119b9f: Merge "Add Connection.startActivityFromInCall" into lmp-dev

* commit '92119b9f8cb357223fca86407799d0d5a274b028':
Add Connection.startActivityFromInCall

commit | commitdiff | tree

Zhijun He [Fri, 18 Jul 2014 21:20:48 +0000 (14:20 -0700)]

Camera2: send the partial result with onCaptureProgressed

When partial results are receieved, call onCaptureProgressed instead of
onCapturePartial.

Change-Id: If97233d7b980f490821bca0a722d527f19034cd9

commit | commitdiff | tree

Jean-Michel Trivi [Fri, 18 Jul 2014 21:42:59 +0000 (21:42 +0000)]

am 115bf42b: Unhide Virtualizer.getVirtualizationMode()

* commit '115bf42b3321350e3869f6094c136cc545c8865f':
Unhide Virtualizer.getVirtualizationMode()

commit | commitdiff | tree

Sailesh Nepal [Fri, 18 Jul 2014 21:38:20 +0000 (21:38 +0000)]

am 0587043f: Merge "Use main thread for RemoteConnection callbacks" into lmp-dev

* commit '0587043fcc353d7a9d374c346fa1445f2e57e6da':
Use main thread for RemoteConnection callbacks

commit | commitdiff | tree

Jean-Michel Trivi [Fri, 18 Jul 2014 18:42:38 +0000 (11:42 -0700)]

Unhide Virtualizer.getVirtualizationMode()

Unhide Virtualizer.getVirtualizationMode() method.
Added note in javadoc about the returned value.
Declared exceptions that can be thrown by the checkStatus(int)
helper function.

Change-Id: I4da82d1db1e39ca9dae489559bf1fb5de112c26a

commit | commitdiff | tree

Jim Miller [Fri, 18 Jul 2014 21:34:07 +0000 (21:34 +0000)]

am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev

* commit '0f6db1e823a96d14ea831ec2bccc435dd321da28':
Add DevicePolicyManager flag for fingerprint.

commit | commitdiff | tree

Ye Wen [Fri, 18 Jul 2014 21:34:03 +0000 (21:34 +0000)]

am 2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev

* commit '2c960085d2780d8c2fc66d6e3b0233ef6d1fbe42':
Unhide MMS APIs for MSIM (1/2)

commit | commitdiff | tree

Dan Sandler [Fri, 18 Jul 2014 21:24:59 +0000 (21:24 +0000)]

am 5239e4d2: Don\'t crash if user profile bitmap is null.

* commit '5239e4d2f5098cfb97b6f94c155e4aa4943f9d87':
Don't crash if user profile bitmap is null.

commit | commitdiff | tree

Robert Greenwalt [Fri, 18 Jul 2014 21:20:34 +0000 (21:20 +0000)]

am 721252c0: Quit NetworkMonitors at end of life.

* commit '721252c084d74f0755b4f093fefa5ff13c6f896d':
Quit NetworkMonitors at end of life.

commit | commitdiff | tree

Dan Sandler [Fri, 18 Jul 2014 17:22:02 +0000 (13:22 -0400)]

Don't crash if user profile bitmap is null.

Bug: 16398850
Change-Id: Ie8ddb0841af255bbde098a213cb0ec1690d14c4c

commit | commitdiff | tree

Robert Greenwalt [Thu, 17 Jul 2014 23:11:38 +0000 (16:11 -0700)]

Quit NetworkMonitors at end of life.

We were creating and orphaning a thread for each network.
Cleanup after ourselves.

bug:16119890
Change-Id: I8c8a9fe471e43f31f712844915992084074e8047

commit | commitdiff | tree

Makoto Onuki [Fri, 18 Jul 2014 21:03:41 +0000 (21:03 +0000)]

am 38bfa1ba: Merge "Use "current" cp2 from telephony" into lmp-dev

* commit '38bfa1ba0bedde690d6e3d8c8dd5ed4b91e1e647':
Use "current" cp2 from telephony

commit | commitdiff | tree

ztenghui [Fri, 18 Jul 2014 20:45:07 +0000 (20:45 +0000)]

am f101ebb0: Fix FIT_XY scaleType issue on VectorDrawable

* commit 'f101ebb0f4c88053a8b1ca2295b7a6afe8540127':
Fix FIT_XY scaleType issue on VectorDrawable

commit | commitdiff | tree

ztenghui [Thu, 17 Jul 2014 22:06:03 +0000 (15:06 -0700)]

Fix FIT_XY scaleType issue on VectorDrawable

bug:16019658

Change-Id: I8b6ac23bf14de5427d3029436acf76bd1161f0ea

commit | commitdiff | tree

ztenghui [Fri, 18 Jul 2014 20:12:13 +0000 (20:12 +0000)]

am 22fd0f85: Fix caching in VectorDrawable to pass the CTS test

* commit '22fd0f851e46cd8292553f96d93a7ebfaf537186':
Fix caching in VectorDrawable to pass the CTS test

commit | commitdiff | tree

ztenghui [Fri, 18 Jul 2014 00:01:30 +0000 (17:01 -0700)]

Fix caching in VectorDrawable to pass the CTS test

bug:16380401

Change-Id: I573f4cc782707c6ef3484597ddc621a7a6353898

commit | commitdiff | tree

Andrew Lee [Fri, 18 Jul 2014 19:46:23 +0000 (19:46 +0000)]

am 5ff4ea7c: am f72fa887: Merge "Add comments for RemoteCallVideoClient and RemoteCallVideoProvider." into lmp-dev

* commit '5ff4ea7cc55dd46decb1f57753c4126e5d7ad24c':
Add comments for RemoteCallVideoClient and RemoteCallVideoProvider.

commit | commitdiff | tree

Andrew Lee [Fri, 18 Jul 2014 19:42:57 +0000 (19:42 +0000)]

am f72fa887: Merge "Add comments for RemoteCallVideoClient and RemoteCallVideoProvider." into lmp-dev

* commit 'f72fa88707287317d42510090e927f212cdcbb23':
Add comments for RemoteCallVideoClient and RemoteCallVideoProvider.

commit | commitdiff | tree

Andre Eisenbach [Fri, 18 Jul 2014 19:38:28 +0000 (19:38 +0000)]

am 92adbade: am 99e79902: LE: Add connection parameter update request API (4/4)

* commit '92adbade49f741888b69691981e9367aef357b45':
LE: Add connection parameter update request API (4/4)

commit | commitdiff | tree

Andre Eisenbach [Fri, 18 Jul 2014 19:35:11 +0000 (19:35 +0000)]

am 99e79902: LE: Add connection parameter update request API (4/4)

* commit '99e79902fbf036d2a69ce99ed4f4f51b62b419f3':
LE: Add connection parameter update request API (4/4)

commit | commitdiff | tree

Christopher Tate [Fri, 18 Jul 2014 19:23:09 +0000 (19:23 +0000)]

am 0f5b9306: am 74ec3d59: Merge "Tear down agents properly at EOD in full restore" into lmp-dev

* commit '0f5b9306328af0c476bb71eed78e63a65e0898ac':
Tear down agents properly at EOD in full restore

commit | commitdiff | tree

Christopher Tate [Fri, 18 Jul 2014 19:16:47 +0000 (19:16 +0000)]

am 74ec3d59: Merge "Tear down agents properly at EOD in full restore" into lmp-dev

* commit '74ec3d599b4a2d7dcf0d723af0366af73b87eda0':
Tear down agents properly at EOD in full restore

commit | commitdiff | tree

Andre Eisenbach [Thu, 17 Jul 2014 06:02:42 +0000 (23:02 -0700)]

LE: Add connection parameter update request API (4/4)

Change-Id: Ifb531a1b7ab05888817b96fcc89f85e17df7ffe2

commit | commitdiff | tree

Winson Chung [Fri, 18 Jul 2014 19:05:59 +0000 (19:05 +0000)]

am 4fb60be9: am 61d52679: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug 16322100)

* commit '4fb60be98d2e43bb4dc745321865c219aef96984':
Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100)

commit | commitdiff | tree

Youngsang Cho [Fri, 18 Jul 2014 19:00:10 +0000 (19:00 +0000)]

am 2ec6fb80: am e94cfccd: Merge "TIF: Add unblock content" into lmp-dev

* commit '2ec6fb8085f78dceda26d1f1634f6e27b630166a':
TIF: Add unblock content

commit | commitdiff | tree

Youngsang Cho [Fri, 18 Jul 2014 19:00:05 +0000 (19:00 +0000)]

am 7c8bbd53: am c28a86ff: Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev

* commit '7c8bbd53c6622248377794a7ea6289b1c952a2f6':
TIF: Add onInputAdded and onInputRemoved

commit | commitdiff | tree

Dan Sandler [Fri, 18 Jul 2014 18:59:38 +0000 (18:59 +0000)]

am f9845011: am 7aabcfa3: Merge "Deprecate and stop generating tickerViews." into lmp-dev

* commit 'f984501170f7449a38c6785675dd9f460f5bffa4':
Deprecate and stop generating tickerViews.

commit | commitdiff | tree

Dan Sandler [Fri, 18 Jul 2014 18:59:31 +0000 (18:59 +0000)]

am e7dc5140: am 9b557a25: Merge "Actually show secret notifications sometimes." into lmp-dev

* commit 'e7dc51401bb6a0341c34ccc4b5b04902f0ba997d':
Actually show secret notifications sometimes.

commit | commitdiff | tree

Brian Attwell [Fri, 18 Jul 2014 18:59:27 +0000 (18:59 +0000)]

am a08e00c7: am fa15c729: Merge "Mark social APIs stream APIs as deprecated" into lmp-dev

* commit 'a08e00c7026c6b093fc927a03c168d2ed3b11986':
Mark social APIs stream APIs as deprecated

commit | commitdiff | tree

Winson Chung [Fri, 18 Jul 2014 18:54:55 +0000 (18:54 +0000)]

am 61d52679: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug 16322100)

* commit '61d5267986f21ae7b657d9ba1cf6bff9344aa6e1':
Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100)

commit | commitdiff | tree

Winson Chung [Fri, 18 Jul 2014 01:39:02 +0000 (18:39 -0700)]

Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100)

commit | commitdiff | tree

Youngsang Cho [Fri, 18 Jul 2014 18:46:15 +0000 (18:46 +0000)]

am e94cfccd: Merge "TIF: Add unblock content" into lmp-dev

* commit 'e94cfccd48ac07ec718b280e7793623da46c61e9':
TIF: Add unblock content

commit | commitdiff | tree

Youngsang Cho [Fri, 18 Jul 2014 18:46:11 +0000 (18:46 +0000)]

am c28a86ff: Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev

* commit 'c28a86ff8054bd5be6adaaff4a51609bcda76211':
TIF: Add onInputAdded and onInputRemoved

commit | commitdiff | tree

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

Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev

commit | commitdiff | tree

Dan Sandler [Fri, 18 Jul 2014 18:03:48 +0000 (18:03 +0000)]

am 7aabcfa3: Merge "Deprecate and stop generating tickerViews." into lmp-dev

* commit '7aabcfa391a7f0e4955aa5b8f8f396b4dab3579f':
Deprecate and stop generating tickerViews.

commit | commitdiff | tree

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

am 9b557a25: Merge "Actually show secret notifications sometimes." into lmp-dev

* commit '9b557a250922f1071774fe4b19966b4304875277':
Actually show secret notifications sometimes.

commit | commitdiff | tree

Brian Attwell [Fri, 18 Jul 2014 17:52:13 +0000 (17:52 +0000)]

am fa15c729: Merge "Mark social APIs stream APIs as deprecated" into lmp-dev

* commit 'fa15c729359a93bc47337b2204cab3a70588b2c5':
Mark social APIs stream APIs as deprecated

commit | commitdiff | tree

Paul Jensen [Fri, 18 Jul 2014 17:40:43 +0000 (17:40 +0000)]

am ce4384aa: am d2cb9213: Merge "Make back button work in CaptivePortalLogin app like a web browser." into lmp-dev

* commit 'ce4384aa1aa4e94967f9a81ac740f2e435d1ba37':
Make back button work in CaptivePortalLogin app like a web browser.

commit | commitdiff | tree

Paul Jensen [Fri, 18 Jul 2014 17:33:47 +0000 (17:33 +0000)]

am d2cb9213: Merge "Make back button work in CaptivePortalLogin app like a web browser." into lmp-dev

* commit 'd2cb92132896bc63c6a0906a385a35b1e5f474a9':
Make back button work in CaptivePortalLogin app like a web browser.

commit | commitdiff | tree

Ihab Awad [Fri, 18 Jul 2014 17:25:43 +0000 (17:25 +0000)]

am 012f470a: am 42c4a935: Merge "Wire up multi-SIM experience (1/4)" into lmp-dev

* commit '012f470a9036b2e6c6a222c6dbd718326efaba70':
Wire up multi-SIM experience (1/4)

commit | commitdiff | tree

Ihab Awad [Fri, 18 Jul 2014 17:19:09 +0000 (17:19 +0000)]

am 42c4a935: Merge "Wire up multi-SIM experience (1/4)" into lmp-dev

* commit '42c4a935466ad2909f1e7f1bc6f38682847d9840':
Wire up multi-SIM experience (1/4)

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: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 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: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: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 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: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: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

Jaewan Kim [Tue, 15 Jul 2014 04:01:57 +0000 (13:01 +0900)]

TIF: Add onInputAdded and onInputRemoved

Bug: 16166859
Change-Id: I51bd87aded3e8619e36be200009e924e73cd348e

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: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: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.