OSDN Git Service
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
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.
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
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
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.
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
Eino-Ville Talvala [Thu, 17 Jul 2014 19:37:57 +0000 (19:37 +0000)]
am
97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev
* commit '
97bc653093792eb0efb9581d1885e55ccbd0bad9':
Add PackageManager features for differentiating camera2 devices
Winson Chung [Thu, 17 Jul 2014 19:37:51 +0000 (19:37 +0000)]
am
3bf3d3c0: Merge "Fixing optimization in Task loading. (Bug
16372369)" into lmp-dev
* commit '
3bf3d3c0a283f086f605b1d9497755d854dc852d':
Fixing optimization in Task loading. (Bug
16372369)
Chris Craik [Thu, 17 Jul 2014 19:37:46 +0000 (19:37 +0000)]
am
8ca30207: Merge "Minor cleanups around color usage" into lmp-dev
* commit '
8ca3020778727ad35f305fb84611c1e43c3c8a92':
Minor cleanups around color usage
Chris Craik [Thu, 17 Jul 2014 19:33:15 +0000 (19:33 +0000)]
am
19f0c01c: Merge "Simplify ViewRootImpl\'s AttachInfo usage" into lmp-dev
* commit '
19f0c01cdfae327487497bcc3c2b9e2b2ab628a2':
Simplify ViewRootImpl's AttachInfo usage
Amith Yamasani [Thu, 17 Jul 2014 19:21:49 +0000 (19:21 +0000)]
am
56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev
* commit '
56e7c4ef6277c573be0f9b1409f875286b79b671':
Split telephony restrictions into outgoing calls and sms
John Spurlock [Thu, 17 Jul 2014 23:10:44 +0000 (23:10 +0000)]
Merge "Shade: Hide status icons, take 2." into lmp-dev
John Spurlock [Thu, 17 Jul 2014 22:22:45 +0000 (18:22 -0400)]
Shade: Hide status icons, take 2.
Restore visibility logic (for mirrored view) and remove a bad
optimization from the clipping calculation.
Bug:
16337935
Change-Id: I7eb82ef6c87f30da9d8b70136e05dab3abdbdead
Evan Charlton [Thu, 17 Jul 2014 20:13:57 +0000 (20:13 +0000)]
Merge "Plumb through StatusHints change notifications" into lmp-dev
Evan Charlton [Wed, 16 Jul 2014 00:03:20 +0000 (17:03 -0700)]
Plumb through StatusHints change notifications
When StatusHints are modified, inform listeners. Also expose two
constants for passing optional strings from the CallService to
the in-call UI.
Bug:
13334257
Bug:
13334252
Change-Id: If7fde7c1ca6940cec8b7232469a22900c36dbb17
John Spurlock [Thu, 17 Jul 2014 19:57:32 +0000 (19:57 +0000)]
Merge "QS: Fix crash switching users." into lmp-dev
John Spurlock [Thu, 17 Jul 2014 19:53:32 +0000 (15:53 -0400)]
QS: Fix crash switching users.
Bug:
16375449
Change-Id: I971c5b043edcffe669c29bbc566b80696b6251b2
Adam Powell [Thu, 17 Jul 2014 18:57:22 +0000 (18:57 +0000)]
am
21b1b8b9: Add nested pre-fling for nested scrolling
* commit '
21b1b8b9a17d8e32d193a14ec4507448f2f3e20b':
Add nested pre-fling for nested scrolling
Adam Powell [Thu, 17 Jul 2014 04:41:31 +0000 (21:41 -0700)]
Add nested pre-fling for nested scrolling
Nested pre-fling allows a nested scrolling parent to consume a fling
operation before the child view does. If a parent has been consuming
nested pre-scroll events in a particular direction, this is generally
a good indication that it should also consume the resulting fling at
the end.
Bug
15538504
Change-Id: I88e8753a96c9b41815c3be530cafab8345164e64
Joe Fernandez [Thu, 17 Jul 2014 18:20:00 +0000 (18:20 +0000)]
am
aafe9d65: am
64ae9303: am
e1e81a9e: am
e287cf33: docs: Update ADT-1 page with supported apps
* commit '
aafe9d65f6c2bc350e2a6c5ab3fe7e2b52d53e2a':
docs: Update ADT-1 page with supported apps
John Reck [Thu, 17 Jul 2014 18:19:38 +0000 (18:19 +0000)]
am
bce422bd: Merge "Fix logging" into lmp-dev
* commit '
bce422bd8ed6cab40593e2d4b9ccc4fd316b5d47':
Fix logging
Ruben Brunk [Thu, 17 Jul 2014 18:19:35 +0000 (18:19 +0000)]
am
0a749af3: Merge "camera2: Fix swapped Face detection commands." into lmp-dev
* commit '
0a749af3a914a795f7cebdbdcb4c29372925e66a':
camera2: Fix swapped Face detection commands.
Joe Fernandez [Thu, 17 Jul 2014 18:16:10 +0000 (18:16 +0000)]
am
64ae9303: am
e1e81a9e: am
e287cf33: docs: Update ADT-1 page with supported apps
* commit '
64ae930359619f2a49c8a4bef5dc45261c772d45':
docs: Update ADT-1 page with supported apps
Jeff Sharkey [Thu, 17 Jul 2014 18:15:33 +0000 (18:15 +0000)]
am
375d5b90: Merge "Support cluster-style installs for bundled apps." into lmp-dev
* commit '
375d5b90cf59ae201d5aeddca7fe06761f67e642':
Support cluster-style installs for bundled apps.
Jae Seo [Fri, 18 Jul 2014 03:21:38 +0000 (03:21 +0000)]
Merge "TIF: Add TvParentalControlManager" into lmp-dev
Jae Seo [Mon, 14 Jul 2014 23:07:19 +0000 (16:07 -0700)]
TIF: Add TvParentalControlManager
Each TV input service is now required to query the system whether the
user is allowed to watch the current program before showing it to the
user if the parental control is turned on, which can be checked by
calling TvParentalControlManager.isEnabled(). Whether the TV input
service should block the content or not is determined by invoking
TvParentalControlManager.isRatingBlocked() with the content rating for
the current program. Then the TvParentalControlManager makes a judgment
based on the user blocked ratings stored in the secure settings and
returns the result. If the rating in question turns out to be blocked,
the TV input service must immediately block the content and call this
method with the content rating of the current program to prompt the PIN
verification screen.
Each TV input service also needs to continuously listen to any changes
made to the parental control settings by registering a
TvParentalControlManager.ParentalControlCallback() to the manager and
immediately reevaluate the current program with the new parental control
settings.
Bug:
13172379
Change-Id: I8e1900d4b8d28c56798986d5c3906bd418ab97ac
Tyler Gunn [Fri, 18 Jul 2014 02:30:22 +0000 (02:30 +0000)]
Merge "Wiring video state through from Connection" into lmp-dev
Tyler Gunn [Thu, 17 Jul 2014 14:50:22 +0000 (07:50 -0700)]
Wiring video state through from Connection
Bug:
16285417
Bug:
16013178
Change-Id: Ia48959248ca22f4569b0ffd01a1716470aa0a711
Chris Craik [Thu, 17 Jul 2014 22:38:57 +0000 (22:38 +0000)]
Merge "[HWUI]: fix residual line on FrameBuffer" into lmp-dev
henry.uh_chen [Wed, 2 Jul 2014 11:36:56 +0000 (19:36 +0800)]
[HWUI]: fix residual line on FrameBuffer
Symptom: If app applies animation to enlarge a bitmap, there will be an residual
line on the screen
Root Cause: On platform which has Tile Rendering implementation (ex. Qualcomm
CPU), startTiling() call will restrict the framebuffer region which
GPU can affect. So the expansion of clear region by 1 will not take
effect if startTiling region is not expanded.
Solution: Expand the startTiling region by 1, too.
Reproduce steps: Apply animation to enlarge (and then shrink) a bitmap icon.
Cherry-pick of
20adb6ce4d52b15472e7e5ee953e06cc349a827c from AOSP
Change-Id: I163b898b87b74d221dc4210b7fa657aa93c82c19
Ben Murdoch [Thu, 17 Jul 2014 21:36:20 +0000 (21:36 +0000)]
Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev
Ben Murdoch [Thu, 17 Jul 2014 13:55:00 +0000 (14:55 +0100)]
Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
This allows the WebViewUpdateService to receive notifications that
an update has been installed and we need to trigger recreation of
the relro file.
bug:
16329377
Change-Id: I088e61487416add997995db304beca0cde71390c
destradaa [Thu, 17 Jul 2014 20:58:46 +0000 (20:58 +0000)]
Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev
Zhijun He [Thu, 17 Jul 2014 20:36:21 +0000 (20:36 +0000)]
Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev
Zhijun He [Wed, 16 Jul 2014 18:32:59 +0000 (11:32 -0700)]
Camera2: replace partial quirks with normal partial result
Change-Id: I56550748478bf0aa1a7bf9a350b4fdc7bbd6af86
Filip Gruszczynski [Thu, 17 Jul 2014 19:52:25 +0000 (19:52 +0000)]
Merge "Only use bottom outset for main display." into klp-modular-dev
Filip Gruszczynski [Wed, 16 Jul 2014 23:35:18 +0000 (16:35 -0700)]
Only use bottom outset for main display.
Change-Id: I42154d026811ee4b7ba9711c560c7a62fcdde7ee
Ruben Brunk [Thu, 17 Jul 2014 18:12:08 +0000 (18:12 +0000)]
Merge "camera2: Fix swapped Face detection commands." into lmp-dev
Sandeep Siddhartha [Thu, 17 Jul 2014 18:10:15 +0000 (18:10 +0000)]
am
4b360037: Support model deletion
* commit '
4b3600378bf33874eab953c08e353caabff7aee9':
Support model deletion
Craig Mautner [Thu, 17 Jul 2014 18:10:03 +0000 (18:10 +0000)]
am
c2d339a6: Merge "resolved conflicts for merge of
0a931069 to lmp-dev" into lmp-dev
* commit '
c2d339a630acfa2a19aa82f650a7c56f0da8e184':
Additional cleanup after stack deletion.
Adrian Roos [Thu, 17 Jul 2014 18:09:59 +0000 (18:09 +0000)]
am
26f08cdc: Merge "QS Guest fixes" into lmp-dev
* commit '
26f08cdc82a6534b3acb4eef81c205ab6764bd96':
QS Guest fixes
Christopher Tate [Thu, 17 Jul 2014 18:09:55 +0000 (18:09 +0000)]
am
e78826f6: Add BackupAgent.onRestoreFinished() callback
* commit '
e78826f6bcb3c832fe2e732e60b18ce62202f840':
Add BackupAgent.onRestoreFinished() callback
ztenghui [Thu, 17 Jul 2014 18:09:52 +0000 (18:09 +0000)]
am
e1bc5ddb: Add the RTL support to VectorDrawable.
* commit '
e1bc5ddb5e67e61ee8fe144e5983f98d56c135a0':
Add the RTL support to VectorDrawable.
John Reck [Thu, 17 Jul 2014 18:09:48 +0000 (18:09 +0000)]
am
47751fe1: Revert "Separate Canvas JNI code from the implementation."
* commit '
47751fe100923c459b17eb017be3b7fc6c7efc5e':
Revert "Separate Canvas JNI code from the implementation."
destradaa [Wed, 16 Jul 2014 21:28:06 +0000 (14:28 -0700)]
Fix exceptions in ActivityRecognition platform stack.
b/
16348349
Change-Id: I1f85283c86130b86389a1be7da49904658b0558c
Winson Chung [Thu, 17 Jul 2014 18:09:45 +0000 (18:09 +0000)]
am
1e214f1d: Fixing regression in flinging not updating the stack. (Bug
16371020)
* commit '
1e214f1daa0ee51097a7b7cc4fd4680d9059016a':
Fixing regression in flinging not updating the stack. (Bug
16371020)
Adam Connors [Thu, 17 Jul 2014 18:09:42 +0000 (18:09 +0000)]
am
d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev
* commit '
d50ec637fab02ee54295dc6dbeac00214097b36d':
Create DPM APIs for cross profile callerId
Niels Egberts [Thu, 17 Jul 2014 18:09:38 +0000 (18:09 +0000)]
am
a66d298e: Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev
* commit '
a66d298ea27d7cb7d5927869eda196e2fa56da78':
TtsSpan builders for each TtsSpan type. DO NOT MERGE
Nancy Chen [Thu, 17 Jul 2014 18:09:28 +0000 (18:09 +0000)]
am
4a9b99f5: API changes to enable account selection for a call
* commit '
4a9b99f5d8a4a9a3ce6f4a45d577a8a92cfcf511':
API changes to enable account selection for a call
Craig Mautner [Thu, 17 Jul 2014 18:09:25 +0000 (18:09 +0000)]
am
b1c0b008: Merge "resolved conflicts for merge of
75f31740 to lmp-dev" into lmp-dev
* commit '
b1c0b0082d535a48d3e916f1a0b70219c84e83c2':
Wait for all windows to draw before turning screen on
Martin Kosiba [Thu, 17 Jul 2014 18:09:21 +0000 (18:09 +0000)]
am
92486999: Allow for appending of resources to an AssetManager.
* commit '
92486999f4f34e73df8e31f97b378f8dd66b5aa9':
Allow for appending of resources to an AssetManager.
Alexandra Gherghina [Thu, 17 Jul 2014 18:09:17 +0000 (18:09 +0000)]
am
dbfd0744: Ads per-user APIs to manage accounts through the AccountManager
* commit '
dbfd074444b47f13cfc655142fdc3738bb8136e8':
Ads per-user APIs to manage accounts through the AccountManager
Amith Yamasani [Thu, 17 Jul 2014 18:09:14 +0000 (18:09 +0000)]
am
467bc0ef: Merge "Keep track of user_setup_complete in DPMS" into lmp-dev
* commit '
467bc0efa37b977abda6349eb75208bf103422e3':
Keep track of user_setup_complete in DPMS
Jae Seo [Thu, 17 Jul 2014 18:09:10 +0000 (18:09 +0000)]
am
f977db2e: Merge "TIF: Add TvInputInfo.getParentId" into lmp-dev
* commit '
f977db2e87fdc9ba383c3ba808d2ad686a9c26ac':
TIF: Add TvInputInfo.getParentId
Kenny Guy [Thu, 17 Jul 2014 18:09:04 +0000 (18:09 +0000)]
am
41482465: Merge "Allow app restrictions for uninstalled packages." into lmp-dev
* commit '
41482465da91ec79cf56d18fc25ebd7533a27489':
Allow app restrictions for uninstalled packages.
Chris Craik [Thu, 17 Jul 2014 18:09:01 +0000 (18:09 +0000)]
am
ec9c58c1: Merge "Initializing variables - generally a good practice" into lmp-dev
* commit '
ec9c58c15d19809827f2cb48df9715433bfa9ed5':
Initializing variables - generally a good practice
RoboErik [Thu, 17 Jul 2014 19:50:25 +0000 (19:50 +0000)]
Merge "return false for media keys if no controller" into lmp-dev
RoboErik [Thu, 17 Jul 2014 19:17:27 +0000 (12:17 -0700)]
return false for media keys if no controller
bug:
16311395
Change-Id: I4cde865858f99a9159abc181cc987fbd9866025b
Chris Craik [Thu, 17 Jul 2014 19:31:31 +0000 (19:31 +0000)]
Merge "Minor cleanups around color usage" into lmp-dev
Chris Craik [Thu, 17 Jul 2014 19:25:11 +0000 (12:25 -0700)]
Minor cleanups around color usage
Change-Id: I56733cbe933a58d5977c032f056abb35265ee252
Chris Craik [Thu, 17 Jul 2014 19:26:24 +0000 (19:26 +0000)]
Merge "Simplify ViewRootImpl's AttachInfo usage" into lmp-dev
Chris Craik [Thu, 17 Jul 2014 17:16:51 +0000 (10:16 -0700)]
Simplify ViewRootImpl's AttachInfo usage
Change-Id: I4230e95ed5a52c8c5fae7d7b8d58827925db13ba