summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
* am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language.Dirk Dougherty2015-01-291-4/+2
|\ | | | | | | | | | | | | automerge: 3f9d57d * commit '3f9d57dbe896d56e0eae381aa3e70ac93d755f24': Doc change: Update Ads terms language.
| * Doc change: Update Ads terms language.Dirk Dougherty2015-01-291-4/+2
| | | | | | | | Change-Id: I57cf037229f966f52c20c05f6ac29cc6774b1643
* | am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docsJoe Fernandez2015-01-281-1/+1
|\ \ | |/ | | | | | | | | | | automerge: 5421eee * commit '5421eee195265d05c821814501aae1bf3f468661': docs: plugin for gradle typo
| * Merge "docs: plugin for gradle typo" into lmp-docsJoe Fernandez2015-01-271-1/+1
| |\
| | * docs: plugin for gradle typoRich Slogar2015-01-231-1/+1
| | | | | | | | | | | | | | | | | | b/19106103 Change-Id: I3db503ccd5a93ee0a3bdf6dfb8c76f7391a5e75e
* | | am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class.Ricardo Cervera2015-01-2710-0/+989
|\ \ \ | |/ / | | | | | | | | | * commit 'f5386a9a949297be1321cce7eed5d0975c7b64ad': docs: Transitions training class.
| * | docs: Transitions training class.Ricardo Cervera2015-01-2710-0/+989
| | | | | | | | | | | | Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591
* | | am 83f40802: am 95226c98: am 912cacde: Merge "docs: Adds new geocoding ↵Sarah Maddox2015-01-261-246/+434
|\ \ \ | |/ / | | | | | | | | | | | | | | | sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs * commit '83f40802148e922d78222ffc56377534b8ee92be': docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
| * | Merge "docs: Adds new geocoding sample to Location API training. Uses ↵Sarah Maddox2015-01-261-246/+434
| |\ \ | | | | | | | | | | | | GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
| | * | docs: Adds new geocoding sample to Location API training.Sarah Maddox2015-01-261-246/+434
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API. Bug: 17109822 Change-Id: I96dbf348e9ae41dbbeb075e6540620afc304d3b6
* | | | am df07000e: am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener ↵Ricardo Cervera2015-01-262-23/+108
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | improvements" into lmp-docs * commit 'df07000e356dee84de9f4dcdd22a15e26e32f684': docs: Wear DataItem listener improvements
| * | | Merge "docs: Wear DataItem listener improvements" into lmp-docsRicardo Cervera2015-01-262-23/+108
| |\ \ \ | | |/ / | |/| |
| | * | docs: Wear DataItem listener improvementsRicardo Cervera2015-01-212-23/+108
| | |/ | | | | | | | | | Change-Id: I07bf2ab063556dd4f6e42a5835f73dd5b326d26e
* | | am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design ↵Ricardo Cervera2015-01-221-16/+23
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | guidelines" into lmp-docs automerge: 65ab86c * commit '65ab86cf1ad414612ac57e14f581e0ffb1819e14': docs: Fixes to the watch faces design guidelines
| * | Merge "docs: Fixes to the watch faces design guidelines" into lmp-docsRicardo Cervera2015-01-221-16/+23
| |\ \
| | * | docs: Fixes to the watch faces design guidelinesRicardo Cervera2015-01-221-16/+23
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 19001253 Change-Id: I356b887de71710afa27acc7544d0efdc3a857e91
* | | | am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix ↵Luan Nguyen2015-01-222-10/+31
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | declaration of var and incorrect method call (18617393) automerge: 6117147 * commit '61171477918ea55c70c706f062019f5cd2194043': docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
| * | | docs: Fix companion configuration (18864041)Luan Nguyen2015-01-222-10/+31
| |/ / | | | | | | | | | | | | | | | | | | | | | Fix declaration of var and incorrect method call (18617393) bug: 18864041 bug: 18617393 Change-Id: Ic31e44acfe7338f56acdbbd97ba8cc1e87042b53
* | | am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" ↵Andrew Solovay2015-01-211-1/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into lmp-docs automerge: e628954 automerge: d4cf09d * commit 'd4cf09d3a0f90d61386eb1713ef2ed4ade00c061': docs: WebView security notes for apps on pre-K devices
| * | Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docsAndrew Solovay2015-01-211-1/+11
| |\ \
| | * | docs: WebView security notes for apps on pre-K devicesAndrew Solovay2015-01-201-1/+11
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Added paragraph describing security precautions for apps that use WebView on devices running versions older than Android 4.4. See first comment for doc stage location. bug: 19075466 Change-Id: I69937d8dfc37ec1ba693f969500b9dc7404c4635
* | | am f082f898: Merge "docs: Fix conditional in ambient mode check method ↵Luan Nguyen2015-01-212-57/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs automerge: 8884eda automerge: de9bd40 * commit 'de9bd40e21696ceeffc67ec24e6e43975461bc60': docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
| * | Merge "docs: Fix conditional in ambient mode check method (18832168). Fix ↵Luan Nguyen2015-01-212-57/+27
| |\ \ | | |/ | |/| | | | issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs
| | * docs: Fix conditional in ambient mode check method (18832168).Luan Nguyen2015-01-212-57/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171). bug: 18832168 bug: 18832171 bug: 18832287 bug: 18832293 Change-Id: I4f071846589ba7edda500342ccd5fac6ecca3161
* | | am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" ↵Scott Rowe2015-01-171-28/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | into lmp-docs * commit 'ae15e779c0a0a9005292efb0f39729454429fa7f': docs: removing code captions
| * | Merge "docs: removing code captions" into lmp-docsScott Rowe2015-01-171-28/+15
| |\ \
| | * | docs: removing code captionsScott Rowe2015-01-141-28/+15
| | | | | | | | | | | | | | | | Change-Id: Ifbeedf014741ff680640e1bdd0b35fa2d68f9e45
* | | | am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into ↵Scott Rowe2015-01-173-16/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | lmp-docs * commit '49caa6386c1423ad9ced3e3ad983dd233a76e2e4': docs: Add screenshot
| * | | Merge "docs: Add screenshot" into lmp-docsScott Rowe2015-01-173-16/+9
| |\ \ \
| | * | | docs: Add screenshotScott Rowe2015-01-123-16/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I0995d23e1df30ce17ce381c14a6cbd2de389c396
* | | | | am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level ↵David Friedman2015-01-1714-7/+5350
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs * commit 'ae71c8ea52af7e4205ae838e73837d145f416e1a': Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
| * | | | Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, ↵David Friedman2015-01-1714-7/+5350
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | pt-br, zh-cn, zh-tw" into lmp-docs
| | * | | Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, ↵David Friedman2015-01-1614-7/+5350
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zh-cn, zh-tw Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f
* | | | | am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game ↵Quddus Chong2015-01-161-4/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Controller training code snippets. bug: 17959906" into lmp-docs * commit 'a649122977a6f1c267329b9b67a692cabd839e98': docs: Fixed typos in Game Controller training code snippets. bug: 17959906
| * | | | Merge "docs: Fixed typos in Game Controller training code snippets. bug: ↵Quddus Chong2015-01-161-4/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 17959906" into lmp-docs
| | * | | | docs: Fixed typos in Game Controller training code snippets.Quddus Chong2015-01-161-4/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | bug: 17959906 Change-Id: I2fa1b01704a69536b3d27fe6aa96c441d7f8fb27
* | | | | am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding ↵Joe Fernandez2015-01-161-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | studio-sample-in-editor.png file" into lmp-docs * commit 'cd50066386887148f99dce9b449bed588a354bb3': docs: adding studio-sample-in-editor.png file
| * | | | Merge "docs: adding studio-sample-in-editor.png file" into lmp-docsJoe Fernandez2015-01-161-0/+0
| |\ \ \ \
| | * | | | docs: adding studio-sample-in-editor.png fileRich Slogar2015-01-161-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b200eeb5134e9c66cb198f06ccfaa78a7f6a505
* | | | | | am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support ↵Ricardo Cervera2015-01-1662-8/+261240
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lib Javadoc * commit '9273b33f6ecfa20ff524ae6fcb88f2586c79b6da': docs: Add browseable Wearable Support Lib Javadoc
| * | | | | docs: Add browseable Wearable Support Lib JavadocRicardo Cervera2015-01-1662-8/+261240
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: Ied1f25f637c529046b0adc1e1ea173a290b22da1
* | | | | am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space ↵Joe Fernandez2015-01-161-2/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | requirements typo" into lmp-docs * commit 'b7ac4dff3d97865cde5d6876d30dde0a77848f25': docs: studio disk space requirements typo
| * | | | Merge "docs: studio disk space requirements typo" into lmp-docsJoe Fernandez2015-01-161-2/+4
| |\ \ \ \
| | * | | | docs: studio disk space requirements typoRich Slogar2015-01-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8a5cdbc10aab5a67706e3e1c19f1712c10674bd8
* | | | | | am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" ↵Joe Fernandez2015-01-161-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-docs * commit '0b596de9a4cc9b8d0694838f4b699c722d448bac': docs: link to sdk manager
| * | | | | Merge "docs: link to sdk manager" into lmp-docsJoe Fernandez2015-01-161-1/+1
| |\ \ \ \ \
| | * | | | | docs: link to sdk managerRich Slogar2015-01-091-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: I41f656e2eee1189298292e3bcca387de05e0e3c7
| * | | | | docs: Added info on noHistory and onActivityResult().Ricardo Cervera2015-01-161-1/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13807256 Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83 Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f
* | | | | am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-devRicardo Cervera2015-01-161-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '2287879039556ad3c8fce58974e2396b4a2dab45': docs: Added info on noHistory and onActivityResult(). Bug: 13807256
| * \ \ \ \ resolved conflicts for merge of e8f6bd48 to lmp-devRicardo Cervera2015-01-161-1/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
generated by cgit v1.1 at 2025-08-07 20:11:05 +0000