summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
* Merge "docs: Fix metadata description. Add new gesture test. Split layout ↵Luan Nguyen2014-10-241-6/+35
|\ | | | | | | test." into lmp-dev
| * docs: Fix metadata description. Add new gesture test. Split layout test.Luan Nguyen2014-10-241-6/+35
| | | | | | | | Change-Id: I5a8948594af94fa1e7548fc49a0c3946f03d7fc8
* | am aec7c974: am 049db36a: Merge "docs: fixed typo/grammar issues." into ↵Luan Nguyen2014-10-241-2/+2
|\ \ | | | | | | | | | | | | | | | | | | klp-modular-docs * commit 'aec7c974eb223b5608bbd2bb06e11fc397e6ffb2': docs: fixed typo/grammar issues.
| * \ am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docsLuan Nguyen2014-10-241-2/+2
| |\ \ | | | | | | | | | | | | | | | | * commit '049db36afd63b972f971f8bac6a405bc2f9437f4': docs: fixed typo/grammar issues.
| | * \ Merge "docs: fixed typo/grammar issues." into klp-modular-docsLuan Nguyen2014-10-241-2/+2
| | |\ \
| | | * | docs: fixed typo/grammar issues.Luan Nguyen2014-10-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17764345 Change-Id: I0017ba9ce592951ac3ce6f976d7ad1bc0c45f25f
* | | | | am 90f734eb: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview ↵Joe Fernandez2014-10-241-0/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | page" into klp-modular-docs * commit '90f734eb180619eb8ffd2e30580f72b500184f8b': docs:Added 64-bit image note from Preview page
| * | | | am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into ↵Joe Fernandez2014-10-241-0/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-docs * commit '0e893eb7ac1985a02d61525a5e6076d45a1e8c7d': docs:Added 64-bit image note from Preview page
| | * | | Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docsJoe Fernandez2014-10-241-0/+6
| | |\ \ \
| | | * | | docs:Added 64-bit image note from Preview pageRich Slogar2014-10-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7c092d009522ff73454cd6412cbd89ee47466e3f
* | | | | | am bcf9ced4: am 1e5bb861: Link and typo fixedNatalie Masse2014-10-242-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | * commit 'bcf9ced47a123220271fcca70f71c2adf69ad100': Link and typo fixed
| * | | | am 1e5bb861: Link and typo fixedNatalie Masse2014-10-242-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '1e5bb861265072b9af555d09202e49cb38a3c4f1': Link and typo fixed
| | * | | Link and typo fixedNatalie Masse2014-10-172-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie9ace6e002703d7d1f83173da49672cf60ca1653
* | | | | Merge "docs: Fix typo in search class" into lmp-devJoe Fernandez2014-10-241-1/+1
|\ \ \ \ \
| * | | | | docs: Fix typo in search classRicardo Cervera2014-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia1be1f1f3cae60ed9742c8b6d12f6689a48d023f
* | | | | | Merge "docs: Fixed 404 link in SDK Tools page." into lmp-devJoe Fernandez2014-10-241-1/+1
|\ \ \ \ \ \
| * | | | | | docs: Fixed 404 link in SDK Tools page.Ricardo Cervera2014-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17950558 Change-Id: Ibd110b6aa693b4f5f4c8ca46efdb2c32a88f3dd2
* | | | | | | Merge "docs: Fix hprof-conv location in docs." into lmp-devJoe Fernandez2014-10-241-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | docs: Fix hprof-conv location in docs.Ricardo Cervera2014-10-211-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://code.google.com/p/android/issues/detail?id=76691 Change-Id: I8550731c1defe867d26d5ab4568c4935c89e37d6
* | | | | | Merge "docs: Fixing misc minor bugs." into lmp-devJoe Fernandez2014-10-241-1/+1
|\ \ \ \ \ \
| * | | | | | docs: Fixing misc minor bugs.Ricardo Cervera2014-10-211-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13872976 Change-Id: I4ea9893b81d8157bf8699820f25c086fd0c4911c
* | | | | | Merge "docs: Update thumbnail images for resources, update minor text for ↵Luan Nguyen2014-10-238-6/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | WR-GS, and update the title image resolution." into lmp-dev
| * | | | | | docs: Update thumbnail images for resources, update minor text for WR-GS, andLuan Nguyen2014-10-238-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update the title image resolution. Change-Id: I83e89e3969bd6b837074e86a810cf801be3a6caf
* | | | | | | Merge "Docs: Add TOC page for Wearable samples" into lmp-devTrevor Johns2014-10-231-0/+11
|\ \ \ \ \ \ \
| * | | | | | | Docs: Add TOC page for Wearable samplesTrevor Johns2014-10-231-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0fdf412f20fb2a45c34c9700ed1ca9446cfc6ff3
* | | | | | | | Merge "docs: Updating dependency vers nums for support libs." into lmp-devRicardo Cervera2014-10-231-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | docs: Updating dependency vers nums for support libs.Ricardo Cervera2014-10-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b9ce98b8ccccc42790af913a49c27e73610fd50
* | | | | | | | | Merge "docs: Support lib dependency fix. Bug: 18029377" into lmp-devRicardo Cervera2014-10-233-6/+6
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | docs: Support lib dependency fix. Bug: 18029377Ricardo Cervera2014-10-173-6/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I41860903207e3e314b3a695a8f8a865d0a28172b
* | | | | | | | Merge "docs: Add Wear App Quality checklist" into lmp-devJoe Fernandez2014-10-237-3/+2685
|\ \ \ \ \ \ \ \
| * | | | | | | | docs: Add Wear App Quality checklistLuan Nguyen2014-10-227-3/+2685
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I81ef6b3283ffb4d924836a84b52bb04acb301649
* | | | | | | | | Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" ↵Trevor Johns2014-10-231-0/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| * | | | | | | | | Docs: Update /samples/new/index.html for Clockwork Beryl releaseTrevor Johns2014-10-221-0/+15
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added SpeedTracker sample to list of new samples. Change-Id: I88094149ab21b9a24f19bb7693bbce1187b625eb
* | | | | | | | | Merge "docs: Add article describing Location API for Android Wear." into lmp-devJoe Fernandez2014-10-232-0/+381
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | docs: Add article describing Location API for Android Wear.Luan Nguyen2014-10-222-0/+381
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1956be7df8cc875270d45652d1b0d414b6395982
* | | | | | | | Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-devJoe Fernandez2014-10-231-0/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | docs:Build tools revisions 21.01 and 21.02Rich Slogar2014-10-221-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I220f35541e88bf3b5dba1981d7375ecece525e2b
* | | | | | | | | update android workplace screenshotsmain@google.com2014-10-223-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18038081 Change-Id: I6cc59cf002000ee2c938e634ef3662fbba2c70cc
* | | | | | | | | fix a few of the tags for helpouts compatibilitysmain@google.com2014-10-224-4/+5
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic7f6f281c937bcba8690a50ce1c5417689993352
* | | | | | | | Merge "some fixes to TV App quality and TV games doc. add section to TV ↵smain@google.com2014-10-234-44/+75
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." into lmp-dev
| * | | | | | | | some fixes to TV App quality and TV games doc.smain@google.com2014-10-214-44/+75
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions. Change-Id: I6f61a0d4fd976098a6db9ded33c61419a764ad4f
* | | | | | | | Merge "add helpouts widget to first round of pages" into lmp-devsmain@google.com2014-10-228-21/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | add helpouts widget to first round of pagessmain@google.com2014-10-228-21/+29
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2afafb2bf682c5d514eb1adde27bf0277e709198
* | | | | | | | docs:Update 4.4W for Wear GPS suppportRich Slogar2014-10-221-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1fc5699c84d2c29b26730a949858f9cd6eba4bbe
* | | | | | | | Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-devRicardo Cervera2014-10-221-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | docs: Removing extra semicolons in Wear notif examples.Ricardo Cervera2014-10-211-2/+2
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17053734 Change-Id: If11b711e2797eeb2fc392e0658d644c585e4bc54
* | | | | | | | docs: Updated Android 5.0 API overview to reflect changed WebView behavior ↵Quddus Chong2014-10-221-3/+29
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for mixed content and 3rd party cookies. Change-Id: Ib152d6577d2369b71aa52e6013a2ff1fbcab0c6e
* | | | | | | Doc change: misc changes to highlights.smain@google.com2014-10-201-11/+18
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I60964bf1d8e299985da9ca6b2b6cfb70a1477bbc
* | | | | | update workplace description in lollipop highlightssmain@google.com2014-10-201-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18038081 Change-Id: I612fc52392bc0fb71cc2e7b4c0da1fcaae6ac6fe
* | | | | | add info about device owner app to the workplace highlightssmain@google.com2014-10-181-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1c5809e0d9e923fd71f4b33b1ef44091f1f3df4