Commit Graph

1333 Commits

Author SHA1 Message Date
Dan Yu
24d5e1b9ec Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am: 160ce9413c
am: 2ad3221e5f

* commit '2ad3221e5f982dd0b9213c7e600d6186a1a9ea23':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: Iaf555b61ddb9fc6706a67775e76106c8187b4d27
2016-05-31 17:21:48 +00:00
Dan Yu
160ce9413c Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs 2016-05-31 17:09:24 +00:00
Hemal Patel
5c1cd3ec6c Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378
am: 7ff4ee303b

* commit '7ff4ee303bca5372a925453e043375a728eb8d1d':
  Docs: Fixed the end-of-comment tag

Change-Id: I79abb2406163de3928ec9bb473e18c31aa146efa
2016-05-27 21:41:57 +00:00
Hemal Patel
d09caa1378 Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs 2016-05-27 21:31:24 +00:00
Daniel Yu
0cc7c69bf7 docs: Updating GuidedStepFragment for 23.2, new action types
Adding docs for some updates for GuidedStepFragment and GuidedAction
done in support lib v23.2. Includes docs on date picker actions,
subactions (new subsection), button actions (new subsection).
Adding docs for popBackStackToGuidedStepFragment and
finishGuidedStepFragments convenience methods.
Also updating page keywords so this page has better search
discoverability.

Staged: https://android-dot-devsite.googleplex.com/training/tv/playback/guided-step.html

Bug: 26902886
Original SHA1: I792bbe6696cd144dbb6319b3c4eb44e67390217d

Change-Id: I57aeb9deb59bb2cdf5a062b24916b625e1553cf0
2016-05-27 13:44:04 -07:00
Eric Schmidt
28bdf2907a Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am: 8e08dbe8f8
am: 400aed3556

* commit '400aed3556d837e746252e1be03dd1ac54a383e5':
  docs: Removing CLI steps in getting started docs

Change-Id: Id585f59925373bda46a34c9bd6811603ea5ee66a
2016-05-26 19:35:13 +00:00
Eric Schmidt
8e08dbe8f8 Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs 2016-05-26 19:26:32 +00:00
Eric Schmidt
18e457900b docs: Removing CLI steps in getting started docs
Bug: 22875456
Bug: 21026809
Change-Id: I8f4fcca73c779407aac0b96299c60f8d6adae214
2016-05-26 18:50:51 +00:00
Trevor Johns
5513b6776e docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e
am: 46c1d5a5d2

* commit '46c1d5a5d2b4c1d6a680f7af5c3973486c1fef2c':
  docs: Fix broken link in Volley training

Change-Id: Ib5ae3925cca39db0145bb4c6e6eeb53488bfc316
2016-05-26 02:19:23 +00:00
Trevor Johns
c8c2abed0e docs: Fix broken link in Volley training am: 05dd9d2c29
am: 346114e346

* commit '346114e3467cc06b2a90467a00288f6944dd969b':
  docs: Fix broken link in Volley training

Change-Id: Ifb20e8fd2a2c4d87786e61e6490e52dd06742810
2016-05-26 01:32:43 +00:00
Trevor Johns
346114e346 docs: Fix broken link in Volley training
am: 05dd9d2c29

* commit '05dd9d2c291c3b5becdf27b78cc0685be3bb5389':
  docs: Fix broken link in Volley training

Change-Id: Ia20dd9788d855129033c82e2161e01dc382d85b7
2016-05-26 01:18:44 +00:00
Trevor Johns
05dd9d2c29 docs: Fix broken link in Volley training
Inline link from from "Making a Standard Request" to "Implementing a
Custom Request" had a typo in the URL string.

Change-Id: I8f7d79e47ea82f423b9e56ef6d908938564a3fe9
2016-05-25 16:13:21 -07:00
Hemal Patel
ab0bd7d1ec Docs: Fixed the end-of-comment tag
Bug: 28025365
Change-Id: I2d3963c8c0a909f7e0a4925636bc73a56816e0af
2016-05-25 15:36:42 -07:00
Billy Lamberta
a0a34f6017 Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13
am: 51ceb1bad1

* commit '51ceb1bad18c39a5281fc2cbd6d9c234c2e7f14a':
  docs: work minisite

