Commit Graph

13522 Commits

Author SHA1 Message Date
Aurimas Liutikas
c363018d1a Merge "Fix a link to CustomTabsCallback in support-library docs." 2016-06-03 20:40:18 +00:00
Aurimas Liutikas
f82032fcf9 Fix a link to CustomTabsCallback in support-library docs.
Bug:
https://code.google.com/p/android/issues/detail?id=183077

Change-Id: I86d1d8e07e42e9e295364b002e7e1534d4d9d5cc
2016-06-03 13:25:38 -07:00
Aurimas Liutikas
6b1853008e Fix code example in testing-support-library.
Note: mDevice is a variable, there is additional brackets.

Bug:
https://code.google.com/p/android/issues/detail?id=206043

Change-Id: I8e88a6144f1ede1d45262ff034159de524c24b70
2016-06-03 13:14:38 -07:00
Eric Schmidt
9ad88ce3fe Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am: 0b8eb8c1e8
am: 76297d719d

* commit '76297d719d5bbe2dcce65c357591c22b1a1d3293':
  docs: Fixed background optmizations code snippet

Change-Id: I66a1141d843dedb78b3abbbfa7820367779087b9
2016-06-03 02:59:57 +00:00
Eric Schmidt
76297d719d Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs
am: 0b8eb8c1e8

* commit '0b8eb8c1e833d3f16aaf6e44f256c23537ae0500':
  docs: Fixed background optmizations code snippet

Change-Id: I5fd02424afc2f99c7bd63f47e3cece88356546a1
2016-06-03 02:52:51 +00:00
Eric Schmidt
0b8eb8c1e8 Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs 2016-06-03 02:41:46 +00:00
Billy Lamberta
a092b6cdb9 docs: work minisite post-launch fixes am: 9fec73a47c
am: 84903c24ed

* commit '84903c24ed74c75a2217648a96931cc3045143ea':
  docs: work minisite post-launch fixes

Change-Id: I0477d9cb98a79a5d9b218e33877178562e53cbd5
2016-06-02 22:04:13 +00:00
Billy Lamberta
84903c24ed docs: work minisite post-launch fixes
am: 9fec73a47c

* commit '9fec73a47c158df0a184a1f2a0301b6394cfec40':
  docs: work minisite post-launch fixes

Change-Id: I19be178cec83668e19e768af08eae0ae5fd5deda
2016-06-02 21:59:29 +00:00
Billy Lamberta
9fec73a47c docs: work minisite post-launch fixes
* Localization for table of contents.

* Replace occurrences of 'app restrictions' with the preferred
term 'managed configurations' (see go/afw-words). Update resource
card titles and add page redirects.

* In guide, update language for SSO with Chrome Custom Tabs.
(Cherry-picked from 1056063.)

* Add resource card for 'Your Apps at Work' video.

bug: 28378252, 27744376
Change-Id: I8bc2e87d0486159bdd6680600b783af7334c3a58
2016-06-02 13:04:57 -07:00
Sreevani Sreejith
82c9562d3c Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am: 2d6015b18b
am: 441209abc7

* commit '441209abc78b8c6bcbcc6b1eb08d2f41219ce344':
  docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.

Change-Id: I761a39db759030d4f07cb6e77326fc45db215677
2016-06-01 22:54:06 +00:00
sreevanis
441209abc7 Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs
am: 2d6015b18b

* commit '2d6015b18ba0bf52ebe402503c7c66ddae23d8bd':
  docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.

Change-Id: I76168738a10e3f379134a88a89667a63d818323d
2016-06-01 22:46:44 +00:00
Sreevani Sreejith
2d6015b18b Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs 2016-06-01 21:58:22 +00:00
sreevanis
c92db9eeef docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.
Bug:29071043
Change-Id: Iac88710234277210997150e2a6725322928276c3
2016-06-01 14:48:41 -07:00
Eric Schmidt
28ed18877b Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246
am: 51500a1c5a

* commit '51500a1c5ad6ce1bde1f8966f9835b42d9419a95':
  docs: Fixed 'MessageStyle' typo

Change-Id: I87addb7b46d0985b2cbfc92e6f0f9a7d44ce8963
2016-06-01 18:25:35 +00:00
Eric Schmidt
51500a1c5a Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs
am: 8ef79a9246

