OSDN Git Service
Dirk Dougherty [Thu, 25 Aug 2016 01:00:56 +0000 (18:00 -0700)]
Remove obsolete collections and extras metadata files. Authors should use jd_extras_<lang> instead...
Change-Id: I1d41485aceef95e666223d63aea7e8eefb95c947
Salvador Martinez [Wed, 24 Aug 2016 18:17:38 +0000 (18:17 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev
TreeHugger Robot [Wed, 24 Aug 2016 17:27:07 +0000 (17:27 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
Salvador Martinez [Thu, 4 Aug 2016 20:37:52 +0000 (13:37 -0700)]
Added error handling to settings suggestions list
The suggestions list in the summary page of the
settings app could sometimes cause a crash due to
an uncaught exception. Tis fixed now.
Bug:
30656840
Change-Id: If79f53e6a8c17a81653228d613797e94c473d410
(cherry picked from commit
60d92b3b8390e33e069f343d6a425ab07c498d3d)
Julius D'souza [Tue, 23 Aug 2016 16:52:24 +0000 (16:52 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am:
3275a3a5a5 -s ours
am:
d5bf4039a9 -s ours
Change-Id: I4f1a0acabe5d5385af086791b906ff6f45424e59
Julius D'souza [Tue, 23 Aug 2016 16:45:41 +0000 (16:45 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
am:
3275a3a5a5 -s ours
Change-Id: Iaae7763a4d744ad8a63538750c5ed3efe38161d5
Scott Main [Tue, 23 Aug 2016 15:42:01 +0000 (15:42 +0000)]
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
Yang Ni [Wed, 29 Jun 2016 19:44:06 +0000 (12:44 -0700)]
Updated user document for Single-Source RenderScript
Bug:
29875503
Bug:
29879448
Added a section introducing the new single-source feature.
Local staging:
http://yangni.mtv.corp.google.com/guide/topics/renderscript/compute.html
This updates
https://developer.android.com/guide/topics/renderscript/compute.html
Change-Id: I62dda3ab60b1678a9580fd2873f64f33d9696e13
Alan Viverette [Wed, 27 Jul 2016 14:23:35 +0000 (10:23 -0400)]
Avoid potential re-entry as a result of child mutation
Don't set the callback until we're all done making changes.
Bug:
30902893
Change-Id: Ia1560692a83ecb2c50f5e77fa4d1e8155a78a204
(cherry picked from commit
b46ba3b2b0268688852cdf3d1fb4afe4873d63be)
Julius D'souza [Mon, 8 Aug 2016 02:08:30 +0000 (19:08 -0700)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
Bug:
18572096
Change-Id: Ie0ff1990b8f4a3d435328834871f04a6e2bd5e97
Dirk Dougherty [Mon, 22 Aug 2016 06:41:37 +0000 (23:41 -0700)]
Doc change: intl page updates for final n release.
Change-Id: I11445717cf49438ba5a04b50245209161740d4b0
Dirk Dougherty [Thu, 18 Aug 2016 02:09:14 +0000 (19:09 -0700)]
Doc change: updates for final N landing page and related resources.
Change-Id: Ieeb3dd74a889d6c0118e4ca8575abdaddcde7e73
David Friedman [Fri, 19 Aug 2016 21:17:54 +0000 (21:17 +0000)]
Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev
David Friedman [Fri, 19 Aug 2016 21:16:52 +0000 (21:16 +0000)]
Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev
Jim Miller [Fri, 19 Aug 2016 20:23:50 +0000 (20:23 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am:
02e9affa42 am:
ddf70b9195
am:
364a51221a -s ours
Change-Id: Iccf0d83b5bbf076684343a0979d7eac718be0603
Jim Miller [Fri, 19 Aug 2016 20:23:45 +0000 (20:23 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2 am:
9f04985991
am:
85c390e9fb -s ours
Change-Id: I07ac3fe88dd7acc7ced6b4483d98efe1797bea21
Jim Miller [Fri, 19 Aug 2016 20:16:37 +0000 (20:16 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am:
02e9affa42
am:
ddf70b9195
Change-Id: I8308733be4ac586377b0545057dbf982875e4da5
Jim Miller [Fri, 19 Aug 2016 20:16:34 +0000 (20:16 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2
am:
9f04985991
Change-Id: Iff24a78b5a4b4de9b866105fbce2a181125b771e
Jim Miller [Fri, 19 Aug 2016 20:09:43 +0000 (20:09 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
am:
02e9affa42
Change-Id: I2da2738345bc63e1f40f8f9d6e8215b770cc93b4
Jim Miller [Fri, 19 Aug 2016 20:09:41 +0000 (20:09 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE
am:
b6f4b48df2
Change-Id: Ib70a6f9f82eef19724f6dd83fdefec59a29d0cab
TreeHugger Robot [Fri, 19 Aug 2016 20:03:46 +0000 (20:03 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
David Friedman [Thu, 18 Aug 2016 01:23:23 +0000 (18:23 -0700)]
Docs: Adds a redirect to make it easier to access Performance section on DAC.
d.android.com/performance will now take you to d.android.com/topic/performance
Change-Id: I56bc85f156a9cb05a664fbf361eb5b99e153b419
David Friedman [Fri, 5 Aug 2016 00:55:52 +0000 (17:55 -0700)]
Docs: Adding information to Building-for-Billions landing page.
Bug:
30700934
Change-Id: I6d6ffafd674340e15e32c04a8bf08ba7fec402a8
Sudheer Shanka [Fri, 19 Aug 2016 18:02:26 +0000 (18:02 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5 am:
08eb52f9f9
am:
58def3804c -s ours
Change-Id: I83e7f1e64a965a7550629d2a891445dab11a8d8d
Amith Yamasani [Fri, 19 Aug 2016 18:02:22 +0000 (18:02 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27 am:
39c7879365
am:
5841c492a7 -s ours
Change-Id: Ia483fee611b51ad0187b625c62d32877e73ff551
Sudheer Shanka [Fri, 19 Aug 2016 17:54:21 +0000 (17:54 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5
am:
08eb52f9f9
Change-Id: Ica347f4059b4fbe8f822a963b47df0cbe7c646ba
Amith Yamasani [Fri, 19 Aug 2016 17:54:19 +0000 (17:54 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27
am:
39c7879365
Change-Id: I36e3a9a580c73dc61b5de35740bc4d7206a6e0b7
Sudheer Shanka [Fri, 19 Aug 2016 17:32:47 +0000 (17:32 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb
am:
7e890c8eb5
Change-Id: I53be9e220d21f4322f930f3ee9095d8fa43ef2d6
Amith Yamasani [Fri, 19 Aug 2016 17:32:44 +0000 (17:32 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4
am:
29ae7b1a27
Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07
Sudheer Shanka [Fri, 19 Aug 2016 17:22:29 +0000 (17:22 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
am:
b51e98becb
Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2
Amith Yamasani [Fri, 19 Aug 2016 17:22:25 +0000 (17:22 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
d1eeb5b7b4
Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff
Sudheer Shanka [Fri, 19 Aug 2016 17:06:53 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
Sudheer Shanka [Fri, 19 Aug 2016 17:06:47 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev
Jim Miller [Fri, 19 Aug 2016 03:22:33 +0000 (20:22 -0700)]
Bind fingerprint when we start authentication - DO NOT MERGE
This fixes a bug where it was possible to authenticate the wrong user.
We now bind the userId when we start authentication and confirm it when
authentication completes.
Fixes bug
30744668
Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2
Scott Main [Fri, 19 Aug 2016 01:04:01 +0000 (01:04 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
smain@google.com [Thu, 18 Aug 2016 21:41:47 +0000 (14:41 -0700)]
fix redirect for AIDL doc
bug:
5967288
Change-Id: Ia2a4cbdde56d2e6baca4c5f74ea92bb7bfaf2938
Narayan Kamath [Thu, 18 Aug 2016 10:14:29 +0000 (10:14 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
smain@google.com [Wed, 17 Aug 2016 23:17:11 +0000 (16:17 -0700)]
add workaround for annotations dependency conflict with espresso
Change-Id: Ia5f06e35b034d207f19d061b27ddbecd66012130
Jim Miller [Wed, 17 Aug 2016 23:22:33 +0000 (23:22 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e
am:
cb83f6188b
Change-Id: I82302931ab714e25ec21721dc05480e1f2d447b0
Jim Miller [Wed, 17 Aug 2016 23:15:43 +0000 (23:15 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c
am:
229de7088e
Change-Id: I8e9d946f96933c1338261d8adf80156cb67d3ba1
Jim Miller [Wed, 17 Aug 2016 23:07:46 +0000 (23:07 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13
am:
485fbda04c
Change-Id: I07def32199ecdbbb32aa6ecaca20724cfc81265c
Jim Miller [Wed, 17 Aug 2016 22:59:27 +0000 (22:59 +0000)]
Fix vulnerability in LockSettings service
am:
2d71384a13
Change-Id: I62ca5fb150022fe0971329294b1063957f397248
Dirk Dougherty [Wed, 17 Aug 2016 22:53:23 +0000 (22:53 +0000)]
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev
Hemal Patel [Wed, 17 Aug 2016 19:37:17 +0000 (19:37 +0000)]
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs
am:
c7902aa4bb
Change-Id: I45943e80b869adc9017b0e8de116f10e3b710764
Hemal Patel [Wed, 17 Aug 2016 19:37:14 +0000 (19:37 +0000)]
Docs: Renamed Google Now to Google Voice Actions
am:
86bbfaabdd
Change-Id: If177e10f331ca5ade62005337956b0fa81a90f26
Hemal Patel [Wed, 17 Aug 2016 19:32:15 +0000 (19:32 +0000)]
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs
Andrew Solovay [Wed, 17 Aug 2016 17:48:47 +0000 (17:48 +0000)]
docs: Docs for Support Library 24.2.0 release
am:
085994c40d
Change-Id: I7e69bf585d342f1075856673e52ff15207be4a1c
Eric Schmidt [Wed, 17 Aug 2016 17:14:11 +0000 (17:14 +0000)]
docs: Fixed code snippet in notify-user/navigation.html
am:
32cc6b7fb7
Change-Id: I43cf6d188bac5cc5b3d0894915ff431e13156cd5
Dirk Dougherty [Tue, 14 Jun 2016 23:26:28 +0000 (16:26 -0700)]
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links.
Change-Id: I7d26fabfca74d8e706fd99cbeaa1761907c31dbf
Andrew Solovay [Tue, 2 Aug 2016 21:24:58 +0000 (14:24 -0700)]
docs: Docs for Support Library 24.2.0 release
Includes updates to the features doc, to reflect the v4 support
library's division into several smaller modules. Also modified
the transitions doc to note the support library's support for
transitions in API levels 14-19.
Since we're deprecating support for API levels below 9, I changed
several examples to use higher API levels.
See first comment for doc stage location.
bug:
30505601
Change-Id: Ic06a023f705893c91ff3b86d0af8cfed957eb724
Eric Schmidt [Thu, 11 Aug 2016 19:54:31 +0000 (12:54 -0700)]
docs: Fixed code snippet in notify-user/navigation.html
Bug:
25098348
Change-Id: Ic116900eb9c6e1ebfbc6b99673ffeff3f2df8533
Dirk Dougherty [Tue, 16 Aug 2016 01:17:31 +0000 (01:17 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
Jim Miller [Wed, 10 Aug 2016 22:43:17 +0000 (15:43 -0700)]
Fix vulnerability in LockSettings service
Fixes bug
30003944
Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d
Julius D'souza [Mon, 15 Aug 2016 19:33:29 +0000 (19:33 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am:
13edf0a70b -s ours
am:
0903c5fe7a -s ours
Change-Id: Iba7ccc2ec071ea8c13d146b39aab48d2f4fc4977
Julius D'souza [Mon, 15 Aug 2016 19:25:33 +0000 (19:25 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable.
am:
13edf0a70b -s ours
Change-Id: I7c02cea3ea0008f3f112063b6a06d08049c4998b
Julius D'souza [Fri, 5 Aug 2016 21:34:38 +0000 (14:34 -0700)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable.
Add overlay setting with current default value.
Bug:
30085530
Change-Id: Ib5d2448b88cfb66a97febcdf06e2118c84b16cd0
David Gross [Mon, 15 Aug 2016 17:17:01 +0000 (17:17 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup." into nyc-dev
Amith Yamasani [Fri, 5 Aug 2016 22:25:03 +0000 (15:25 -0700)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.
Bug:
30202481
Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f
Amith Yamasani [Fri, 5 Aug 2016 22:25:03 +0000 (15:25 -0700)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.
Bug:
30202481
Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f
David Gross [Fri, 12 Aug 2016 18:06:29 +0000 (11:06 -0700)]
Update RenderScript docs: reduction, other API 23/24 changes, cleanup.
Substantive changes:
- Add discussion of reduction kernels.
- Use RS_KERNEL in place of __attribute__((kernel)).
- Discuss "context" special argument.
- Special arguments x, y, z may be of type int.
- Discuss multiple inputs for mapping kernels.
- Mention that script-side global writes are not visible in Java.
- Rewrite part of discussion regarding when to use support library.
- Change minimum device version for support library from Android 2.2 (API level 8)
to Android 2.3 (API level 9).
Stylistic changes (better conformance with style guide):
- Proper use of <i> (italic) versus <em> (emphasis).
- Proper case for headings.
- Proper pattern for Android version numbers.
- Do not use e.g. or i.e.
- Prefer active rather than passive voice.
- Prefer present rather than future tense.
Miscellaneous minor editorial changes.
Bug:
27299393
Bug:
30000147
Change-Id: Ie0a26152714cf8f619d4914218f7262d675bb25f
(cherry picked from commit
05eef3040ed1bbd7640151b395072b8264b6d53d)
Phil Weaver [Fri, 5 Aug 2016 18:23:50 +0000 (11:23 -0700)]
Limit capabilities of a11y gesture dispatch.
Changing the service side to accept descriptions of
motion events, not motion events themselves, so we can
control their creation.
Bug:
30647115
Change-Id: Ia6772a1fc05df91818e3f88959d1e2b4a35fe0cc
(cherry picked from commit
a8918f23c712e97fa1dc4911f64827d64fc906e5)
smain@google.com [Wed, 10 Aug 2016 19:59:24 +0000 (12:59 -0700)]
add info about how to return default values from android.jar
bug:
30757670
Change-Id: I84e1624cbe7ae8d5e4e2886d4e8f61d621729464
Chris Tate [Wed, 10 Aug 2016 17:55:56 +0000 (17:55 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c am:
a8e21860af
am:
1d64d33ba8 -s ours
Change-Id: I68bc1793b55e6e2bf660ea6c41611e819b3f5e9a
Christopher Tate [Wed, 10 Aug 2016 17:55:47 +0000 (17:55 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107 am:
aac7d0442c
am:
6ea7b630c2 -s ours
Change-Id: Iefb7a9ad5f00b0f6e24c45fe5cf1d17cb0c97414
Chris Tate [Wed, 10 Aug 2016 17:44:52 +0000 (17:44 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c
am:
a8e21860af
Change-Id: I20921b9aa611838bc88fcabe1dc619de0bd9f6c1
Christopher Tate [Wed, 10 Aug 2016 17:44:50 +0000 (17:44 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107
am:
aac7d0442c
Change-Id: Ida93e1782221df18b2e7abcaa9da319e5ed28325
Chris Tate [Wed, 10 Aug 2016 17:28:30 +0000 (17:28 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev
am:
72933c623c
Change-Id: I2efd8b43c279c4cbd92130a08df6e3eafcb20b2c
Christopher Tate [Wed, 10 Aug 2016 17:28:28 +0000 (17:28 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M
am:
d6f3a11107
Change-Id: Ibd6e1be57f129d9ea89c8a44332da830944cf2b1
Chris Tate [Wed, 10 Aug 2016 17:15:26 +0000 (17:15 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev
Hemal Patel [Tue, 9 Aug 2016 21:03:19 +0000 (21:03 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs
am:
5ca44906c6
Change-Id: I4286b4a8e0766f7c3ca2d7e5ebd5c9f2b296fbb9
Hemal Patel [Tue, 9 Aug 2016 21:03:13 +0000 (21:03 +0000)]
Docs: Fixed the link that loads Fragments guide
am:
a8e1c75bf6
Change-Id: I26ea32ff32067d86fb5390103eec737b293ac031
Hemal Patel [Tue, 9 Aug 2016 21:03:06 +0000 (21:03 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs
am:
a70c722c77
Change-Id: I6e1d0d70d5d4b89b083cb74272f064bebf6a273a
Hemal Patel [Tue, 9 Aug 2016 21:03:00 +0000 (21:03 +0000)]
Docs: Changed custom_toast to toast_layout
am:
3b7309d753
Change-Id: I3d85fb321e27643227c568127870c7ad07650c41
Hemal Patel [Tue, 9 Aug 2016 20:55:34 +0000 (20:55 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs
Hemal Patel [Tue, 9 Aug 2016 20:53:11 +0000 (20:53 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs
Shawn Willden [Tue, 9 Aug 2016 19:01:04 +0000 (19:01 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs
am:
3188f77658
Change-Id: I4d30c3ad9f1d2d9d949e5f1ebc680f65c6925b99
Shawn Willden [Tue, 9 Aug 2016 19:01:00 +0000 (19:01 +0000)]
Fix @link tags in keystore doc
am:
3f0526ea09
Change-Id: I3162cbf57341ab231b84544c04e02d2062dbd304
TreeHugger Robot [Tue, 9 Aug 2016 18:35:07 +0000 (18:35 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs
Narayan Kamath [Tue, 9 Aug 2016 16:00:25 +0000 (17:00 +0100)]
Process: Fix communication with zygote.
Don't write partial requests, and don't return (or throw) early after
partially reading a response.
bug:
30143607
Change-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1
Hemal Patel [Mon, 8 Aug 2016 23:19:46 +0000 (16:19 -0700)]
Docs: Fixed the link that loads Fragments guide
In the class description, fixed the reference link that points to the
Fragments guide.
Bug:
29007808
Change-Id: I3399e5f10c461eb6666a04f8829c6cde774948e0
Kevin Hufnagle [Mon, 8 Aug 2016 23:35:25 +0000 (23:35 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
Mark Lu [Mon, 8 Aug 2016 22:37:19 +0000 (22:37 +0000)]
docs: fixed generics in data binding code samples
am:
b1b5efd3be
Change-Id: Iecafea06866a4579824435467c5dd31859c0dbd4
Mark Lu [Mon, 8 Aug 2016 22:26:34 +0000 (22:26 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
Hemal Patel [Wed, 3 Aug 2016 22:57:19 +0000 (15:57 -0700)]
Docs: Renamed Google Now to Google Voice Actions
This commit contains the following changes:
- Renamed instances of Google Now to Google Voice Actions
- Removed the Intents fired by Google Now section as it is obselete
- Added link to the Google Voice Actions page
- Changed the voice-icon.png's reference link to the System Actions reference
section on the Google Voice Actions page
- Revised the HTML comment and local CSS by replacing Google Now box with
Google Voice Actions box.
Bug:
19501778
Change-Id: I3e4364aaceaff4f5bceb090dd4f8da548dfa5c30
Christopher Tate [Fri, 29 Jul 2016 23:01:31 +0000 (16:01 -0700)]
DO NOT MERGE: Backport N backup/restore stability work to M
This is a squashed rollup of backup/restore infrastructural work in
the N release. It intentionally omits semantic/API changes such
as the introduction of the onQuotaExceeded() callback.
This patchset should not be merged beyond M maintenance releases.
Bug
29617908
Bug
29848715
Change-Id: I1eb25ad07f3bbf1132198d8a233722c41f1ac4cc
Mark Lu [Thu, 4 Aug 2016 21:45:42 +0000 (14:45 -0700)]
docs: fixed generics in data binding code samples
Generic types, such as List<String>, must be escaped when they are
used in XML. For example, List<String>. This commit adds
escape characters to the XML samples in the data binding page.
Bug:
30691285
Change-Id: If55ed55d13fb11038e2495884c79698e67219108
Kevin Hufnagle [Thu, 4 Aug 2016 21:33:36 +0000 (14:33 -0700)]
docs: Revised "Optimizing Content for the Assistant" page.
Bug:
25080159
Change-Id: Ie4167ba732ffbd401cabcb7f0ba3bac41a029506
Hemal Patel [Thu, 4 Aug 2016 19:43:20 +0000 (19:43 +0000)]
Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs
am:
ca7eee3d11
Change-Id: I94b5abbf1d292a01ba439cafd80938f7fc92854d
Hemal Patel [Thu, 4 Aug 2016 19:43:18 +0000 (19:43 +0000)]
Docs: Fixed info about spanning multiple columns
am:
64e88cd296
Change-Id: I8c4219e946fddbfc023bbe77549cc12fc0b6bd3a
Hemal Patel [Thu, 4 Aug 2016 19:38:41 +0000 (19:38 +0000)]
Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs
Bert McMeen [Thu, 4 Aug 2016 18:20:51 +0000 (18:20 +0000)]
Docs: Fixed typo in API Overview
am:
844c43a904
Change-Id: Ia855a58708afc4f12bae4b234b0f7ba10798aba4
Bert McMeen [Tue, 2 Aug 2016 20:45:24 +0000 (13:45 -0700)]
Docs: Fixed typo in API Overview
Bug:
30436707
Change-Id: I99a2b103d0643158da00ee0b5547b52bf6ebc040
(cherry picked from commit
f27ab3c12625f34a4221477001a603390b505e65)
Bert McMeen [Thu, 4 Aug 2016 18:01:27 +0000 (18:01 +0000)]
Merge "Docs: Fixed typo in API Overview" into nyc-dev
sreevanis [Thu, 4 Aug 2016 02:23:43 +0000 (02:23 +0000)]
Merge "resolve merge conflicts of
9d47cae to nyc-docs" into nyc-docs
am:
3faf6114b0
Change-Id: I80e8d39a9d6f58e2cc3091690f202d1453a6b8e6
sreevanis [Thu, 4 Aug 2016 02:23:39 +0000 (02:23 +0000)]
resolve merge conflicts of
9d47cae to nyc-docs
am:
d5cabb92bc
Change-Id: Ie16cc1707e8cff7eaa2691c7e9257a26bc6aeead
Sreevani Sreejith [Thu, 4 Aug 2016 02:14:25 +0000 (02:14 +0000)]
Merge "resolve merge conflicts of
9d47cae to nyc-docs" into nyc-docs
Kevin Hufnagle [Thu, 4 Aug 2016 01:03:32 +0000 (01:03 +0000)]
docs: Updated wording of callout describing device opt-out options.
am:
b48909ed52
Change-Id: I120725cdb7304e037bc72da73d56fbf901bfe9aa
Joe Fernandez [Thu, 4 Aug 2016 00:57:22 +0000 (00:57 +0000)]
Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs
am:
51a582fa85
Change-Id: I8be83bf47ae26a6bf9d0f812265c91133be40be3
Joe Fernandez [Thu, 4 Aug 2016 00:57:20 +0000 (00:57 +0000)]
cherry-pick from nyc-dev: docs: Add ARC documentation TOC file
am:
712c053462
Change-Id: I113c2c5b9391488eedf743220f6ef4c5ec283d6c
Kevin Hufnagle [Thu, 4 Aug 2016 00:57:16 +0000 (00:57 +0000)]
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs
am:
d6f1d8ea28
Change-Id: I222fa49789c2f2baac7ff2296617052c9924a328