drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,210 Commits 1 Branch 0 Tags
Commit Graph

70 Commits

Author SHA1 Message Date
Mark Lu
3b6a1a624c docs: fix syntax error in "Saving Files" document 
The second code sample in section "Save a File on Internal Storage"
is missing a "}" brace in the try block. This commit adds the brace
to all languages of the document.

Bug: 25963385
Change-Id: I4b83ad7e7e081c0e3f036c5b9a36c8ff5489754b
 2016-06-23 18:32:33 -07:00
Aurimas Liutikas
68d5e4b9ff Merge \\"Fix broken {@docRoot} links\\" into mnc-io-docs am: a0fa50e40b 
am: 423fe7db6a

Change-Id: I192297bc254d199e25249952591b3b2a1fc2b617
 2016-06-14 17:37:38 +00:00
Aurimas Liutikas
423fe7db6a Merge \"Fix broken {@docRoot} links\" into mnc-io-docs 
am: a0fa50e40b

Change-Id: I7dd53f31f44262e09624d23d820723893aaba5c7
 2016-06-14 17:27:57 +00:00
Aurimas Liutikas
abc918b76a Fix broken {@docRoot} links 
Some {@docRoot} links were followed by a "/" causing links to break.

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

Change-Id: Ic5923ee447c55ac2aa95af365ae63425041e4fcf
(cherry picked from commit e0af48d190114afcd0c7a615187fd524aecda512)
 2016-06-14 00:32:22 +00:00
Amanda Kassay
29b04437b1 Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs am: cb3ae33cfe 
am: a475ff360c

* commit 'a475ff360c9457ecbef6af97ca7228dc9cd5c139':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: Ibe99c1f7e47acacf7b60f8ad66a7a3d658776413
 2016-05-25 21:50:13 +00:00
Amanda Kassay
a475ff360c Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs 
am: cb3ae33cfe

* commit 'cb3ae33cfe5fdb73e648dc08bdf2ea0b19116b86':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: I33fec5a25e6648db7b6fd0da06794c0ce7bd8ed5
 2016-05-25 21:35:54 +00:00
Amanda Kassay
c68d8768c8 Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." 
This reverts commit 85b7df26975997826a738a46ae4ab797941175ea.

Change-Id: I5c0256cbdc0f3c3588f10eb5accef8cf68642bbb
 2016-05-25 17:14:08 -04:00
Amanda Kassay
0a6d5112f1 Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d 
am: 5a00e9d345

* commit '5a00e9d3450e0baccc89a88e586f8ce558e14aac':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: I1d972ef1511ff8205ec54f1af7241db104ea976a
 2016-05-24 21:28:50 +00:00
Amanda Kassay
5a00e9d345 Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 
am: e468c2380d

* commit 'e468c2380ddcc1a7c1f2fa3c9995ad999e9c0ca8':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: Ibb8848aed348e85fff5a47562212e88172557b0b
 2016-05-24 21:23:50 +00:00
Amanda Kassay
85b7df2697 Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. 
b/28917925

Related CL (critique): cl/123138252

Staged:
https://android-dot-devsite.googleplex.com/preview/setup-sdk.html?hl=es

Change-Id: I4eb606c0205af2315896fc0587cc1c4c2502f282
 2016-05-24 20:25:47 +00:00
Dirk Dougherty
de84a27872 Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am: 0a957d5aa2 am: b33f36497d 
am: a4101e6693

* commit 'a4101e66933fd5acb882bfc0311f3f4b5cbd5b11':
  Update default image for n preview docs. Update tools resources.

Change-Id: I859659905ab0bdd7e16a2406542c0cac69e1f4d7
 2016-05-16 22:41:55 +00:00
Dirk Dougherty
a4101e6693 Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am: 0a957d5aa2 
am: b33f36497d

* commit 'b33f36497dbc7265ee16323ee6c0281690ca3221':
  Update default image for n preview docs. Update tools resources.

Change-Id: I1ed7ac4ecf30538252d4b277b1baf93ec61e4835
 2016-05-16 22:35:33 +00:00
Dirk Dougherty
9ae42db319 Update default image for n preview docs. Update tools resources. 
Change-Id: I25dcaa9ad0a0b44e84aff49a08481b643b03ea28
 2016-05-16 13:55:23 -07:00
