summaryrefslogtreecommitdiff
path: root/docs/html-intl
AgeCommit message (Collapse)Author
2016-05-13Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am: 3a263cec30Dirk Dougherty
am: 6d3ca9aaa9 * commit '6d3ca9aaa91328d3664a217fee8a49c9ee46858e': Correct the DP2 status beta -> alpha. Change-Id: Iecc460e2b5399bff284f8d2479d475325fc8a1df
2016-05-13Correct the DP2 status beta -> alpha.Dirk Dougherty
Bug: 28175714 Change-Id: I050c9a41961528c1d65cd9b9737d93c82d16aef2
2016-05-12Merge "Remove broken video embed." into mnc-mr-docs am: 80a3c76891 am: ↵Dirk Dougherty
1d5d20fba9 am: 0519569eaa * commit '0519569eaaeb5dd3dd3edaeb572346a871c9aa3f': Remove broken video embed. Change-Id: Ia29d6f0b0eb45161e7089ca6d888c975692cd7de
2016-05-12Merge "Remove broken video embed." into mnc-mr-docs am: 80a3c76891Dirk Dougherty
am: 1d5d20fba9 * commit '1d5d20fba982fcca5c6664b52bbef803126820ae': Remove broken video embed. Change-Id: I23f583a4dd1d7f236d1a156683eff9be09f8fa25
2016-05-11Remove broken video embed.Dirk Dougherty
Change-Id: I74ee6f4c35efb45ab78e3feff7c8e0b0c01f772f
2016-05-03Merge "delete outdated translated versions of sdk/tools pages bug: 28425669 ↵smain@google.com
bug: 28471385" into mnc-mr-docs am: 3b789de28b am: adf240dd2c am: 7d1245d36b * commit '7d1245d36b368772a6ada82a453bcd86075787c5': delete outdated translated versions of sdk/tools pages bug: 28425669 bug: 28471385 Change-Id: Ie39cceea449782a9877d4faea1e3a13d14ec150f
2016-05-03Merge "delete outdated translated versions of sdk/tools pages bug: 28425669 ↵Scott Main
bug: 28471385" into mnc-mr-docs am: 3b789de28b am: adf240dd2c * commit 'adf240dd2c01678b0ce9fe9db9fcc9f79a04862b': delete outdated translated versions of sdk/tools pages bug: 28425669 bug: 28471385 Change-Id: I6f61c6063b8717336edd9ebae05223d7f4ad78ac
2016-05-02delete outdated translated versions of sdk/tools pagessmain@google.com
bug: 28425669 bug: 28471385 Change-Id: Id81461f30f638734470ab9880509e76e4df68ce1
2016-04-27Merge "Docs: Localized DAC pages for N Preview." into mnc-mr-docs am: ↵David Friedman
e20502c240 am: 1c2ce95 am: 25a92f0 * commit '25a92f0762ea5fc1e60f00b6f7634ffccc8265cd': Docs: Localized DAC pages for N Preview. Change-Id: I6bc25875398fbad13821095a5e0115969620fcdb
2016-04-27Merge "docs: Fixing various minor issues" into mnc-mr-docs am: 9780f94 am: ↵Daniel Yu
cf35d40 am: d563c25 * commit 'd563c253911b5ad86804b474acbc931d27572d2a': docs: Fixing various minor issues Change-Id: Ied80c3fc5cbe1af6fce8a006af698170601bf292
2016-04-26Merge "Docs: Localized DAC pages for N Preview." into mnc-mr-docs am: e20502c240David Friedman
am: 1c2ce95 * commit '1c2ce9522e9203396bf45dcf7fc87a7d17095e59': Docs: Localized DAC pages for N Preview. Change-Id: Iae1e3d6bee0be9af2e64fff29a2ac4d02f3e0235
2016-04-26Merge "docs: Fixing various minor issues" into mnc-mr-docs am: 9780f94Dan Yu
am: cf35d40 * commit 'cf35d40c3d54db593c78b4a274d86684950fa5cc': docs: Fixing various minor issues Change-Id: I078c1ef78b6ad3396435ba95bd45f86b006ed5cc
2016-04-21Merge "Docs: Localized DAC pages for N Preview." into mnc-mr-docsDavid Friedman
2016-04-20Docs: Localized DAC pages for N Preview.David Friedman
Change-Id: I5f6e3784bc1a3134dcd71fe06cfa9bffd300a647
2016-04-20docs: Fixing various minor issuesDaniel Yu
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-19Resolve merge conflicts of a5060ee to nyc-devTrevor Johns
This undoes the automerger skip which occured in commit e740c84dc32180214a7fd157105d6c18d30408ee and replays it as a standard (NOT -s ours) merge. Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-05Merge branch 'mnc-mr-docs' into mnc-ub-devTrevor Johns
Large merge to reconnect automerger for docs branch to mainline. Conflicts: docs/html-intl/intl/es/index.jd docs/html-intl/intl/es/preview/download.jd docs/html-intl/intl/es/preview/index.jd docs/html-intl/intl/ja/index.jd docs/html-intl/intl/ja/preview/download.jd docs/html-intl/intl/ja/preview/index.jd docs/html-intl/intl/ko/index.jd docs/html-intl/intl/ko/preview/download.jd docs/html-intl/intl/ko/preview/index.jd docs/html-intl/intl/pt-br/index.jd docs/html-intl/intl/pt-br/preview/download.jd docs/html-intl/intl/pt-br/preview/index.jd docs/html-intl/intl/ru/index.jd docs/html-intl/intl/ru/preview/download.jd docs/html-intl/intl/ru/preview/index.jd docs/html-intl/intl/zh-cn/index.jd docs/html-intl/intl/zh-cn/preview/download.jd docs/html-intl/intl/zh-cn/preview/index.jd docs/html-intl/intl/zh-tw/index.jd docs/html-intl/intl/zh-tw/preview/download.jd docs/html-intl/intl/zh-tw/preview/index.jd docs/html/guide/topics/manifest/compatible-screens-element.jd docs/html/guide/topics/manifest/uses-feature-element.jd docs/html/preview/download.jd docs/html/preview/features/runtime-permissions.jd docs/html/sdk/index.jd docs/html/tools/revisions/studio.jd docs/html/tools/sdk/eclipse-adt.jd docs/html/tools/support-library/features.jd telephony/java/android/telephony/TelephonyManager.java Bug: 28000173 Change-Id: Iacab0481175f1b32e0ac3bab98cde9e994100e94
2016-03-14Docs: Adds Chinese (zh-cn) translations of docs on creating Wear apps for China.David Friedman
Bug: 27142406 Change-Id: I5c0dc3d33591d78634056876c37abf42c7d6d4b1
2016-03-10docs: Update install/uninstall procedure for Nexus & non-Nexus devicesDirk Dougherty
Include download links for seed device. Adjust various references to DP device range. Change-Id: I01ecaaf46e128fec811e8142395cfa8f09758fd6
2016-03-09Update intl landing pages for preview.Dirk Dougherty
Change-Id: I2178dfe422ab7a93223cdfede4b1c7152b154d00
2016-03-02docs: Update terms of the SDK licensing agreementJoe Fernandez
Updating per instructions from Tristan Ostrowski <tostrowski@google.com> b/24584030 Change-Id: I9ce7d36428a6f63ad83fcde3b9f1be99b7a7a496
2016-01-30Fix some localization issues. Remove spurious pages at ↵Dirk Dougherty
intl/lang/design/index.html that were dupes of intl/lang/design/material/index.html. Remove empty <lang>-lang attrs that caused display errors. Remove some unnecessary TOC items. Bug: 26715261 Change-Id: Ibc841ae7e0aebfe36ff82efd95211527d0bf3871
2016-01-30Merge "Move page-defined hdf values for sdk into a central file" into mnc-docsDirk Dougherty
2016-01-29Move page-defined hdf values for sdk into a central fileDirk Dougherty
Change-Id: Ic814718830ceda66732a261a051b5994a77cafa6
2016-01-28Doc change: adjustments for design updates.Dirk Dougherty
Change-Id: Ic798228a75ba2ab692fd3e36034606c04651c20c
2016-01-20docs: Remove Google Play Branding guidelinesJoe Fernandez
- provide link to the new badge and guidelines sitee b/26640364 Change-Id: Ic00d1a1e9b5aaf342d7dfe1831326c86e98e7f65
2015-12-21Docs: Localization of Android design pagesDavid Friedman
Bug: 23090876 Change-Id: I2a19a5ba77b3a3b26ec4846a4f431ffe09a46066
2015-12-21Docs: Material Design L10N update. All languages except es, ja.David Friedman
Bug: 23090399 Change-Id: I0389fcff3b012a4ae4d92529574847e4a1685729
2015-12-21Merge "Docs: Update to Japanese localization of Material Design docs." into ↵David Friedman
mnc-docs
2015-12-21Merge "Docs: Updating Spanish translation for material-design docs." into ↵David Friedman
mnc-docs
2015-12-05Docs: Updating Spanish translation for material-design docs.David Friedman
Bug: 23090399 Change-Id: Ibfc64825b581959677da3f536230220e01edf705
2015-12-02Fix @code escapesNeil Fuller
The body of {@code} must not be HTML escaped. This is one of several changes that fix the source in conjunction with a doclava fix. Bug: 25757239 Change-Id: Ib38a0fa2dd2a3d68e467f78a812071e763d7e881
2015-11-30Docs: Update to Japanese localization of Material Design docs.David Friedman
Bug: 23090399 Change-Id: Ifbad006309d4bdaa74ce8cd6c919fec79d5fee23
2015-11-25Docs: Removes obsoleted material.David Friedman
Bug: N/A This change reverts away from the temporary "Dev Summit" announcement that dominated the Android top landing page--the summit is now over. Also removing some M-Preview directories that had persisted in the non-English areas of DAC. Change-Id: I650345edc9be57875d4306cd4ab87603d6f69fa5
2015-10-15Localization of Android Material Design pages.David Friedman
Bug: 19125767 Change-Id: Iadf0674c45d6328258f749f602096a4f32b8c8e1
2015-10-08Fix display issue with intl/index landings.Dirk Dougherty
Change-Id: I75ee25455106b6a89baec235f0a110f9bbca5460
2015-10-05Docs: Reverts non-English pages back to using "sdk" for page.template.David Friedman
ag/783575 changed this value to "sdkl10n" with the intent of using a different sdk template page for non-English files. This turns out to be unnecessary, and it's better for all pages to be on the same sdkpage.cs template, so I'm reverting. Change-Id: I2abba803cb77472f97ee5be074c2cac7d46ed643
2015-10-04Docs: L10N: Fixes layout anomalies; updates text for Marshmallow, Studio 1.4David Friedman
Change-Id: Ie8fda85ccc034c0ac1230e4b5d7d70cb02f494a9
2015-10-02Docs: Localization of Android fundamentalsDavid Friedman
Bug: 20503562 Change-Id: I3ea2cb1108021ef4409b7788dcc22bfefccc074c
2015-10-03Merge "Localization for Android fundamentals Bug: 20503562" into mnc-mr-docsDavid Friedman
2015-10-02Localization for Android fundamentalsDavid Friedman
Bug: 20503562 Change-Id: Ia98618932aef2b92a48e4d6e69749c220161722f
2015-09-29Doc change: updates to mm pages.Dirk Dougherty
Change-Id: I676cb362c3efc0cff5ebb1c494a03bf1c117f0e5
2015-09-22Merge "resolved conflicts for 4f68b784 to mnc-preview-docs" into ↵Joe Fernandez
mnc-preview-docs
2015-09-22resolved conflicts for 4f68b784 to mnc-preview-docsJoe Fernandez
Change-Id: I850c65b3f1491d332a7d677d8e04c1ade67f6ba4
2015-09-11Merge "Localization of Android Material Design pages. Bug: 19125767" into ↵David Friedman
lmp-docs
2015-08-27Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3.David Friedman
Change-Id: I031bfbec9673699ef3f8680612b67dcb143882e7
2015-07-10Docs: Fixes to Preview "Program Overview" page; rewording on "Support" pageDavid Friedman
Fixes broken anchors in yellow banner on English version. Adds the banner to non-English version pages. Adjusted wording for a Known Issue on the "Support and Release Notes" page. Change-Id: Ia1db8db34cec854bcc4ad7daa1ad44fa23fc878e
2015-07-09Docs: Revisions to top DAC landing page and several Preview-page revisions.David Friedman
Top landing page now has a link direct to Preview 2. The "Program Overview" now explicitly mentions that Preview 2 is available, and is updated so that it no longer refers to Previews 1 and 2 in the future tense. "Support" page is renamed to "Support and Release Notes." TOC revised to reflect new page name. Direct links to Preview 2 are added to the respective languages' Preview landing pages. Change-Id: Ic463b123b25224b7064b4771faa79bdfe63e9ff5
2015-07-08Docs: Changes to the "Support" preview page.David Friedman
Removal of the (now-outdated) non-English versions; corresponding adjustments to the related TOC file; edits to the English version. Change-Id: Iec797963f355faf1034911d74d1d9580aaf0bc76
2015-07-09Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" ↵David Friedman
pages." into mnc-preview-docs