Change-Id: Ieac1a9a571bfe6ef94663623f5715d1b205dd242
2016-05-16 22:19:41 +00:00
Billy Lamberta
e1277eb819 docs: work minisite
Adds minisite at docs/html/work. Adds landing page and
Android for Work specific guides. Moves docs from
training/enterprise and add redirects. Update resource
card info and add new images. Update sitemap, _book, and
add sidebar navigation menu.

bug: 27744376
Change-Id: Ib09f7fc6352dfde7a60fc674b06488c651b196e2
2016-05-16 13:36:55 -07:00
smain@google.com
e9746f7a6a Update links for all files under sdk/ that moved to studio/ am: 89d11705a1 am: d10e0132a1
am: 6c568e6322

* commit '6c568e632242e99eb255f721edcbec0223f9934d':
  Update links for all files under sdk/ that moved to studio/

Change-Id: I2acd1acd6fef98c527ef4dfc0d016bb5cfa296cc
2016-05-15 03:11:46 +00:00
smain@google.com
89d11705a1 Update links for all files under sdk/ that moved to studio/
Change-Id: I624621dfd7df0f441d0b559e5a12029e5e299964
2016-05-15 02:55:23 +00:00
Kevin Hufnagle
90fa73b6d6 Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am: ec6effa1b0 am: 70f2e39008
am: e60af6b9e2

* commit 'e60af6b9e2645144cda30c5e54a1267f05ac1d0d':
  docs: App Translation API updates

Change-Id: Idc2ad381a5105b6502f3c37b08ec30ebbf6568eb
2016-05-13 17:20:42 +00:00
Joe Fernandez
ec6effa1b0 Merge "docs: App Translation API updates" into mnc-docs
am: 1ede811143

* commit '1ede811143d32afe8ba6ce49a19060da4a1b6092':
  docs: App Translation API updates

Change-Id: Id075bdfddf3c5ccabf063690a37c487a87f9635d
2016-05-13 17:11:08 +00:00
sreevanis
52abf8d472 docs: Added new page and menu link for "Testing Apps for Auto". am: eb41bc08e1 am: a0598b5f06
am: 44b6976acf

* commit '44b6976acf8a6588a68cdba2a9c6e2b1fb841dac':
  docs: Added new page and menu link for "Testing Apps for Auto".

Change-Id: Ifbac7b5836ff62b2a10b09199ad43542117f1f13
2016-05-11 18:25:28 +00:00
sreevanis
eb41bc08e1 docs: Added new page and menu link for "Testing Apps for Auto".
Moved DHU contents from Tools location to the new "Testing for Auto"
location.

Bug:23587345
Change-Id: I70aa09fc1073f0801b1e69959fe39cf01558546e
2016-05-11 10:50:45 -07:00
Amanda Kassay
c5484969b4 Merge "Deleting pages so redirects work on DevSite. b/28670825" into mnc-mr-docs am: 965f4bf1ef am: af218df0be
am: 5295a81926

* commit '5295a81926321bcb7059f645728e021264131227':
  Deleting pages so redirects work on DevSite. b/28670825

Change-Id: I4cdefd1ed0a858404428058b46edaf2eabc3f752
2016-05-11 17:49:55 +00:00
Amanda Kassay
7cf1e9c403 Deleting pages so redirects work on DevSite. b/28670825
Change-Id: I4eb039d96f3f1378ecf0960d31ffea1bfbca0520
2016-05-10 11:10:44 -04:00
Janis Danisevskis
672b052115 Updates training/camera/photobasics.jd with FileProvider details
As of Android N, passing file:// URIs across package boundaries
throws a FileUriExposedException. This has caused frustration among
app developers trying to use our example as boilerplate code. This
patch replaces the "take picture" example with one that uses
content:// URIs and FileProvider instead.

Bug: 27636012
Change-Id: I9f0b4d9bbcd6b4bfa770dd1e4ad37f321e22195f
2016-05-09 18:34:22 +00:00
Joe Fernandez
5310e2d669 docs: App Translation API updates
Includes all updates to App Translation API content/text. Also
includes "Related Resource" cards.

Bug: 27729402