Dirk Dougherty
b72bf5cfdd Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am: 3a263cec30 am: 6d3ca9aaa9 
am: 0e4b51ebc6

* commit '0e4b51ebc6b86a535a9f7757e8b64f70a10aaa30':
  Correct the DP2 status beta -> alpha.

Change-Id: I9fded988b946d669f9560716563771f8e6b82351
 2016-05-13 18:16:15 +00:00
Dirk Dougherty
0e4b51ebc6 Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am: 3a263cec30 
am: 6d3ca9aaa9

* commit '6d3ca9aaa91328d3664a217fee8a49c9ee46858e':
  Correct the DP2 status beta -> alpha.

Change-Id: Iecc460e2b5399bff284f8d2479d475325fc8a1df
 2016-05-13 18:13:40 +00:00
Dirk Dougherty
d9ad1ca8fb Correct the DP2 status beta -> alpha. 
Bug: 28175714
Change-Id: I050c9a41961528c1d65cd9b9737d93c82d16aef2
 2016-05-13 11:01:46 -07:00
Dirk Dougherty
01a89bebeb Merge "Remove broken video embed." into mnc-mr-docs am: 80a3c76891 am: 1d5d20fba9 
am: 0519569eaa

* commit '0519569eaaeb5dd3dd3edaeb572346a871c9aa3f':
  Remove broken video embed.

Change-Id: Ia29d6f0b0eb45161e7089ca6d888c975692cd7de
 2016-05-12 02:42:09 +00:00
Dirk Dougherty
0519569eaa Merge "Remove broken video embed." into mnc-mr-docs am: 80a3c76891 
am: 1d5d20fba9

* commit '1d5d20fba982fcca5c6664b52bbef803126820ae':
  Remove broken video embed.

Change-Id: I23f583a4dd1d7f236d1a156683eff9be09f8fa25
 2016-05-12 02:28:32 +00:00
Dirk Dougherty
9f1aceb30a Remove broken video embed. 
Change-Id: I74ee6f4c35efb45ab78e3feff7c8e0b0c01f772f
 2016-05-11 18:48:49 -07:00
smain@google.com
bb4f1b4d75 Merge "delete outdated translated versions of sdk/tools pages bug: 28425669 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-03 00:34:52 +00:00
Scott Main
7d1245d36b Merge "delete outdated translated versions of sdk/tools pages bug: 28425669 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-03 00:31:44 +00:00
smain@google.com
251a0650a8 delete outdated translated versions of sdk/tools pages 
bug: 28425669
bug: 28471385

Change-Id: Id81461f30f638734470ab9880509e76e4df68ce1
 2016-05-02 13:40:45 -07:00
David Friedman
5256b6ce15 Merge "Docs: Localized DAC pages for N Preview." into mnc-mr-docs am: e20502c240 am: 1c2ce95 
am: 25a92f0

* commit '25a92f0762ea5fc1e60f00b6f7634ffccc8265cd':
  Docs: Localized DAC pages for N Preview.

Change-Id: I6bc25875398fbad13821095a5e0115969620fcdb
 2016-04-27 05:42:07 +00:00
David Friedman
25a92f0762 Merge "Docs: Localized DAC pages for N Preview." into mnc-mr-docs am: e20502c240 
am: 1c2ce95

* commit '1c2ce9522e9203396bf45dcf7fc87a7d17095e59':
  Docs: Localized DAC pages for N Preview.

Change-Id: Iae1e3d6bee0be9af2e64fff29a2ac4d02f3e0235
 2016-04-26 08:51:21 +00:00
David Friedman
8f1f66f061 Docs: Localized DAC pages for N Preview. 
Change-Id: I5f6e3784bc1a3134dcd71fe06cfa9bffd300a647
 2016-04-20 20:52:52 -07:00
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev 
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-19 02:03:59 -07:00
Trevor Johns
a5060ee80d Merge branch 'mnc-mr-docs' into mnc-ub-dev 
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-04-05 20:32:07 -07:00
Dirk Dougherty
b890729216 docs: Update install/uninstall procedure for Nexus & non-Nexus devices 
Include download links for seed device. Adjust various references to
DP device range.

Change-Id: I01ecaaf46e128fec811e8142395cfa8f09758fd6
 2016-03-10 14:45:02 -08:00
Dirk Dougherty
fda5d954be Update intl landing pages for preview. 
Change-Id: I2178dfe422ab7a93223cdfede4b1c7152b154d00
 2016-03-09 11:35:04 -08:00