* commit '8ef79a9246eba129c22e5d54654ecb85414edf22':
  docs: Fixed 'MessageStyle' typo

Change-Id: Ie9bfc94d89f388763e360841ae129d214156d6d2
2016-06-01 18:16:17 +00:00
Eric Schmidt
556dff9c73 docs: Fixed background optmizations code snippet
Bug: 28341003
Change-Id: I42b26f52ac6f17b684a8a9673b5acd9d9e647a7f
2016-06-01 11:13:57 -07:00
Kevin Hufnagle
b04f86acae cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185
am: f5250c5b37

* commit 'f5250c5b372ce3246bdc1e67212dc1fc7ca468ad':
  cherry-pick: docs: Added note that <application> at end of manifest.

Change-Id: I55b4b106e27d642878f8c1050c82594a21ff4574
2016-06-01 18:10:43 +00:00
Eric Schmidt
8ef79a9246 Merge "docs: Fixed 'MessageStyle' typo" into mnc-io-docs 2016-06-01 18:04:56 +00:00
Kevin Hufnagle
f5250c5b37 cherry-pick: docs: Added note that <application> at end of manifest.
am: d5368b8185

* commit 'd5368b81857a04879ed55be2a67f034cce4e5094':
  cherry-pick: docs: Added note that <application> at end of manifest.

Change-Id: Ie8343e36136e7f3829bf92d7ac26488faf01b489
2016-06-01 18:02:22 +00:00
Kevin Hufnagle
d5368b8185 cherry-pick: docs: Added note that <application> at end of manifest.
After cherry picking, removed trailing whitespace at end of lines.

Bug: 28823898
Change-Id: I30d69f1877d772893965e1512455f3addb397c80
Original-Change-Id: I9d4e67c30a0e95e78a596c933c9b9d4804eb4d6a
2016-05-31 19:41:52 -07:00
Eric Schmidt
804482222c docs: Fixed 'MessageStyle' typo
Bug: 28964745
Change-Id: Ida96fbae10fa70c4cfffdad8642cfb4c8132c3a3
2016-05-31 11:56:03 -07:00
sreevanis
9801a9269c Updated image sizes and wrapped text around images. am: 1ce2279423
am: 2cbac3c122

* commit '2cbac3c122e1114f72ef44c3e62c8ec7c372db94':
  Updated image sizes and wrapped text around images.

Change-Id: Ie0df8af83058bf81a71f6fb75cb71b453ad9f47e
2016-05-31 18:45:36 +00:00
sreevanis
2cbac3c122 Updated image sizes and wrapped text around images.
am: 1ce2279423

* commit '1ce2279423a544d431bf6b64f2bfeb1a4617120b':
  Updated image sizes and wrapped text around images.

Change-Id: I61e1bb43a0b32ca80e0875e375c746fc930c85cb
2016-05-31 18:39:38 +00:00
sreevanis
1ce2279423 Updated image sizes and wrapped text around images.
Fixed messagingstyle link in api-overview page.

Bug:28864173
Change-Id: I2e1a6036010b2e3aea8104e51e37a1697906691c
2016-05-31 10:55:13 -07:00
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
Daniel Yu
2ad3221e5f Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs
am: 160ce9413c

* commit '160ce9413ccd5cef62b01f2e7e7fb601c5e8fbf2':
  docs: Updating GuidedStepFragment for 23.2, new action types

Change-Id: I646cb0a2e9ecc0f783444bb8b63334a37c6e22df
2016-05-31 17:17:18 +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
747d945b2c Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs am: 709f0df0d8
am: 71b5005a66

* commit '71b5005a66872c25aaf71be865246294d0888279':
  Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample

Change-Id: I09b59dd2cc85de4478012e2326bfce1cfd314e6b
2016-05-28 01:24:52 +00:00
Hemal Patel
71b5005a66 Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs
am: 709f0df0d8

* commit '709f0df0d883ee5351d4f5688360fa76f9a84dbc':
  Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample

Change-Id: Idee5539ed59ec115e90b4f5413f385e8d51369d8
2016-05-28 01:20:26 +00:00
Hemal Patel
709f0df0d8 Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs 2016-05-28 01:16:51 +00:00
smain@google.com
c26b8afd35 redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890 am: d6c76ddc51
am: 3152ead0f8

* commit '3152ead0f8cb5994100a423b47907db06d8e0d7b':
  redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: I8ec4aee36c2f39f9590fe94ffa8fa7b8da90cf43
