189925 Commits

Author SHA1 Message Date
Joe Fernandez
185002bcc9 Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs 2015-04-28 00:00:09 +00:00
Alan Viverette
1ce80dc0e2 Merge "Add some missing Settings and DayNight themes" into mnc-dev 2015-04-27 23:27:12 +00:00
Deepanshu Gupta
8381e2cdcc Merge "Fix view outline for shadows in LayoutLib." into mnc-dev 2015-04-27 23:20:35 +00:00
Alan Viverette
520034755f Add some missing Settings and DayNight themes
Bug: 20546201
Change-Id: I1eeaf3c76c17b773bb7d9b19ad7fa84479b70f41
2015-04-27 23:20:00 +00:00
Raph Levien
a589368a78 Merge "Expose drawTextRun publicly" into mnc-dev 2015-04-27 22:50:34 +00:00
Yorke Lee
d0922ed723 Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev 2015-04-27 22:49:34 +00:00
Raph Levien
c6abf5bff6 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
2015-04-27 15:33:03 -07:00
Yorke Lee
a162f02f76 Rename setDefaultDialerApplication for consistency
Change-Id: I8227df913bdb0ed5e1b3472f9d4ebea1158b366b
2015-04-27 15:17:50 -07:00
Joe Fernandez
cd32a99dde docs: Modify Branding guidelines for Android form factors
b/19835619

Change-Id: Ic942aa3c262de5922e084b1e007652b151ca2a76
2015-04-27 15:16:41 -07:00
dcashman
67633a17fa Add KeySetManagerService unit tests.
Bug: 19530120
Change-Id: Ie5601f7cafd4b853c6436941cfed48622549d928
2015-04-27 14:44:30 -07:00
Robert Shih
39dbbd93e4 MediaController: workaround to disable seek
An example use case is live HLS streams.

Bug:19489473
Change-Id: I9c278f2875a5faaf1af092cc84888d4280a00747
2015-04-27 14:42:22 -07:00
Cedric Ho
25d12e3f6a Merge "resolved conflicts for merge of 0af3af03 to mnc-dev" into mnc-dev 2015-04-27 20:58:13 +00:00
Luan Nguyen
47b7e060d9 docs: Update Wearable API setup to mention addApiIfAvailable().
bug: 20486912
Change-Id: Ie5fe89b5bd0bbed5c95cead301c6eb6278bfdaee
2015-04-27 13:30:40 -07:00
Cedric Ho
4e41767977 resolved conflicts for merge of 0af3af03 to mnc-dev
Change-Id: I38f423be6dcef216cf813aa0f747be38f0ad792f
2015-04-27 13:16:18 -07:00
Yorke Lee
c0f705a810 Merge "Add utility method isDefaultOrSystemDialer" into mnc-dev 2015-04-27 19:58:24 +00:00
Yorke Lee
610438230b 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
2015-04-27 12:55:23 -07:00
Martijn Coenen
398e24ee14 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)
2015-04-27 19:47:48 +00:00
Chris Craik
3d80f4a63d Merge "Anti-alias by default" into mnc-dev 2015-04-27 19:28:45 +00:00
Chris Craik
ba061aec24 Merge "Promote RenderProperties with an alpha to have a RenderLayer" into mnc-dev 2015-04-27 19:28:45 +00:00
Dan Stoza
e54fbaa2ce Merge "ImageWriter: Change detach to sp<GraphicBuffer>" into mnc-dev 2015-04-27 18:52:07 +00:00
Dan Stoza
3316452ffa 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
2015-04-27 11:31:12 -07:00
Luan Nguyen
bdeeb5e3bc docs: Add note about overriding onConnectedNodes() when listening
for capability node changes.