Change-Id: I0385f448b7b92fe420f3b51394d9a659e7b6df81
Original-Change-Id: Ibcde400fe8b340f032d1c458c83deb828450c9a5
2016-05-06 10:30:56 -07:00
Dirk Dougherty
7c004c4937 Remove extraneous Training heading that doesn\'t appear in other training indexes. am: e4f02996b5 am: a4a30aaa6c
am: e105e8face

* commit 'e105e8faced5b9528421efc48e4ec26e4f487aae':
  Remove extraneous Training heading that doesn't appear in other training indexes.

Change-Id: I08b98bc4954535cffc0a4307d540f9f8541e5c56
2016-05-03 23:45:29 +00:00
Dirk Dougherty
e4f02996b5 Remove extraneous Training heading that doesn't appear in other training indexes.
Change-Id: I7dfb3cf998e717969747142d1d53b85f85236938
2016-05-03 16:11:00 -07:00
Elliot Waite
72403f1daa Merge "Change custom_link_attributes to path_attributes format." into mnc-mr-docs am: 14fd7d5 am: 5b4f351
am: 26d957c

* commit '26d957c9c1903fc4f520de8b56cc57539ac33b3a':
  Change custom_link_attributes to path_attributes format.

Change-Id: I5dfd8ee64fbf6502e29d639d454d6b637ecf2e12
2016-04-28 18:50:37 +00:00
Elliot Waite
988248daab Change custom_link_attributes to path_attributes format.
Change-Id: I24439d6f9226ace37eab875e8b1bb634a9e52074
2016-04-27 20:07:57 -07:00
Daniel Yu
f09e309f7f Merge "docs: Fixing various minor issues" into mnc-mr-docs am: 9780f94 am: cf35d40
am: d563c25

* commit 'd563c253911b5ad86804b474acbc931d27572d2a':
  docs: Fixing various minor issues

Change-Id: Ied80c3fc5cbe1af6fce8a006af698170601bf292
2016-04-27 05:41:21 +00:00
Ryan Seys
47b26c6ee9 Merge "Fix a couple typos and clarify UI requirements for banner images" into mnc-mr-docs am: 7c9712b am: 97c3608
am: cef06ba

* commit 'cef06ba4ed9dde6c51f96f3d0c246c530c175ca3':
  Fix a couple typos and clarify UI requirements for banner images

Change-Id: Id67c91f881ab919d1428849102e4946ff0042530
2016-04-27 04:30:00 +00:00
Bert McMeen
d693509068 Merge "Docs: Correction to service node snippet of manifest file" into mnc-mr-docs am: 4fb6ada am: 650a59a
am: 7308200

* commit '7308200268ac856874195f2f264c8d5f4aac7462':
  Docs: Correction to service node snippet of manifest file

Change-Id: I27b3a19a3103f8fd3375d6832c77ac31ff186d27
2016-04-27 03:35:17 +00:00
Kevin Hufnagle
7fa381f988 Merge "docs: Updated link, wording associated with data-sharing IPC." into mnc-mr-docs am: c501688 am: 7bce49c
am: 31d841c

* commit '31d841c9373214ece6dd27fedcf512471f12f1dc':
  docs: Updated link, wording associated with data-sharing IPC.

Change-Id: I82032bb7d831f436e8d05a16ab93aa27c3f660ef
2016-04-27 03:17:35 +00:00
Joe Fernandez
6c3822ef5a Merge "docs: InfoPros, Project 02, Batch 03" into mnc-mr-docs am: d00f005 am: 94e5237
am: b79b808

* commit 'b79b80882c34f0c540e84c7a3a90b73c617e0635':
  docs: InfoPros, Project 02, Batch 03

Change-Id: Iccf5c61e7c9a7da81d8df114076a94a86983e247
2016-04-27 03:11:53 +00:00
Cheryl Potter
2932aea3d7 Merge "docs: Document test artifact preference setting b/24810371" into mnc-mr-docs am: a6d7a32 am: dd4cc3b
am: 18ec09c

* commit '18ec09cfc46eae278b1dbc7e18e8f77f9a2e8c2b':
  docs: Document test artifact preference setting b/24810371

Change-Id: I85979f09f9c2525877ff7dbce72f5c8fbd8d423b
2016-04-27 02:24:08 +00:00
Adarsh Fernando
7d07dd051d Merge "Docs: Minor fixes to Background Optimizations and Doze docs" into mnc-mr-docs am: 6bd5c3d am: a572a3a
am: d7f4b76

