Kenny Guy
2f0c30daa9
am ecc9f9b6: Merge "Add flag to allow fetching related users recent tasks."
...
* commit 'ecc9f9b6f308316ff2a8f6e2b6f642724533ba80':
Add flag to allow fetching related users recent tasks.
2014-03-18 05:29:35 -07:00
Kenny Guy
ecc9f9b6f3
Merge "Add flag to allow fetching related users recent tasks."
2014-03-18 11:43:46 +00:00
Mark Renouf
654818a9e3
am 95478f67: Merge "Make InternalListener static to avoid referencing SpeechRecognizer."
...
* commit '95478f67a459490d2dd6c1fa525c29ef90b34b93':
Make InternalListener static to avoid referencing SpeechRecognizer.
2014-03-17 19:01:20 -07:00
Mark Renouf
95478f67a4
Merge "Make InternalListener static to avoid referencing SpeechRecognizer."
2014-03-18 01:58:26 +00:00
Wonsik Kim
dd659c530d
am edb67190: Merge "Revert "VideoPlaneView initial implementation""
...
* commit 'edb67190d65659ff1da563f1d081d9429bd31a31':
Revert "VideoPlaneView initial implementation"
2014-03-17 18:03:48 -07:00
Wonsik Kim
edb67190d6
Merge "Revert "VideoPlaneView initial implementation""
2014-03-18 01:00:59 +00:00
Alan Viverette
da7062030d
am 97d9b654: Lower tap timeout to 100ms, because 180ms is a lot of ms
...
* commit '97d9b65470957ce4c9983921bd59c4cf902885ce':
Lower tap timeout to 100ms, because 180ms is a lot of ms
2014-03-17 16:29:58 -07:00
Alan Viverette
97d9b65470
Lower tap timeout to 100ms, because 180ms is a lot of ms
...
Change-Id: I708848480544825474785e0918feba70c1089090
2014-03-17 16:16:33 -07:00
Mark Renouf
b37866db46
Make InternalListener static to avoid referencing SpeechRecognizer.
...
Change-Id: I03bc1a5f5188551608395f3468aa69e622601820
2014-03-17 18:15:51 -04:00
Igor Murashkin
7d795dc445
am 033a68ca: Merge "camera2: Don\'t log vendor tag errors when camera HAL too old"
...
* commit '033a68ca109729aeff348b4e1a5daecc4f6b209b':
camera2: Don't log vendor tag errors when camera HAL too old
2014-03-17 14:56:19 -07:00
Igor Murashkin
033a68ca10
Merge "camera2: Don't log vendor tag errors when camera HAL too old"
2014-03-17 21:53:48 +00:00
Chris Craik
a7a15b79bf
am db62c232: Merge "Remove castsShadow and globalCamera APIs"
...
* commit 'db62c232b953fd882a8f55daf736ae4098e8f278':
Remove castsShadow and globalCamera APIs
2014-03-17 14:06:24 -07:00
Chris Craik
db62c232b9
Merge "Remove castsShadow and globalCamera APIs"
2014-03-17 21:03:15 +00:00
Igor Murashkin
5614cbe644
camera2: Don't log vendor tag errors when camera HAL too old
...
Change-Id: Id7fe9464d7599a566cea976cddc62ad101cf4a10
2014-03-17 14:00:55 -07:00
Chris Craik
34f67f26e3
Remove castsShadow and globalCamera APIs
...
Change-Id: I5c1c375f45946609b1635d952c5adf55e23bdd60
2014-03-17 13:24:08 -07:00
Kenny Guy
82326a98a4
Add flag to allow fetching related users recent tasks.
...
Fetch related users recent tasks along with requested users
tasks when flag is set
Set flag in requests coming from systemui/recents.
Change-Id: I985e2d9d6b9728603685fc6126e8193af119e172
2014-03-17 19:45:17 +00:00
Dianne Hackborn
67f8d28f81
am 4c1d506d: Merge "Start enforcing explicit intents for Context.bindService()"
...
* commit '4c1d506d7bf803f4fb5f8146fe7f81c3488c3225':
Start enforcing explicit intents for Context.bindService()
2014-03-17 12:33:17 -07:00
Dianne Hackborn
4c1d506d7b
Merge "Start enforcing explicit intents for Context.bindService()"
2014-03-17 19:30:43 +00:00
Chris Craik
d988470635
am e0583b2c: Merge "Revert "Remove castsShadow and globalCamera APIs""
...
* commit 'e0583b2c93a8c0781700d8630487e9c7cfbd213f':
Revert "Remove castsShadow and globalCamera APIs"
2014-03-17 12:29:52 -07:00
Chris Craik
618236fe88
Revert "Remove castsShadow and globalCamera APIs"
...
This reverts commit 0334c314a5 .
Change-Id: I64714d17fb877e1b43c65eb44820d1128281c7a2
2014-03-17 19:27:49 +00:00
Chris Craik
0de8d23214
am 1a1ec625: Merge "Remove castsShadow and globalCamera APIs"
...
* commit '1a1ec625570e79f0f172472776f16a81a03eaa42':
Remove castsShadow and globalCamera APIs
2014-03-17 12:10:04 -07:00
Dianne Hackborn
10ad98223f
Start enforcing explicit intents for Context.bindService()
...
No longer prints a warning, now throws an exception.
Also fix a bug in UserManagerService that was causing an
exception while booting.
Change-Id: I3b43cfe08067da840b6850b9bed58664d36d34f1
2014-03-17 11:28:36 -07:00
John Reck
6d99568f8b
am 0a6b0031: Merge "Rename DisplayList->RenderNode"
...
* commit '0a6b0031f07f678e0ac1a24a6f2aa8bdf40c717f':
Rename DisplayList->RenderNode
2014-03-17 11:14:41 -07:00
Chris Craik
0334c314a5
Remove castsShadow and globalCamera APIs
...
Change-Id: I4d81a7849eba60a1a9debce74eedd55d6331842d
2014-03-17 18:13:31 +00:00
John Reck
0a6b0031f0
Merge "Rename DisplayList->RenderNode"
2014-03-17 18:12:02 +00:00
Jessica Hummel
96cd3e690c
am f1c90440: Merge "Standardize the provisioning intent action."
...
* commit 'f1c9044057bdffbedbe3c2cae1a7b378d593ef2b':
Standardize the provisioning intent action.
2014-03-17 11:04:44 -07:00
Jessica Hummel
f1c9044057
Merge "Standardize the provisioning intent action."
2014-03-17 18:01:28 +00:00
Jeff Sharkey
db4e58ce15
am 432f755d: am ac0f9ffd: am da07fe64: am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"
...
* commit '432f755d44d3afc20cef2b78559ad31775d3a06d':
Null pointer exception in FileRotator.java
2014-03-17 11:01:11 -07:00
Jeff Sharkey
432f755d44
am ac0f9ffd: am da07fe64: am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"
...
* commit 'ac0f9ffda2a7e48d2d641654dafd11b8da39830a':
Null pointer exception in FileRotator.java
2014-03-17 17:57:13 +00:00
John Reck
f666ad7046
Rename DisplayList->RenderNode
...
Change-Id: Idcca6f26ba6282594789962f5edb3ed53a290fef
2014-03-17 10:30:32 -07:00
Jessica Hummel
03dd22079c
Standardize the provisioning intent action.
...
Change-Id: Iea7f8827cf4b52e2e97e8675687412108dd917e4
2014-03-17 16:53:27 +00:00
Jeff Sharkey
da07fe64b0
am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"
...
* commit 'eeb36c5cfc107fe9128490e9e127c2bca2d24e28':
Null pointer exception in FileRotator.java
2014-03-17 16:39:13 +00:00
Wonsik Kim
475e3f0e88
Revert "VideoPlaneView initial implementation"
...
This reverts commit 5f8aa41429 .
Change-Id: I161748f365512c5e24acba2c3d9ebd9405fa8e3f
2014-03-17 11:17:47 +00:00
Jaewan Kim
5afda1a9c1
am f207ec76: Merge "EthernetDataTracker: Update hardware address when interface is changed"
...
* commit 'f207ec76a51c96a72b7d972636dfa8f9e658fc92':
EthernetDataTracker: Update hardware address when interface is changed
2014-03-16 03:25:51 -07:00
Jaewan Kim
f207ec76a5
Merge "EthernetDataTracker: Update hardware address when interface is changed"
2014-03-16 10:23:35 +00:00
John Reck
094c09a4f9
am e2d3f28e: Merge "Revert "Rename DisplayList->RenderNode""
...
* commit 'e2d3f28e85e59f50bbab548d3c449de0b91be3ba':
Revert "Rename DisplayList->RenderNode"
2014-03-14 19:17:22 -07:00
John Reck
e2d3f28e85
Merge "Revert "Rename DisplayList->RenderNode""
2014-03-15 02:15:34 +00:00
John Reck
31f9458908
Revert "Rename DisplayList->RenderNode"
...
Missed some test(s), reverting to fix build
This reverts commit ef09d8cf94 .
Change-Id: Ifee6c694e5f4b962d03dee200ccbf8dc9662e666
2014-03-15 02:14:53 +00:00
John Reck
377be263e0
am 759067f3: Merge "Rename DisplayList->RenderNode"
...
* commit '759067f39a635b4c821fc17b56253bcd056ada47':
Rename DisplayList->RenderNode
2014-03-14 17:28:16 -07:00
John Reck
759067f39a
Merge "Rename DisplayList->RenderNode"
2014-03-15 00:25:34 +00:00
Ruben Brunk
94fb752026
am 38900b15: Merge "hal3: Add availableHotPixelModes, update modes."
...
* commit '38900b15544e03aa8252022dc4b939748772ed6b':
hal3: Add availableHotPixelModes, update modes.
2014-03-14 17:16:55 -07:00
Ruben Brunk
38900b1554
Merge "hal3: Add availableHotPixelModes, update modes."
2014-03-15 00:14:56 +00:00
John Reck
ef09d8cf94
Rename DisplayList->RenderNode
...
Change-Id: I1628b6e802252c001ca09ba762f52453b68f4cad
2014-03-14 17:14:16 -07:00
Yohei Yukawa
c05362b84c
am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
...
* commit '77943308f5661636d85cb5e78188dbbc8f0e329e':
DO NOT MERGE - Preserve the order of InputMethodManager method calls
2014-03-14 21:59:35 +00:00
Yohei Yukawa
77943308f5
am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
...
* commit 'fd2f8d43419d1f25ced8b2bac96407925dd4c471':
DO NOT MERGE - Preserve the order of InputMethodManager method calls
2014-03-14 21:54:49 +00:00
Craig Mautner
4309121311
am 421a1dd1: Merge "Launch new tasks with Doc Centric flag."
...
* commit '421a1dd197a78b014cb9a899a75c0fa43510a59a':
Launch new tasks with Doc Centric flag.
2014-03-14 14:45:05 -07:00
Craig Mautner
421a1dd197
Merge "Launch new tasks with Doc Centric flag."
2014-03-14 21:43:28 +00:00
Craig Mautner
d00f47402c
Launch new tasks with Doc Centric flag.
...
Introduction of new Intent flag FLAG_ACTIVITY_NEW_DOCUMENT. When
this flag is set the target activity will be launched in its own
task. This is the start of the new Doc Centric mode of working.
Change-Id: I719168532134ab2c5ea3300df676c2b2a0e81795
2014-03-14 14:42:23 -07:00
Tim Kilbourn
3f11526c77
am 9b18001a: am ec033943: am 9873e099: am 55740325: Merge "Add leanback device features." into klp-modular-dev
...
* commit '9b18001ab53c8c78aee0647983adf3ad8a1ee97c':
Add leanback device features.
2014-03-14 13:54:37 -07:00
Tim Kilbourn
9b18001ab5
am ec033943: am 9873e099: am 55740325: Merge "Add leanback device features." into klp-modular-dev
...
* commit 'ec0339437869ebb42a67a2811dc6de31239d5d62':
Add leanback device features.
2014-03-14 20:50:40 +00:00