bug: 20523695
Change-Id: I7a1b057625f6f39d9ee3a03948f0b187484b1842
2015-04-27 11:27:04 -07:00
Chris Craik
856f0cc3e3 Promote RenderProperties with an alpha to have a RenderLayer
bug:20254728
Change-Id: I0bd1d440fe46683b291d4c8ab07a630c34b2eadc
2015-04-27 18:12:07 +00:00
Chris Craik
1b60cc0529 Anti-alias by default
Change-Id: I19434717dd3af4fdcffbfcca2ffbb485dfebe644
2015-04-27 18:11:57 +00:00
Adam Powell
580c30a633 Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev 2015-04-27 18:03:10 +00:00
Svet Ganov
1f0943dd2c Merge "DO NOT MERGE Do not clean up global/system settings on package unintalls." into mnc-dev 2015-04-27 17:50:01 +00:00
Arunesh Mishra
c83d46a277 Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev 2015-04-27 17:49:49 +00:00
Svet Ganov
8de348095f 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)
2015-04-27 17:49:35 +00:00
Scott Rowe
cc637ab034 am 7f2e8cdc: am 63604283: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '7f2e8cdc521d3f47ce5e22e8589569dd486c1aa8':
2015-04-27 17:48:38 +00:00
Andrew Solovay
b005be690b am ec472abf: am 44199d26: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit 'ec472abfa22ecbd42f295fb17bd9414386c6a065':
2015-04-27 17:48:32 +00:00
Andrew Solovay
0d59144c88 am bd719d7b: am 19bc81db: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit 'bd719d7ba94b87ec89cbdbfde74f007bb1047d2b':
2015-04-27 17:48:27 +00:00
Quddus Chong
a7db8bcbb3 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':
2015-04-27 17:48:21 +00:00
dcashman
79d37cbcdd 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
2015-04-27 10:47:35 -07:00
Arunesh Mishra
bc92227d6c Add near-ultrasound properties to AudioManager.java
Change-Id: I582275aa5f2a2ca55d4028e81ff3e79cf7c793cc
2015-04-27 10:37:17 -07:00
Julia Reynolds
6ab47fc111 Merge "Allow device initializers to set a preferred setup activity." into mnc-dev 2015-04-27 17:29:23 +00:00
Deepanshu Gupta
dbc7ca0bac 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
2015-04-27 17:19:35 +00:00
Alan Viverette
87cfcaac1b Fix handling of android:onClick for ContextWrapper
DeclaredOnClickListener traverses up the context hierarchy until it
either finds the named method or runs out of contexts.

Bug: 19125347
Change-Id: I565348e2a9f5686d5c8041fbc301d44ec04d5703
2015-04-27 17:14:07 +00:00
Adam Powell
0ccc0e9348 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
2015-04-27 17:11:29 +00:00
Benjamin Franz
0c2d0deb36 Merge "Introduce disable2 into StatusBarManager" into mnc-dev 2015-04-27 17:03:18 +00:00
Geoff Mendal
d727677dc5 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-04-27 17:02:14 +00:00
Geoff Mendal
2e62f82046 Import translations. DO NOT MERGE
Change-Id: I25475f80c0d13df9f72b8504b0468eee5203d521
Auto-generated-cl: translation import
2015-04-27 10:00:00 -07:00
Julia Reynolds
13c58bacc8 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
2015-04-27 12:57:15 -04:00
Benjamin Franz
cde0a2a9ea 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
2015-04-27 16:46:12 +00:00
Cedric Ho
0af3af0397 am 991c8c53: Merge "Enable VoiceInteractionService on watch." into lmp-mr1-modular-dev
* commit '991c8c53aff32f3d605f6715b3fa78a86990f7ff':
  Enable VoiceInteractionService on watch.
2015-04-27 16:41:33 +00:00
Scott Rowe
7f2e8cdc52 am 63604283: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '6360428359bd1a4db1c9a569d8f9e1af8baf29fb':
2015-04-27 16:33:01 +00:00
Andrew Solovay
ec472abfa2 am 44199d26: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '44199d26d2305b45086695acb1c851aae7328706':
2015-04-27 16:32:56 +00:00
Andrew Solovay
bd719d7ba9 am 19bc81db: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '19bc81dbbaeef90f1417d78a18a96120b8d81762':
2015-04-27 16:32:50 +00:00
Quddus Chong
5edfdac4b8 am a76a3dd3: (-s ours) am f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit 'a76a3dd3a90451e78672ccd52b004e6948bf21b7':
2015-04-27 16:32:44 +00:00
Cedric Ho
991c8c53af Merge "Enable VoiceInteractionService on watch." into lmp-mr1-modular-dev 2015-04-27 15:47:28 +00:00
Geoff Mendal
6981263685 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-04-27 14:35:59 +00:00