summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-devDerek Sollenberger2015-06-221-1/+1
|\
| * Enable Picture w/ HW Accelerated Canvas.Derek Sollenberger2015-06-221-1/+1
| | | | | | | | | | Bug: 20688645 Change-Id: I664f37d6dbb3e61b17206c82ebcc63f988cefc65
* | am 0bdd3204: am 4437a129: Merge "docs: Add link from TV design page on DAC ↵Quddus Chong2015-06-201-0/+6
|\ \ | | | | | | | | | | | | | | | | | | to Android TV spec on Google Design site. bug: 21786976" into mnc-preview-docs * commit '0bdd320402aa3406ece0afd1c89bcd00c21b3f7a': docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug: 21786976
| * \ am 4437a129: Merge "docs: Add link from TV design page on DAC to Android TV ↵Quddus Chong2015-06-191-0/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | spec on Google Design site. bug: 21786976" into mnc-preview-docs * commit '4437a1294e26507449b48783a31b422d769af53b': docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug: 21786976
| | * \ 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
* | | | | am a5de0f30: am cdc28652: Merge "docs: Updated Recommending TV Content ↵Quddus Chong2015-06-201-15/+43
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | lesson to support card customization. bug: 21787002" into mnc-preview-docs * commit 'a5de0f30cf9edfb980f5da3e8329eeb60d77057d': docs: Updated Recommending TV Content lesson to support card customization. bug: 21787002
| * | | | am cdc28652: Merge "docs: Updated Recommending TV Content lesson to support ↵Quddus Chong2015-06-191-15/+43
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | card customization. bug: 21787002" into mnc-preview-docs * commit 'cdc28652601d977bd0964d088b9070f6d2ef32d9': docs: Updated Recommending TV Content lesson to support card customization. bug: 21787002
| | * | | 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
* | | | | | am c3fbb0ce: am bee8d60a: Fixes a typo where parens were used instead of ↵David Friedman2015-06-191-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | curly braces, preventing a link from being created at build time. * commit 'c3fbb0ce6c04ea5ece37bf4529271cb14296135b': Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
| * | | | | am bee8d60a: Fixes a typo where parens were used instead of curly braces, ↵David Friedman2015-06-191-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preventing a link from being created at build time. * commit 'bee8d60a1cdfb380904f8770d933e9031c7f9ff3': Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
| | * | | | 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)
* | | | | | am cadd531e: am 4fdaf938: docs: Design section fixes for new templatesLuan Nguyen2015-06-195-126/+90
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'cadd531ecf740783ee77ed5de8481a8242e4e8c8': docs: Design section fixes for new templates
| * | | | | am 4fdaf938: docs: Design section fixes for new templatesLuan Nguyen2015-06-195-126/+90
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '4fdaf938ee28577324a3068b915c01deb61ade78': docs: Design section fixes for new templates
| | * | | | 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 a8b518d7: am 041e01bb: am 003f8567: Merge "updates: build-cmdline-update" ↵Joe Fernandez2015-06-191-7/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-ub-docs * commit 'a8b518d7c2ca006ad52d5900ebb3ca831490d373': updates: build-cmdline-update
| * | | | | am 041e01bb: am 003f8567: Merge "updates: build-cmdline-update" into ↵Joe Fernandez2015-06-191-7/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-ub-docs * commit '041e01bbdffa85b9b5ffba201d36bd566eaa2651': updates: build-cmdline-update
| | * | | | 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
| | | |\ \ \ \
| | | | * | | | updates: build-cmdline-updateRich Slogar2015-06-091-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b.android/175610 Change-Id: I712ded3e024685b35ae98f8517958db330890c18
* | | | | | | | am d9d05fe3: am 838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into ↵Rich Slogar2015-06-192-12/+43
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs * commit 'd9d05fe358c96e85149627d955191d1328e9924a': docs: sdk-tools 24.3.3 updates
| * | | | | | | am 838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docsRich Slogar2015-06-182-12/+43
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '838e4aa6e69f6482adfdde2e45867a36dc1db2b0': docs: sdk-tools 24.3.3 updates
| | * | | | | | Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docsRich Slogar2015-06-182-12/+43
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | docs: sdk-tools 24.3.3 updatesRich Slogar2015-06-182-12/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30267355dc17cd6451b28b2aca6d639b9af320d4
* | | | | | | | Merge "Improve documentation for keys requiring user auth." into mnc-devAlex Klyubin2015-06-171-23/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve documentation for keys requiring user auth.Alex Klyubin2015-06-171-23/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18088752 Change-Id: I24eeb33790a74d8d81d10fcdb1eb058d47144c44
* | | | | | | | | am 93bd8134: am eae09b4a: Merge "docs: Updated Android TV landing page and ↵Quddus Chong2015-06-173-9/+44
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Live TV training to support channels. bug: 21786387" into mnc-preview-docs * commit '93bd81346de88f850f4e4002229a3119c97d8ddb': docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387
| * | | | | | | | am eae09b4a: Merge "docs: Updated Android TV landing page and Live TV ↵Quddus Chong2015-06-173-9/+44
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | training to support channels. bug: 21786387" into mnc-preview-docs * commit 'eae09b4a642bb30d5fd8ff90796e410197d71c95': docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387
| | * | | | | | | Merge "docs: Updated Android TV landing page and Live TV training to support ↵Quddus Chong2015-06-173-9/+44
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | channels. bug: 21786387" into mnc-preview-docs
| | | * | | | | | docs: Updated Android TV landing page and Live TV training to support channels.Quddus Chong2015-06-163-9/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 21786387 Change-Id: I343e00d30d25f46a9081af339ee4c4a2fddba149
* | | | | | | | | am 0752aa54: am 5cef09b0: Merge "docs: Update JavaDoc links for Watch Face ↵Luan Nguyen2015-06-175-52/+105
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class." into mnc-preview-docs * commit '0752aa54a03b39e2a16e6f40e4d7cf912a29bd08': docs: Update JavaDoc links for Watch Face class.
| * | | | | | | | am 5cef09b0: Merge "docs: Update JavaDoc links for Watch Face class." into ↵Luan Nguyen2015-06-175-52/+105
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs * commit '5cef09b07521cf14eb6a9c9dc59276b9b6482bef': docs: Update JavaDoc links for Watch Face class.
| | * | | | | | | Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docsLuan Nguyen2015-06-175-52/+105
| | |\ \ \ \ \ \ \
| | | * | | | | | | docs: Update JavaDoc links for Watch Face class.Luan Nguyen2015-06-125-52/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 21731309 Change-Id: I4d0899f42e3150aad399efc8d1e1e4f63dc6bc9d
* | | | | | | | | | am ce26f291: am 5980ae8f: Merge "docs: Update JavaDoc reference links for ↵Luan Nguyen2015-06-172-56/+117
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create Wearable Apps class" into mnc-preview-docs * commit 'ce26f2911361fe1da9d3f350e2785657d6d5e685': docs: Update JavaDoc reference links for Create Wearable Apps class
| * | | | | | | | | am 5980ae8f: Merge "docs: Update JavaDoc reference links for Create Wearable ↵Luan Nguyen2015-06-172-56/+117
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps class" into mnc-preview-docs * commit '5980ae8f06d5a56a5bfc763729533d975079b801': docs: Update JavaDoc reference links for Create Wearable Apps class
| | * | | | | | | | Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" ↵Luan Nguyen2015-06-172-56/+117
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-preview-docs
| | | * | | | | | | | docs: Update JavaDoc reference links for Create Wearable Apps classLuan Nguyen2015-06-152-56/+117
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 21723175 Change-Id: I3afc72be12e4c08b8dfa0380e315ef5709e2b27c
* | | | | | | | | | am 474b4775: am d548b29d: Merge "docs: Update JavaDoc ref links for UI ↵Luan Nguyen2015-06-176-127/+247
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | training." into mnc-preview-docs * commit '474b4775edb0154ad8f5b85a53fb2c689de69b40': docs: Update JavaDoc ref links for UI training.
| * | | | | | | | | am d548b29d: Merge "docs: Update JavaDoc ref links for UI training." into ↵Luan Nguyen2015-06-176-127/+247
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs * commit 'd548b29def4006c0a19df090189198e51715bccd': docs: Update JavaDoc ref links for UI training.
| | * | | | | | | | Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docsLuan Nguyen2015-06-176-127/+247
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | docs: Update JavaDoc ref links for UI training.Luan Nguyen2015-06-126-127/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update sample snippets in 2d-picker. bug: 21660558 bug: 19059844 Change-Id: Ibc156a21329d1549f6d33ed75130f7b6edda85b2
* | | | | | | | | | | am 31217aa5: am e343e673: Merge "Update landing page link to skip the ↵Joe Fernandez2015-06-172-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview landing page plus copy edit" into mnc-preview-docs * commit '31217aa591e4f0acc5937d51a2455c36b44da7e2': Update landing page link to skip the Preview landing page plus copy edit
| * | | | | | | | | | am e343e673: Merge "Update landing page link to skip the Preview landing ↵Joe Fernandez2015-06-172-5/+5
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page plus copy edit" into mnc-preview-docs * commit 'e343e673eca0c0e3b943ce7ddd27b37e29a873f4': Update landing page link to skip the Preview landing page plus copy edit
| | * | | | | | | | | Merge "Update landing page link to skip the Preview landing page plus copy ↵Joe Fernandez2015-06-162-5/+5
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edit" into mnc-preview-docs
| | | * | | | | | | | | Update landing page link to skip the Preview landing pagesmain@google.com2015-06-052-5/+5
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plus copy edit Change-Id: I1bd38b7647e8019a5a656b967c422f8c22261bb0
* | | | | | | | | | | am 83ee59d5: am 375ad9e1: docs: Updated the TV docs to indicate that ↵Quddus Chong2015-06-161-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SUGGEST_COLUMN_DURATION is required. bug: 21400628 * commit '83ee59d5de365669cd7a9d8bfa552a90678d0587': docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628
| * | | | | | | | | | am 375ad9e1: docs: Updated the TV docs to indicate that ↵Quddus Chong2015-06-161-1/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SUGGEST_COLUMN_DURATION is required. bug: 21400628 * commit '375ad9e1ebc327b87f378f1e0d3cf12f058e5f36': docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628
| | * | | | | | | | | docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required.Quddus Chong2015-06-161-1/+2
| | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 21400628 Change-Id: I001cb429b94bed8e6a7524f2b7c6a7ced240f33d