OSDN Git Service
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
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)
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)
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
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
Youngsang Cho [Fri, 18 Jul 2014 18:42:33 +0000 (18:42 +0000)]
Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev
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.
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.
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
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.
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)
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.
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
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
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.
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.
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
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.
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: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.
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: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
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
Jaewan Kim [Tue, 15 Jul 2014 04:01:57 +0000 (13:01 +0900)]
TIF: Add onInputAdded and onInputRemoved
Bug:
16166859
Change-Id: I51bd87aded3e8619e36be200009e924e73cd348e
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: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: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: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.
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
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
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
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.
Christopher Tate [Fri, 18 Jul 2014 19:10:41 +0000 (19:10 +0000)]
Merge "Tear down agents properly at EOD in full restore" into lmp-dev
Christopher Tate [Fri, 18 Jul 2014 02:09:00 +0000 (19:09 -0700)]
Tear down agents properly at EOD in full restore
The restore engine wasn't tearing down the bound agent after reaching
the end of data for the app, and furthermore was allowing the restore
operation to resume running the queue before all data had been delivered
to the current target.
Also make LocalTransport deliver data in 2K chunks rather than 32K,
as a first step towards making its timing characteristics more like
we'll see in networked situations.
Finally, added a bunch of MORE_DEBUG output for finding odd bugs
like this.
Change-Id: Icdbe6a070af6cc7c708a938ad044108d40ebce9a
Youngsang Cho [Fri, 18 Jul 2014 18:42:59 +0000 (18:42 +0000)]
Merge "TIF: Add unblock content" into lmp-dev
Jaewan Kim [Wed, 16 Jul 2014 02:28:56 +0000 (11:28 +0900)]
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
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
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
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
Ihab Awad [Fri, 18 Jul 2014 17:09:11 +0000 (17:09 +0000)]
Merge "Wire up multi-SIM experience (1/4)" into lmp-dev
Ihab Awad [Thu, 17 Jul 2014 18:21:19 +0000 (11:21 -0700)]
Wire up multi-SIM experience (1/4)
Change-Id: Ib63843267f06b329a675e7ea86167b2cbb554f1b
Jean-Michel Trivi [Fri, 18 Jul 2014 15:28:34 +0000 (15:28 +0000)]
Merge "Unhide audio virtualizer capability query methods" into lmp-dev
Jean-Michel Trivi [Wed, 16 Jul 2014 19:25:27 +0000 (12:25 -0700)]
Unhide audio virtualizer capability query methods
Unhide the new method to query the Virtualizer effect implementation
about its capabilities in terms of input, device support, and
virtual speaker angles.
Change-Id: I4478f7837efe8c9d52978244a3402c7f8590e585
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
Jinsuk Kim [Fri, 18 Jul 2014 00:24:09 +0000 (00:24 +0000)]
Merge "Remove system audio output option for HdmiControlService" into lmp-dev
destradaa [Thu, 17 Jul 2014 21:04:28 +0000 (21:04 +0000)]
am
607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev
* commit '
607d3271089e4874028aca9cfbede38c557961bb':
Fix exceptions in ActivityRecognition platform stack.
Craig Stout [Thu, 17 Jul 2014 20:56:19 +0000 (20:56 +0000)]
am
68e9eb34: Fix legacyMode for leanback timepicker
* commit '
68e9eb34d5b35a092ca329d78a5c39f643e390af':
Fix legacyMode for leanback timepicker
Craig Stout [Thu, 17 Jul 2014 18:25:52 +0000 (11:25 -0700)]
Fix legacyMode for leanback timepicker
Change-Id: Idcd9627f330918d8b2de144af28e749c47602769
Andres Morales [Thu, 17 Jul 2014 20:48:33 +0000 (20:48 +0000)]
am
e9f27df7: Permit settings to "wipe" the persistent partition
* commit '
e9f27df72263e769ac5325a7523d6f5379c6015a':
Permit settings to "wipe" the persistent partition
Andres Morales [Thu, 10 Jul 2014 22:40:24 +0000 (15:40 -0700)]
Permit settings to "wipe" the persistent partition
One of the requirements is that when the user does a
factory reset through settings, all data on the
persistent partition should be cleared.
This adds one last API method that allows settings
to wipe the partition.
Bug:
14288780
Change-Id: Ib87ee741d1e5195814516ae1d66eb7c4cf754dcf
Zhijun He [Thu, 17 Jul 2014 20:40:32 +0000 (20:40 +0000)]
am
4c6f6ffe: Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev
* commit '
4c6f6ffe214444a4e924d189581e99ba2319b01f':
Camera2: replace partial quirks with normal partial result
Andrew Lee [Thu, 17 Jul 2014 20:24:17 +0000 (20:24 +0000)]
am
9eb532f5: Merge "Pass through video state when answering a call." into lmp-dev
* commit '
9eb532f594f1ff3c290a92ab9b7bca55176dede3':
Pass through video state when answering a call.
Evan Charlton [Thu, 17 Jul 2014 20:20:09 +0000 (20:20 +0000)]
am
58299755: Merge "Plumb through StatusHints change notifications" into lmp-dev
* commit '
58299755075aa3c32c413b54824f3a46321da49f':
Plumb through StatusHints change notifications
John Spurlock [Thu, 17 Jul 2014 20:02:14 +0000 (20:02 +0000)]
am
d75d1ef0: Merge "QS: Fix crash switching users." into lmp-dev
* commit '
d75d1ef07c175c8a48a126f4e36172e03c30987c':
QS: Fix crash switching users.
Filip Gruszczynski [Thu, 17 Jul 2014 19:55:27 +0000 (19:55 +0000)]
am
a76164e1: Merge "Only use bottom outset for main display." into klp-modular-dev
* commit '
a76164e1d0d283baf412c18999e680d93bd50f01':
Only use bottom outset for main display.
Christoph Studer [Fri, 18 Jul 2014 11:10:27 +0000 (11:10 +0000)]
Merge "Cancel notification group children when summary is canceled" into lmp-dev
Craig Mautner [Thu, 17 Jul 2014 19:53:26 +0000 (19:53 +0000)]
am
20b338d9: Merge "Restore calling identity before checking permission" into lmp-dev
* commit '
20b338d949e6995853f37960241af010db7c8e40':
Restore calling identity before checking permission
RoboErik [Thu, 17 Jul 2014 19:53:23 +0000 (19:53 +0000)]
am
4e8b237d: Merge "return false for media keys if no controller" into lmp-dev
* commit '
4e8b237d6a97b7c97fded14005723e56c9bb8c19':
return false for media keys if no controller
Narayan Kamath [Fri, 18 Jul 2014 16:17:24 +0000 (16:17 +0000)]
Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev
Narayan Kamath [Wed, 16 Jul 2014 13:39:03 +0000 (14:39 +0100)]
Fix broken locale related assumptions in TextServicesManager.
startsWith is a bogus check unless languages match. Also, don't
assume 2 letter languages.
bug:
10090157
Change-Id: I8adda61bddc465aac261c0ce2023fa9606affe1b
Niels Egberts [Fri, 18 Jul 2014 15:50:26 +0000 (15:50 +0000)]
Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev