Andrew Solovay
5ba6a76884
am b005be69: am ec472abf: am 44199d26: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
...
* commit 'b005be690be4a5851591d35ca2ea07de14176624':
2015-04-27 18:29:54 +00:00
Andrew Solovay
b7b997e626
am 0d59144c: am bd719d7b: am 19bc81db: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
...
* commit '0d59144c882856f78d2709d849eee166498ea7a2':
2015-04-27 18:29:47 +00:00
Quddus Chong
b6dd835453
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':
2015-04-27 18:29:40 +00: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
Julia Reynolds
89f1937154
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.
2015-04-27 18:07:35 +00:00
Benjamin Franz
94e3b0c509
am 0c2d0deb: Merge "Introduce disable2 into StatusBarManager" into mnc-dev
...
* commit '0c2d0deb3666c7bb9c315212f5caec1bc1945611':
Introduce disable2 into StatusBarManager
2015-04-27 18:07:29 +00:00
Geoff Mendal
b268f60642
am d727677d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'd727677dc5f0f4d81e709f9c3a2fd67596e9069d':
Import translations. DO NOT MERGE
2015-04-27 18:07:25 +00:00
Geoff Mendal
bbca11e573
am 69812636: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '69812636853f6195e7f228ac17dc1f984a3ae569':
Import translations. DO NOT MERGE
2015-04-27 18:07:19 +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
cdf517a6b5
am ba474807: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ba474807b3e46c1e6127d461214deafc22f53766':
Import translations. DO NOT MERGE
2015-04-27 14:38:53 +00:00
Geoff Mendal
6981263685
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-04-27 14:35:59 +00:00
Geoff Mendal
d5e80e5576
Import translations. DO NOT MERGE
...
Change-Id: I7d4844ba446d75b4596a0213579fb94395df3d92
Auto-generated-cl: translation import
2015-04-27 07:33:21 -07:00
Geoff Mendal
ba474807b3
Import translations. DO NOT MERGE
...
Change-Id: I614f77f977e342c3b374da72501c1b8de0a7abf3
Auto-generated-cl: translation import
2015-04-27 07:18:39 -07:00
Keisuke Kuroyanagi
bde0032125
am 28b5b144: Fix: Selection handles are wrongly shown.
...
* commit '28b5b1444965fcdb471a8c2ff09f6f2eb53b337b':
Fix: Selection handles are wrongly shown.
2015-04-27 10:31:28 +00:00
Keisuke Kuroyanagi
28b5b14449
Fix: Selection handles are wrongly shown.
...
Selection handles were always shown when selection action
mode is started at first time. When the action mode is
started without a selection, only insertion handle must be
shown.
Bug: 20264980
Bug: 20407551
Change-Id: I630804e007f795d28f87e3fa6cba0de5bf588c78
2015-04-27 09:48:26 +00:00
Quddus Chong
6d3d965de2
am 78f895a7: am 41df3b4b: am ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
...
* commit '78f895a7108a25d65df74392cb3a12af32b06bae':
2015-04-27 09:48:20 +00:00
Luan Nguyen
06bdd4d7a9
am 3af9c46c: am 0233b9aa: am 4f50a2b1: am 33ac358a: docs: Add Wear Capability training
...
* commit '3af9c46c57f55e42369626e1265c67ca1ed9d912':
2015-04-27 09:48:16 +00:00
Luan Nguyen
42bca740c7
am 27e6c228: am bcfee811: am bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
...
* commit '27e6c228c2ee68983d31daf0f9ba78e7fb554610':
2015-04-27 09:48:11 +00:00
Quddus Chong
d78ebfe5ea
am fbc860a7: am c141efed: am 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
...
* commit 'fbc860a7195d4364047492f4258cfa6ff1fdfd16':
2015-04-27 09:48:05 +00:00
Ryosuke Matsuuchi
18c6f10d79
am 59b0ea26: am ed6c8ff1: am 3cd98ab6: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
...
* commit '59b0ea26b6e0792a1c85f614024e983ad4a448d9':
2015-04-27 09:48:00 +00:00
Dirk Dougherty
728e2d739f
am 34dccc42: am 7f2bdf88: am d668578f: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
...
* commit '34dccc421906e8df20bde1f33394e53e22dea20a':
2015-04-27 09:47:56 +00:00
Rich Slogar
16e631e5fb
am db1d9829: am 74c57402: am 03389e7e: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
...
* commit 'db1d98298eb9682582126f3d02bf79e03ae778f2':
2015-04-27 09:47:48 +00:00
Rich Slogar
c15c81138e
am 9b963b16: am 4b79a147: am 5fb293b2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
...
* commit '9b963b16f65e0d4dc9d798247bec4fb6d29a50f0':
2015-04-27 09:47:40 +00:00
Keisuke Kuroyanagi
6cda1e28e3
Fix: End handle disappears when the selection is short.
...
HandleView#isVisible didn't use getHorizontalOffset; thus,
the position is always computed as if Gravity.LEFT is set.
As a result, isVisible can be wrongly false for the end
handle and the handle is dismissed.
Bug: 20480054
Change-Id: Ib3242000bb98ae28e0cb37bf5b05069754abbfc6
2015-04-27 09:45:06 +00:00