OSDN Git Service
Svet Ganov [Tue, 28 Apr 2015 16:20:43 +0000 (16:20 +0000)]
am
340b198c: Merge "Handle null projection properly if provider app op is not enabled." into mnc-dev
* commit '
340b198ccbd1a05e67d586c345139617d4b84ce0':
Handle null projection properly if provider app op is not enabled.
Svet Ganov [Tue, 28 Apr 2015 16:03:53 +0000 (16:03 +0000)]
Merge "Handle null projection properly if provider app op is not enabled." into mnc-dev
dcashman [Tue, 28 Apr 2015 14:54:59 +0000 (14:54 +0000)]
am
2301174e: Merge "Add KeySetManagerService unit tests." into mnc-dev
* commit '
2301174eb3598a3290b5c56aae36b19b2c6743ac':
Add KeySetManagerService unit tests.
dcashman [Tue, 28 Apr 2015 14:54:55 +0000 (14:54 +0000)]
am
e12f23dc: Merge "Remove static modifier from KeySetManagerService issuedIds." into mnc-dev
* commit '
e12f23dc7e36f34c2ebd440e5deffd8866b66ade':
Remove static modifier from KeySetManagerService issuedIds.
dcashman [Tue, 28 Apr 2015 14:44:05 +0000 (14:44 +0000)]
Merge "Add KeySetManagerService unit tests." into mnc-dev
dcashman [Tue, 28 Apr 2015 14:43:29 +0000 (14:43 +0000)]
Merge "Remove static modifier from KeySetManagerService issuedIds." into mnc-dev
Geoff Mendal [Tue, 28 Apr 2015 10:09:21 +0000 (10:09 +0000)]
am
5d3249d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
5d3249d6fd0b699087fbafa27a699256a3bd1e65':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 28 Apr 2015 10:09:17 +0000 (10:09 +0000)]
am
5e43ae9c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
5e43ae9c9c33d4be8ce1dbd760ce0170d0666d71':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 28 Apr 2015 09:56:40 +0000 (09:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Tue, 28 Apr 2015 09:56:23 +0000 (09:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Dongwon Kang [Tue, 28 Apr 2015 09:41:18 +0000 (09:41 +0000)]
am
99f6c2a0: Merge "TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc." into mnc-dev
* commit '
99f6c2a0728ddd41e9d147884816a451c250b0ad':
TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc.
Dongwon Kang [Tue, 28 Apr 2015 09:25:49 +0000 (09:25 +0000)]
Merge "TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc." into mnc-dev
Geoff Mendal [Tue, 28 Apr 2015 08:56:40 +0000 (01:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6f6d4bf043ac98defa9d3b70d0a01d48f4aa6ace
Auto-generated-cl: translation import
Geoff Mendal [Tue, 28 Apr 2015 08:43:47 +0000 (01:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I25003c7f81d46bc95432d22aeb7657fef7c76579
Auto-generated-cl: translation import
Dongwon Kang [Tue, 28 Apr 2015 08:24:51 +0000 (17:24 +0900)]
TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc.
Bug:
20509313
Change-Id: I762bb74ae2a1688e1bc6cdbf6bf5a8b931ae0689
Martijn Coenen [Tue, 28 Apr 2015 08:03:58 +0000 (08:03 +0000)]
am
e48cca2a: Merge "Fix vmalloc memory accounting (DO NOT MERGE)." into mnc-dev
* commit '
e48cca2a20668951254e980ac9284cd3492280ba':
Fix vmalloc memory accounting (DO NOT MERGE).
Martijn Coenen [Tue, 28 Apr 2015 07:50:12 +0000 (07:50 +0000)]
Merge "Fix vmalloc memory accounting (DO NOT MERGE)." into mnc-dev
Keisuke Kuroyanagi [Tue, 28 Apr 2015 05:10:55 +0000 (05:10 +0000)]
am
d2b9bd80: Merge "Fix: End handle disappears when the selection is short." into mnc-dev
* commit '
d2b9bd80a20e5339bd2555d83d11a5cd88a20034':
Fix: End handle disappears when the selection is short.
Keisuke Kuroyanagi [Tue, 28 Apr 2015 04:58:42 +0000 (04:58 +0000)]
Merge "Fix: End handle disappears when the selection is short." into mnc-dev
Geoff Mendal [Tue, 28 Apr 2015 04:58:07 +0000 (04:58 +0000)]
am
7bdd6aa1: (-s ours) Import translations. DO NOT MERGE
* commit '
7bdd6aa1a4fd0f02184dc39fb43a2096fbfb6e1f':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 28 Apr 2015 04:38:29 +0000 (21:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I56af308506de3258cefb3c96d49ca5ccaed1a57d
Auto-generated-cl: translation import
Joe Fernandez [Tue, 28 Apr 2015 00:45:48 +0000 (00:45 +0000)]
am
f488985d: am
ff31bb4b: am
68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
* commit '
f488985dce6424446a458f08f2c141b64ac07e39':
docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
Joe Fernandez [Tue, 28 Apr 2015 00:45:44 +0000 (00:45 +0000)]
am
d602d23f: am
80d19484: am
185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
* commit '
d602d23fd81d7b70d76c596d9b0ae7a4cfd98e02':
docs: Update Wearable API setup to mention addApiIfAvailable().
Robert Shih [Tue, 28 Apr 2015 00:45:38 +0000 (00:45 +0000)]
am
43429656: Merge "MediaController: workaround to disable seek" into mnc-dev
* commit '
43429656ff8762416571661c591691aeb9cebdbd':
MediaController: workaround to disable seek
Joe Fernandez [Tue, 28 Apr 2015 00:36:29 +0000 (00:36 +0000)]
am
ff31bb4b: am
68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
* commit '
ff31bb4bb7d46766552526f6580a76445a549339':
docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
Joe Fernandez [Tue, 28 Apr 2015 00:36:23 +0000 (00:36 +0000)]
am
80d19484: am
185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
* commit '
80d19484c109c4beb0e36b7ce0418ebe526ad300':
docs: Update Wearable API setup to mention addApiIfAvailable().
Robert Shih [Tue, 28 Apr 2015 00:30:11 +0000 (00:30 +0000)]
Merge "MediaController: workaround to disable seek" into mnc-dev
Joe Fernandez [Tue, 28 Apr 2015 00:24:26 +0000 (00:24 +0000)]
am
68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
* commit '
68ef92871f52bad28d5aea168c0d3a4b863d282d':
docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
Joe Fernandez [Tue, 28 Apr 2015 00:24:19 +0000 (00:24 +0000)]
am
185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
* commit '
185002bcc9b551828557ab6946fef7fef1c17d74':
docs: Update Wearable API setup to mention addApiIfAvailable().
Svet Ganov [Tue, 28 Apr 2015 00:00:44 +0000 (17:00 -0700)]
Handle null projection properly if provider app op is not enabled.
Change-Id: I00b757ef73bf4dd58217ba748520c3504350d4ba
Joe Fernandez [Tue, 28 Apr 2015 00:03:49 +0000 (00:03 +0000)]
Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
Joe Fernandez [Tue, 28 Apr 2015 00:00:08 +0000 (00:00 +0000)]
Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
Alan Viverette [Mon, 27 Apr 2015 23:35:35 +0000 (23:35 +0000)]
am
1ce80dc0: Merge "Add some missing Settings and DayNight themes" into mnc-dev
* commit '
1ce80dc0e21268475ae9f5d8ec8e0c114687de54':
Add some missing Settings and DayNight themes
Deepanshu Gupta [Mon, 27 Apr 2015 23:35:29 +0000 (23:35 +0000)]
am
8381e2cd: Merge "Fix view outline for shadows in LayoutLib." into mnc-dev
* commit '
8381e2cdcc24a5099b1e8811b0d7b8c125145899':
Fix view outline for shadows in LayoutLib.
Alan Viverette [Mon, 27 Apr 2015 23:27:11 +0000 (23:27 +0000)]
Merge "Add some missing Settings and DayNight themes" into mnc-dev
Deepanshu Gupta [Mon, 27 Apr 2015 23:20:34 +0000 (23:20 +0000)]
Merge "Fix view outline for shadows in LayoutLib." into mnc-dev
Alan Viverette [Mon, 27 Apr 2015 23:07:11 +0000 (16:07 -0700)]
Add some missing Settings and DayNight themes
Bug:
20546201
Change-Id: I1eeaf3c76c17b773bb7d9b19ad7fa84479b70f41
Raph Levien [Mon, 27 Apr 2015 23:07:09 +0000 (23:07 +0000)]
am
a589368a: Merge "Expose drawTextRun publicly" into mnc-dev
* commit '
a589368a78f946976f1ac45feb47fb9611b0e64b':
Expose drawTextRun publicly
Yorke Lee [Mon, 27 Apr 2015 23:07:05 +0000 (23:07 +0000)]
am
d0922ed7: Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev
* commit '
d0922ed723c3199de5a45e01fc9f4d56178cc577':
Rename setDefaultDialerApplication for consistency
Raph Levien [Mon, 27 Apr 2015 22:50:33 +0000 (22:50 +0000)]
Merge "Expose drawTextRun publicly" into mnc-dev
Yorke Lee [Mon, 27 Apr 2015 22:49:33 +0000 (22:49 +0000)]
Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev
Raph Levien [Thu, 23 Apr 2015 23:12:23 +0000 (16:12 -0700)]
Expose drawTextRun publicly
For correct low-level drawing of low level text, a method that
includes context for shaping is necessary, and it's similarly useful
to provide the direction explicitly rather than running the BiDi
algorithm on the text. The drawTextRun method (in both char[] and
CharSequence variants) has provided this functionality for several
major releases but has been internal. This patch exposes the
methods publicly, and also improves the doc strings for both
the new method and some related ones.
Bug:
20193553
Change-Id: I9be33ca5ae3e7db2b69a56298400671d5ef8ad05
Yorke Lee [Mon, 27 Apr 2015 22:17:50 +0000 (15:17 -0700)]
Rename setDefaultDialerApplication for consistency
Change-Id: I8227df913bdb0ed5e1b3472f9d4ebea1158b366b
dcashman [Fri, 27 Feb 2015 17:48:33 +0000 (09:48 -0800)]
Add KeySetManagerService unit tests.
Bug:
19530120
Change-Id: Ie5601f7cafd4b853c6436941cfed48622549d928
Robert Shih [Mon, 27 Apr 2015 19:50:39 +0000 (12:50 -0700)]
MediaController: workaround to disable seek
An example use case is live HLS streams.
Bug:
19489473
Change-Id: I9c278f2875a5faaf1af092cc84888d4280a00747
Cedric Ho [Mon, 27 Apr 2015 21:10:55 +0000 (21:10 +0000)]
am
25d12e3f: Merge "resolved conflicts for merge of
0af3af03 to mnc-dev" into mnc-dev
* commit '
25d12e3f6a5ef15add0c0ccb560bb842283b98e2':
Enable VoiceInteractionService on watch.
Cedric Ho [Mon, 27 Apr 2015 20:58:12 +0000 (20:58 +0000)]
Merge "resolved conflicts for merge of
0af3af03 to mnc-dev" into mnc-dev
Yorke Lee [Mon, 27 Apr 2015 20:47:16 +0000 (20:47 +0000)]
am
c0f705a8: Merge "Add utility method isDefaultOrSystemDialer" into mnc-dev
* commit '
c0f705a81023f6491a6965c6c0d205f4bd3b3ee8':
Add utility method isDefaultOrSystemDialer
Luan Nguyen [Wed, 22 Apr 2015 21:48:46 +0000 (14:48 -0700)]
docs: Update Wearable API setup to mention addApiIfAvailable().
bug:
20486912
Change-Id: Ie5fe89b5bd0bbed5c95cead301c6eb6278bfdaee
Cedric Ho [Mon, 27 Apr 2015 20:16:18 +0000 (13:16 -0700)]
resolved conflicts for merge of
0af3af03 to mnc-dev
Change-Id: I38f423be6dcef216cf813aa0f747be38f0ad792f
Chris Craik [Mon, 27 Apr 2015 20:02:15 +0000 (20:02 +0000)]
am
3d80f4a6: Merge "Anti-alias by default" into mnc-dev
* commit '
3d80f4a63db5d5998607372198a7bba53f3b804e':
Anti-alias by default
Chris Craik [Mon, 27 Apr 2015 20:02:09 +0000 (20:02 +0000)]
am
ba061aec: Merge "Promote RenderProperties with an alpha to have a RenderLayer" into mnc-dev
* commit '
ba061aec249208184d50461d3a8c3a600aa73720':
Promote RenderProperties with an alpha to have a RenderLayer
Yorke Lee [Mon, 27 Apr 2015 19:56:58 +0000 (19:56 +0000)]
Merge "Add utility method isDefaultOrSystemDialer" into mnc-dev
Yorke Lee [Mon, 27 Apr 2015 18:18:38 +0000 (11:18 -0700)]
Add utility method isDefaultOrSystemDialer
Will be used by various system components to determine if a
given package name is a privileged Dialer
Bug:
20333102
Bug:
20304411
Change-Id: I1e5bcbde8ee9a5dc6936b118b1b78f32d97737a6
Martijn Coenen [Thu, 23 Apr 2015 19:55:58 +0000 (21:55 +0200)]
Fix vmalloc memory accounting (DO NOT MERGE).
VmallocUsed from meminfo sums all vmalloc'd
memory areas, but it shouldn't count the areas
that were mapped with ioremap(); ioremap()'d
ranges usually map to I/O memory, not actual
physical memory.
Binder and CMA are exceptions, but in the
common case we're more accurate not counting
those regions either.
Bug:
20483106
Change-Id: I75e74d9477a30a3de84877531b6e614a71469d24
(cherry picked from commit
f33b6292168ea6e90c9d52d477c922af23001f63)
Dan Stoza [Mon, 27 Apr 2015 19:39:22 +0000 (19:39 +0000)]
am
e54fbaa2: Merge "ImageWriter: Change detach to sp<GraphicBuffer>" into mnc-dev
* commit '
e54fbaa2cea50d47ac93023bb472482018a2c243':
ImageWriter: Change detach to sp<GraphicBuffer>
Chris Craik [Mon, 27 Apr 2015 19:28:01 +0000 (19:28 +0000)]
Merge "Anti-alias by default" into mnc-dev
Chris Craik [Mon, 27 Apr 2015 19:28:44 +0000 (19:28 +0000)]
Merge "Promote RenderProperties with an alpha to have a RenderLayer" into mnc-dev
Adam Powell [Mon, 27 Apr 2015 18:53:54 +0000 (18:53 +0000)]
am
580c30a6: Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev
* commit '
580c30a63353f67433da25ef7b90913300e0372f':
Wire up caller chooser targets for ChooserActivity
Dan Stoza [Mon, 27 Apr 2015 18:52:03 +0000 (18:52 +0000)]
Merge "ImageWriter: Change detach to sp<GraphicBuffer>" into mnc-dev
Dan Stoza [Mon, 27 Apr 2015 18:31:12 +0000 (11:31 -0700)]
ImageWriter: Change detach to sp<GraphicBuffer>
Changes the call to IGBP::detachNextBuffer to return an
sp<GraphicBuffer> instead of an ANativeWindowBuffer*.
Bug:
20092217
Change-Id: I59d6acef7120de5040c6710aeecfa1633ec7f736
Svet Ganov [Mon, 27 Apr 2015 18:30:14 +0000 (18:30 +0000)]
am
1f0943dd: Merge "DO NOT MERGE Do not clean up global/system settings on package unintalls." into mnc-dev
* commit '
1f0943dd2ce8ae2e9610cd59858fbfd7511d5df3':
DO NOT MERGE Do not clean up global/system settings on package unintalls.
Arunesh Mishra [Mon, 27 Apr 2015 18:30:07 +0000 (18:30 +0000)]
am
c83d46a2: Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev
* commit '
c83d46a277c563e0f60bb1b8c3478165de2c121a':
Add near-ultrasound properties to AudioManager.java
Scott Rowe [Mon, 27 Apr 2015 18:30:01 +0000 (18:30 +0000)]
am
cc637ab0: am
7f2e8cdc: am
63604283: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
cc637ab0345759040daba736d3b1bf0687d88296':
Andrew Solovay [Mon, 27 Apr 2015 18:29:54 +0000 (18:29 +0000)]
am
b005be69: am
ec472abf: am
44199d26: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
b005be690be4a5851591d35ca2ea07de14176624':
Andrew Solovay [Mon, 27 Apr 2015 18:29:47 +0000 (18:29 +0000)]
am
0d59144c: am
bd719d7b: am
19bc81db: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
0d59144c882856f78d2709d849eee166498ea7a2':
Quddus Chong [Mon, 27 Apr 2015 18:29:40 +0000 (18:29 +0000)]
am
a7db8bcb: am
5edfdac4: am
a76a3dd3: (-s ours) am
f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
a7db8bcbb357e408c6a5983e16243384e22fee6a':
Luan Nguyen [Thu, 23 Apr 2015 17:32:31 +0000 (10:32 -0700)]
docs: Add note about overriding onConnectedNodes() when listening
for capability node changes.
bug:
20523695
Change-Id: I7a1b057625f6f39d9ee3a03948f0b187484b1842
Chris Craik [Tue, 21 Apr 2015 22:13:29 +0000 (15:13 -0700)]
Promote RenderProperties with an alpha to have a RenderLayer
bug:
20254728
Change-Id: I0bd1d440fe46683b291d4c8ab07a630c34b2eadc
Chris Craik [Fri, 24 Apr 2015 17:46:46 +0000 (10:46 -0700)]
Anti-alias by default
Change-Id: I19434717dd3af4fdcffbfcca2ffbb485dfebe644
Julia Reynolds [Mon, 27 Apr 2015 18:07:35 +0000 (18:07 +0000)]
am
6ab47fc1: Merge "Allow device initializers to set a preferred setup activity." into mnc-dev
* commit '
6ab47fc111a8c5eb814b9bbea7ebd0ae429fa709':
Allow device initializers to set a preferred setup activity.
Benjamin Franz [Mon, 27 Apr 2015 18:07:29 +0000 (18:07 +0000)]
am
0c2d0deb: Merge "Introduce disable2 into StatusBarManager" into mnc-dev
* commit '
0c2d0deb3666c7bb9c315212f5caec1bc1945611':
Introduce disable2 into StatusBarManager
Geoff Mendal [Mon, 27 Apr 2015 18:07:25 +0000 (18:07 +0000)]
am
d727677d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
d727677dc5f0f4d81e709f9c3a2fd67596e9069d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 18:07:19 +0000 (18:07 +0000)]
am
69812636: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
69812636853f6195e7f228ac17dc1f984a3ae569':
Import translations. DO NOT MERGE
Adam Powell [Mon, 27 Apr 2015 18:03:07 +0000 (18:03 +0000)]
Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev
Svet Ganov [Mon, 27 Apr 2015 17:50:00 +0000 (17:50 +0000)]
Merge "DO NOT MERGE Do not clean up global/system settings on package unintalls." into mnc-dev
Arunesh Mishra [Mon, 27 Apr 2015 17:49:48 +0000 (17:49 +0000)]
Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev
Svet Ganov [Mon, 27 Apr 2015 16:33:40 +0000 (09:33 -0700)]
DO NOT MERGE Do not clean up global/system settings on package unintalls.
Legacy apps can write their own entries in the system settings and
when they get uninstalled these are hanging around forever polluting
the settings table. We keep track of which settings an app added and
when the app is uninstalled we drop its custom entries. The trouble
was that we did the same thing for global and secure settings with
no explicit list of platform defined settings. Hence, if say a test
signed by the platform certificate touches platform defined global
or secure settings and is then uninstalled, we would drop the platform
defined entries portentially crippling the system.
bug:
20113160
Change-Id: Ia21694f6326ad4a1795c4666027b366e26c05a23
(cherry picked from commit
b128540dc741c424d4f652419686882b7a3bfa06)
Scott Rowe [Mon, 27 Apr 2015 17:48:38 +0000 (17:48 +0000)]
am
7f2e8cdc: am
63604283: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
7f2e8cdc521d3f47ce5e22e8589569dd486c1aa8':
Andrew Solovay [Mon, 27 Apr 2015 17:48:32 +0000 (17:48 +0000)]
am
ec472abf: am
44199d26: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
ec472abfa22ecbd42f295fb17bd9414386c6a065':
Andrew Solovay [Mon, 27 Apr 2015 17:48:27 +0000 (17:48 +0000)]
am
bd719d7b: am
19bc81db: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
bd719d7ba94b87ec89cbdbfde74f007bb1047d2b':
Quddus Chong [Mon, 27 Apr 2015 17:48:21 +0000 (17:48 +0000)]
am
5edfdac4: am
a76a3dd3: (-s ours) am
f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
5edfdac4b8264e3c94673eaede8f17a3568b8496':
dcashman [Mon, 27 Apr 2015 17:42:22 +0000 (10:42 -0700)]
Remove static modifier from KeySetManagerService issuedIds.
There is no notion of shared issuedIds across instances of KeySetManagerService,
of which there should only ever be one on the system. This is particularly
troublesome for unit tests which rely on a clean slate for each
KeySetManagerService invocation.
Bug:
19530120
Change-Id: I41fbd5424650a74426c5aa1128ddfa6a230dcfa3
Arunesh Mishra [Mon, 27 Apr 2015 16:39:00 +0000 (09:39 -0700)]
Add near-ultrasound properties to AudioManager.java
Change-Id: I582275aa5f2a2ca55d4028e81ff3e79cf7c793cc
Julia Reynolds [Mon, 27 Apr 2015 17:29:21 +0000 (17:29 +0000)]
Merge "Allow device initializers to set a preferred setup activity." into mnc-dev
Deepanshu Gupta [Mon, 20 Apr 2015 21:18:50 +0000 (14:18 -0700)]
Fix view outline for shadows in LayoutLib.
Set the bounds on the drawable before getting the view outline for
shadow. Also, reuse the temp outline object in AttachInfo rather than
allocating a new one each time.
Change-Id: I69793d38d60c5b9f9050569f2b22fbc7b90620bf
Adam Powell [Fri, 24 Apr 2015 00:19:37 +0000 (17:19 -0700)]
Wire up caller chooser targets for ChooserActivity
Add the caller-supplied ChooserTargets from EXTRA_CHOOSER_TARGETS in
the default ChooserActivity. These appear before other options.
Change-Id: Ic4d23ae9ecdfd0cc8a5ac077696d7334a8f844a6
Benjamin Franz [Mon, 27 Apr 2015 17:03:16 +0000 (17:03 +0000)]
Merge "Introduce disable2 into StatusBarManager" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 17:02:14 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 17:00:00 +0000 (10:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I25475f80c0d13df9f72b8504b0468eee5203d521
Auto-generated-cl: translation import
Julia Reynolds [Mon, 20 Apr 2015 20:42:54 +0000 (16:42 -0400)]
Allow device initializers to set a preferred setup activity.
This activity will launch by default on device reboot or user switch
during user initialization, even if there are higher priority 'home'
activities.
Bug:
20223050
Change-Id: I335aeb010a1ae5db07a4343d26e160c74bd299e1
Benjamin Franz [Thu, 23 Apr 2015 16:19:48 +0000 (17:19 +0100)]
Introduce disable2 into StatusBarManager
We ran out of space for new disable flags, so need to introduce a
disable2 API into StatusBarManager and update all the underlying code
to support the second set of flags.
Bug:
20331928
Change-Id: I5009b393133c576b37d7e2bae0df97cb8c41a065
Cedric Ho [Mon, 27 Apr 2015 16:41:33 +0000 (16:41 +0000)]
am
991c8c53: Merge "Enable VoiceInteractionService on watch." into lmp-mr1-modular-dev
* commit '
991c8c53aff32f3d605f6715b3fa78a86990f7ff':
Enable VoiceInteractionService on watch.
Scott Rowe [Mon, 27 Apr 2015 16:33:01 +0000 (16:33 +0000)]
am
63604283: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
6360428359bd1a4db1c9a569d8f9e1af8baf29fb':
Andrew Solovay [Mon, 27 Apr 2015 16:32:56 +0000 (16:32 +0000)]
am
44199d26: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
44199d26d2305b45086695acb1c851aae7328706':
Andrew Solovay [Mon, 27 Apr 2015 16:32:50 +0000 (16:32 +0000)]
am
19bc81db: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
19bc81dbbaeef90f1417d78a18a96120b8d81762':
Quddus Chong [Mon, 27 Apr 2015 16:32:44 +0000 (16:32 +0000)]
am
a76a3dd3: (-s ours) am
f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
a76a3dd3a90451e78672ccd52b004e6948bf21b7':
Cedric Ho [Mon, 27 Apr 2015 15:47:26 +0000 (15:47 +0000)]
Merge "Enable VoiceInteractionService on watch." into lmp-mr1-modular-dev
Geoff Mendal [Mon, 27 Apr 2015 14:38:53 +0000 (14:38 +0000)]
am
ba474807: (-s ours) Import translations. DO NOT MERGE
* commit '
ba474807b3e46c1e6127d461214deafc22f53766':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 14:35:58 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev