summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into ↵David Friedman2015-07-0236-5/+11584
|\ | | | | | | mnc-preview-docs
| * Docs: Localization of Design pages on DAC.David Friedman2015-07-0136-5/+11584
| | | | | | | | | | | | Bug: 20503708 Change-Id: Id3a4f5900d99125a1475d939d43444f46555018c
* | Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding ↵David Friedman2015-07-0210-215/+215
|\ \ | | | | | | | | | docs" into mnc-preview-docs
| * | Docs: Fixes a terminology error in simplified Chinese on-boarding docsDavid Friedman2015-07-0110-215/+215
| | | | | | | | | | | | Change-Id: Ib0ba3d449e78a0a69c0f704399b3865380bfcc8f
* | | Merge "Docs: Fixes metadata that was getting mangled in jd_lists_unified ↵David Friedman2015-07-013-9/+9
|\ \ \ | |/ / |/| | | | | file." into mnc-preview-docs
| * | Docs: Fixes metadata that was getting mangled in jd_lists_unified file.David Friedman2015-06-303-9/+9
| |/ | | | | | | | | | | This fixes a regression introduced in the CL for bug 21789313. Change-Id: Ic7829d9a33356261c562c814f0873bb352f0655b
* | Merge "Docs: Localizations of Android dev on-boarding training docs. Bug: ↵David Friedman2015-07-0179-10/+14945
|\ \ | | | | | | | | | 20503574" into mnc-preview-docs
| * | Docs: Localizations of Android dev on-boarding training docs.David Friedman2015-07-0179-10/+14945
| |/ | | | | | | | | | | Bug: 20503574 Change-Id: I348ca743dc106eef7cca5ff8d9855398fc3b3b54
* | Docs: Adding localized TOC for Preview docs.David Friedman2015-07-011-8/+37
| | | | | | | | | | | | This change is associated with Bug 21789313 and CL 718631. Change-Id: Ifb5db3d80fe01cc3f99000b812f9570777c39228
* | Merge "docs: Added warning to not use Android Key when API key is required" ↵Robert Schaub2015-06-301-1/+1
|\ \ | | | | | | | | | into mnc-preview-docs
| * | docs: Added warning to not use Android Key when API key is requiredRobert Schaub2015-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 19937308 Staged at: http://rschaub.mtv.corp.google.com:9000/training/safetynet/index.html Change-Id: Icb763858bb7ababdad7631a58a31f3a26571e65d
* | | docs: Studio 1.3 new install and feature sectionsRich Slogar2015-06-308-329/+455
| | | | | | | | | | | | Change-Id: I1bf6d1fa60b01b404a01cc3b5f45753a764d6f31
* | | Merge "docs: migration guide link update" into mnc-preview-docsRich Slogar2015-06-301-4/+4
|\ \ \
| * | | docs: migration guide link updateRich Slogar2015-06-301-4/+4
| | |/ | |/| | | | | | | | | | | | | b.android/178474 Change-Id: Ie0c54b1eb4d47426da4e09cfea0ede7dde3c7a91
* | | Merge "docs: Move scale Bitmap code to onSurfaceChanged" into mnc-preview-docsLuan Nguyen2015-06-301-10/+17
|\ \ \
| * | | docs: Move scale Bitmap code to onSurfaceChangedLuan Nguyen2015-06-301-10/+17
| | | | | | | | | | | | | | | | | | | | bug: 21099578 Change-Id: I5e8d1c6c1757ec512ff2695689bc5b8c2c88706f
* | | | Merge "docs: studio workflow page typo" into mnc-preview-docsRich Slogar2015-06-301-7/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | docs: studio workflow page typoRich Slogar2015-06-301-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | b.android/178485 Change-Id: I26da96cd5d08ad72c99dba9a72a427d050986507
* | | | Merge "Docs: Localized M-Preview pages Bug: 21789313" into mnc-preview-docsDavid Friedman2015-06-3039-0/+14554
|\ \ \ \
| * | | | Docs: Localized M-Preview pagesDavid Friedman2015-06-2939-0/+14554
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21789313 Change-Id: Ifb4a45a65acd7b786e05bdf7b7dd86698093fbdf
* | | | | Merge "docs: Clarified when you can put the fragments in the root view." ↵Andrew Solovay2015-06-291-5/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into mnc-preview-docs
| * | | | docs: Clarified when you can put the fragments in the root view.Andrew Solovay2015-06-221-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per bug b/10641907, putting fragments in the root view *only* works if the device runs Android 3.0 or later. Chris and Adam say we don't really want to suggest that work flow even for these devices, so I'm taking that info out. bug: 10641907 Change-Id: Ie44acbb534b8e0cea8dbbfaaf2c65836b1c31be6
* | | | | am 268a7c19: am fc7e84b3: Merge "docs: manifest merger updates" into lmp-docsRich Slogar2015-06-262-0/+512
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '268a7c190c37a7a63bd1134c4dfb8aacf71c211e': docs: manifest merger updates
| * \ \ \ \ am fc7e84b3: Merge "docs: manifest merger updates" into lmp-docsRich Slogar2015-06-262-0/+512
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc7e84b36b77ac95e61bd1736eebdc307ba6e09e': docs: manifest merger updates
| | * \ \ \ \ Merge "docs: manifest merger updates" into lmp-docsRich Slogar2015-06-262-0/+512
| | |\ \ \ \ \
| | | * | | | | docs: manifest merger updatesRich Slogar2015-06-262-0/+512
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a1c311ba08077b15ee1823146773b7d07162dd4
* | | | | | | | Docs: Added declaration to code fragmentRobert Schaub2015-06-261-1/+2
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21030774 Change-Id: Ic906454b20ec9606e5ca11a0fbd0388492eecf42
* | | | | | | am b0afc540: docs: Eclipse ADT end-of-life noteRich Slogar2015-06-263-18/+26
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b0afc540ebee64ded367ce34ae8f61cb8c2478e7': docs: Eclipse ADT end-of-life note
| * | | | | | docs: Eclipse ADT end-of-life noteRich Slogar2015-06-253-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5fe9de7145104191d330259c7e16ea14cc4a651e
* | | | | | | am fa5f184f: docs: studio migration guideRich Slogar2015-06-2611-102/+1028
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'fa5f184faf7da28e3a6d2acd18bb9bfaac4eb2f1': docs: studio migration guide
| * | | | | | docs: studio migration guideRich Slogar2015-06-2511-102/+1028
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/20093866 Change-Id: Ib1eed6870aaee6230a083ec5f126a36b4b3a014d
* | | | | | | Merge "docs: Removed sentence from permissions doc" into mnc-preview-docsRobert Schaub2015-06-251-3/+1
|\ \ \ \ \ \ \
| * | | | | | | docs: Removed sentence from permissions docRobert Schaub2015-06-241-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21788582 Change-Id: Ifffed46dece0adb00671199c26c2fe995c4179ea
* | | | | | | | Merge "docs: Update Android support page" into mnc-preview-docsJoe Fernandez2015-06-241-73/+89
|\ \ \ \ \ \ \ \
| * | | | | | | | docs: Update Android support pageJoe Fernandez2015-06-241-73/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove Helpouts - remove Merchant issue reporting link - remove other dead links - clean up page code b\18579472 b\19355066 Change-Id: If55aa57b11604bdd328c55e26ad5bd4ba0b32de7
* | | | | | | | | docs: Added "Single Use Devices" video to Android for Work main pageAndrew Solovay2015-06-241-1/+2
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See first comment for doc stage location. Change-Id: I0b64f8462eebc5d11c7972fd49147fdd1d6cdd3a
* | | | | | | | am fdad629f: am 6859a9f0: Merge "docs: Pare down the adb guide and remove ↵Luan Nguyen2015-06-247-968/+922
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sections that are duplicated in the tools list." into lmp-docs * commit 'fdad629fc089783fa0b3caad62ba99a9083f8645': docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
| * | | | | | | am 6859a9f0: Merge "docs: Pare down the adb guide and remove sections that ↵Luan Nguyen2015-06-247-968/+922
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are duplicated in the tools list." into lmp-docs * commit '6859a9f09049d1dc760b98a6cbb278b591de63a6': docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
| | * | | | | | Merge "docs: Pare down the adb guide and remove sections that are duplicated ↵Luan Nguyen2015-06-247-968/+922
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | in the tools list." into lmp-docs
| | | * | | | | | docs: Pare down the adb guide and remove sections that are duplicatedLuan Nguyen2015-06-227-968/+922
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the tools list. bug: 12879186 Change-Id: Ic2d17ef29eac15a9ffc40e05b056dc17d71069e8
* | | | | | | | | Doc change: Explicitly state the initial API level that supports ↵Dirk Dougherty2015-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maxSdkVersion attr in uses-permission. Change-Id: Ifb20f84560dc1c8655b8d216038a2b56777df460
* | | | | | | | | Doc change: update main landing and distribute carousel items. Fix typo in ↵Dirk Dougherty2015-06-2214-24/+112
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Google Play card. Change-Id: I94b8cfbf5d0afab3d6e6db658a2e73817de9967c
* | | | | | | | Merge "docs: Add link from TV design page on DAC to Android TV spec on ↵Quddus Chong2015-06-191-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Google Design site. bug: 21786976" into mnc-preview-docs
| * | | | | | | | docs: Add link from TV design page on DAC to Android TV spec on Google ↵Quddus Chong2015-06-191-0/+6
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Design site. bug: 21786976 Change-Id: I7bee3feaa60d5a1a35ce2c1d93b957de150e9b86
* | | | | | | | Merge "docs: Updated Recommending TV Content lesson to support card ↵Quddus Chong2015-06-191-15/+43
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | customization. bug: 21787002" into mnc-preview-docs
| * | | | | | | | docs: Updated Recommending TV Content lesson to support card customization.Quddus Chong2015-06-191-15/+43
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 21787002 Change-Id: I3c94fbce2ac7efff1749b76af3da47506812972c
* | | | | | | | Fixes a typo where parens were used instead of curly braces, preventingDavid Friedman2015-06-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a link from being created at build time. Change-Id: I4086ce5054cc2d5cacd72314810b626aee50df62 (cherry picked from commit e62f4540cd6ce6289fb0196c8e30c3a3d6905794)
* | | | | | | | docs: Design section fixes for new templatesLuan Nguyen2015-06-195-126/+90
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix a number of pages in the Wear design docs bug: 21762391 Change-Id: I26c18130cdd925d1b40f525dd209329ca2b5cd15
* | | | | | | am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docsJoe Fernandez2015-06-191-7/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit '003f8567defcb88b2e07b3f85f0b43f74d29b322': updates: build-cmdline-update
| * | | | | | Merge "updates: build-cmdline-update" into lmp-mr1-ub-docsJoe Fernandez2015-06-191-7/+0
| |\ \ \ \ \ \