2016-05-27 23:02:25 +00:00
smain@google.com
3152ead0f8 redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890
am: d6c76ddc51

* commit 'd6c76ddc51a1b607c50d8e443a7affb9b2e0e1b6':
  redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: Ia14317cc6a292fcda6328d96660db0eda5757e12
2016-05-27 22:56:53 +00:00
smain@google.com
d6c76ddc51 redirect adt guide to release notes to consolidate the deprecation message.
related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: Ia9b533ec52a0fd05fcfeede04dda64ae6041c6a2
2016-05-27 15:48:44 -07:00
Joe Fernandez
3ccb88b97a Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90
am: 25967b7577

* commit '25967b7577b427b81417848678dad3916b92d6ba':
  docs: update redirects for GMS and GCM reference docs

Change-Id: I383c15867a5a0334b856bedf27ccb93f464a9751
2016-05-27 22:46:01 +00:00
Joe Fernandez
25967b7577 Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs
am: 580bff3d90

* commit '580bff3d90bc08fa6db0edb32abffee8d1bdd563':
  docs: update redirects for GMS and GCM reference docs

Change-Id: Idfd86984163c495995e331e99d182dd33e1bab96
2016-05-27 22:35:26 +00:00
Joe Fernandez
580bff3d90 Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs 2016-05-27 22:31:02 +00:00
Joe Fernandez
faaa13e0cb docs: update redirects for GMS and GCM reference docs
b/29003935

Change-Id: I5ad833276dbbfc21a3c5e55a4b2e37d6b3a40dda
2016-05-27 15:24:25 -07:00
Hemal Patel
8d8718fc53 Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43
am: 202017dcbf

* commit '202017dcbf35e54f8aec6f98e5e8b6fe4231f8d5':
  Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub.

Change-Id: I8181c5d1679be85be720fe16fd85561a883ab4ce
2016-05-27 21:45:46 +00:00
Hemal Patel
2b9497069d Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378
am: 7a62915c51

* commit '7a62915c51294fcbf491fbe0f0a406ac420e2d34':
  Docs: Removed note in "Platform Versions" section

Change-Id: I4da67d6b00c0e33f6eb99b06479bafb8049f1b8b
2016-05-27 21:45:39 +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
202017dcbf Merge "Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub." into mnc-io-docs
am: 50f57d1d63

* commit '50f57d1d631eb08744609f9440c935b1e8e86992':
  Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub.

Change-Id: I3c60c8a347283c4f107eef0e4efe3cabd9c8795e
2016-05-27 21:41:48 +00:00
Hemal Patel
7a62915c51 Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs
am: 9dfa75ef43

* commit '9dfa75ef43782c596d55de582704566afc540d06':
  Docs: Removed note in "Platform Versions" section

Change-Id: Ie09047db04155b7f37aafdc3ac6a85e390d54143
2016-05-27 21:41:43 +00:00
Hemal Patel
7ff4ee303b Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs
am: d09caa1378

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

Change-Id: I27a07c1d00f840b34683cfb333b8b338ffe60dd3
2016-05-27 21:37:15 +00:00
Hemal Patel
50f57d1d63 Merge "Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub." into mnc-io-docs 2016-05-27 21:32:25 +00:00
Hemal Patel
9dfa75ef43 Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs 2016-05-27 21:32:05 +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
Mark Goldstein
7f1330358a Merge "Doc change: Fix broken link." into mnc-io-docs am: d643ab1ddb
am: f9d8f6c5f3

* commit 'f9d8f6c5f36b07961f2d38b43c991ed679022f7e':
  Doc change: Fix broken link.

Change-Id: Iee76c1e357f2c67362d951f567bc3498c208fb35
2016-05-27 17:57:50 +00:00
Mark Goldstein
f9d8f6c5f3 Merge "Doc change: Fix broken link." into mnc-io-docs
am: d643ab1ddb

* commit 'd643ab1ddb737aeb6636c61839cb64bdc7348c04':
  Doc change: Fix broken link.

Change-Id: Ia1a9fdd18486ecf34d4a577f0e7f9d9570f748a3
2016-05-27 17:46:38 +00:00
Mark Goldstein
d643ab1ddb Merge "Doc change: Fix broken link." into mnc-io-docs 2016-05-27 17:37:37 +00:00