* commit 'd7f4b7662eb9c032c861585741da68d7defbadb2':
  Docs: Minor fixes to Background Optimizations and Doze docs

Change-Id: Ib95e44982e3a8a7f7f86ccdeecb174038e9c1ed3
2016-04-27 02:00:49 +00:00
Adarsh Fernando
552cb8c2df Merge "Docs: Added image for CTL config" into mnc-mr-docs am: 78bad64 am: df51dd1
am: d20b4cb

* commit 'd20b4cb528d9485cbbfdb6316fc045b89b1d7cfc':
  Docs: Added image for CTL config

Change-Id: I47a7767afcf41e76d14d7a990d8fbe0e9acb0e02
2016-04-27 01:50:21 +00:00
Cheryl Potter
dc8f3eb2f3 Merge "docs: URL and App Indexing API updates for AS 2.0 support b/26642964" into mnc-docs am: cffbbc8 am: 8af8d4d am: 13308fc2
am: 39579d7

* commit '39579d70b3d729a228c76ae06beeff06c5e94150':
  docs: URL and App Indexing API updates for AS 2.0 support b/26642964

Change-Id: Id71f67c7af800535071103c16924daaf6efa72d8
2016-04-26 21:50:44 +00:00
Adarsh Fernando
dd0d888973 Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am: 7961413 am: 88d1e91
am: 8776f89

* commit '8776f8940a7a73a5763550ab8e902f4ad6210808':
  Docs: Added instructions to launch instrumented tests in AS using CTL

Change-Id: If1512e3bc20cfdaed5c08317bdf5889857909b00
2016-04-26 21:39:34 +00:00
Dake Gu
eb8d2fcb50 leanback: Fix link to changed API setTitle()
To match ag/952395.

Change-Id: I96cf9caa34bd560f14f7864201f3ac228cd2537d
2016-04-21 14:50:26 -07:00
Trevor Johns
59c9a93fc2 Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
* changes:
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev
2016-04-20 18:35:57 +00:00
Daniel Yu
ff091e1708 docs: Fixing various minor issues
Fixes to minor issues (typos and other things that don't require
editorial review) in Android docs.

Staged page URLs provided in CL comments.

Bug: 28172346
Bug: 22411462
Bug: 26422744
Bug: 26776224
Change-Id: Ic3aa8495a1d76a5ce3bccb5037b4172443664d0b
2016-04-20 11:00:37 -07:00
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00
Ryan Seys
7c9712bd59 Merge "Fix a couple typos and clarify UI requirements for banner images" into mnc-mr-docs 2016-04-18 17:11:46 +00:00
Ryan Seys
0bbb97dd15 Fix a couple typos and clarify UI requirements for banner images
Change-Id: Ibfe89c9f30ea274c613e17fbb03878d17fff3351
2016-04-18 17:04:40 +00:00
Alex Klyubin
a65707d3f3 Clarify how to replace cert generated by Android Keystore.
This updates Android Keystore developer documentation to clarify how
to replace the self-signed certificate create by Android Keystore when
it generates a new key pair. Some developers are attempting to use
KeyStore.setCertificateEntry which is the wrong method for this. The
correct method is KeyStore.setKeyEntry.

Bug: 28152878
Change-Id: I306447b7792ecad5fbb49bd691a57bedb5207003
2016-04-13 15:33:53 -07:00
Bert McMeen
4fb6ada226 Merge "Docs: Correction to service node snippet of manifest file" into mnc-mr-docs 2016-04-12 23:57:22 +00:00
Kevin Hufnagle
c501688ce5 Merge "docs: Updated link, wording associated with data-sharing IPC." into mnc-mr-docs 2016-04-11 22:22:18 +00:00
Joe Fernandez
d00f005049 Merge "docs: InfoPros, Project 02, Batch 03" into mnc-mr-docs 2016-04-11 16:24:36 +00:00
Joe Fernandez
7adb4c8a45 docs: InfoPros, Project 02, Batch 03
- Removing API 15 and lower work-arounds

b/26490262

Change-Id: Ie8ca92bbff68ca3bc67d2b81164d970058a8a8a8
2016-04-11 09:21:03 -07:00