Joe Fernandez
b06fc4b67e docs: Update terms of the SDK licensing agreement 
Updating per instructions from Tristan Ostrowski <tostrowski@google.com>
b/24584030

Change-Id: I9ce7d36428a6f63ad83fcde3b9f1be99b7a7a496
 2016-03-02 16:31:46 -08:00
Dirk Dougherty
ef4e6c763b Fix some localization issues. Remove spurious pages at 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-30 15:21:56 -08:00
Dirk Dougherty
dc20ea3e24 Merge "Move page-defined hdf values for sdk into a central file" into mnc-docs 2016-01-30 19:06:37 +00:00
Dirk Dougherty
6854ee0385 Move page-defined hdf values for sdk into a central file 
Change-Id: Ic814718830ceda66732a261a051b5994a77cafa6
 2016-01-29 13:48:44 -08:00
Dirk Dougherty
31ae1c518f Doc change: adjustments for design updates. 
Change-Id: Ic798228a75ba2ab692fd3e36034606c04651c20c
 2016-01-28 17:10:09 -08:00
David Friedman
cb62e5301d Docs: Localization of Android design pages 
Bug: 23090876
Change-Id: I2a19a5ba77b3a3b26ec4846a4f431ffe09a46066
 2015-12-21 14:12:27 -08:00
David Friedman
dee655c406 Docs: Material Design L10N update. All languages except es, ja. 
Bug: 23090399
Change-Id: I0389fcff3b012a4ae4d92529574847e4a1685729
 2015-12-21 13:10:23 -08:00
Neil Fuller
71fbb81b14 Fix @code escapes 
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-12-02 14:24:11 +00:00
David Friedman
ee68a70fa4 Docs: Removes obsoleted material. 
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-11-25 17:15:22 -08:00
David Friedman
ec787018c2 Localization of Android Material Design pages. 
Bug: 19125767

Change-Id: Iadf0674c45d6328258f749f602096a4f32b8c8e1
 2015-10-15 16:34:51 -07:00
Dirk Dougherty
1560d036d5 Fix display issue with intl/index landings. 
Change-Id: I75ee25455106b6a89baec235f0a110f9bbca5460
 2015-10-08 18:10:05 +00:00
David Friedman
15bc9ba1ae Docs: Reverts non-English pages back to using "sdk" for page.template. 
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-05 11:38:45 -07:00
David Friedman
43e7468ca9 Docs: L10N: Fixes layout anomalies; updates text for Marshmallow, Studio 1.4 
Change-Id: Ie8fda85ccc034c0ac1230e4b5d7d70cb02f494a9
 2015-10-04 00:58:48 -07:00
David Friedman
2762377a48 Docs: Localization of Android fundamentals 
Bug: 20503562

Change-Id: I3ea2cb1108021ef4409b7788dcc22bfefccc074c
 2015-10-02 21:20:38 -07:00
David Friedman
91c19a34e8 Merge "Localization for Android fundamentals Bug: 20503562" into mnc-mr-docs 2015-10-03 03:06:55 +00:00
David Friedman
bfbd27b84f Localization for Android fundamentals 
Bug: 20503562

Change-Id: Ia98618932aef2b92a48e4d6e69749c220161722f
 2015-10-02 14:10:56 -07:00
Dirk Dougherty
5cd8cb0279 Doc change: updates to mm pages. 
Change-Id: I676cb362c3efc0cff5ebb1c494a03bf1c117f0e5
 2015-09-29 03:04:41 -07:00
Joe Fernandez
6e9eb7238d Merge "resolved conflicts for 4f68b784 to mnc-preview-docs" into mnc-preview-docs 2015-09-22 17:00:25 +00:00
Joe Fernandez
2be96a1f66 resolved conflicts for 4f68b784 to mnc-preview-docs 
Change-Id: I850c65b3f1491d332a7d677d8e04c1ade67f6ba4
 2015-09-22 09:57:35 -07:00
David Friedman
a7ab46d134 Merge "Localization of Android Material Design pages. Bug: 19125767" into lmp-docs 2015-09-11 06:01:11 +00:00
David Friedman
1864bf13d4 Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3. 
Change-Id: I031bfbec9673699ef3f8680612b67dcb143882e7
 2015-08-27 15:43:04 -07:00