kmccormick
96fb6d811f
am f077f476: am c808f6a6: am a8dbdb1c: am bb1c03e9: am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
...
* commit 'f077f476898e16623df4cb39d4cf0739c5e3efd2':
Doc Update: fixed unescaped angle brackets in code snippets.
2015-02-19 22:30:51 +00:00
Rich Slogar
56725501fe
am 925be07b: am 87ea3f79: am cdd5ebec: am 7319ea27: am cc883a1f: am 1e0face2: am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
...
* commit '925be07b26d10a902507931a4371335cb6cf44a9':
docs: mipmap link updates
2015-02-19 20:53:56 +00:00
kmccormick
506cba8b51
Doc Update: fixed unescaped angle brackets in code snippets.
...
Change-Id: Ie265dd58fb3a5fcffe955992dea7a1f9417a27d7
2015-02-19 12:17:18 -08:00
Rich Slogar
b87aa6cb96
Merge "docs: mipmap link updates" into lmp-docs
2015-02-19 18:55:26 +00:00
Rich Slogar
0f44b94d5d
docs: mipmap link updates
...
Change-Id: I345d4dc29e094a6835e04eec237d1b8b8a540eaa
2015-02-19 10:48:37 -08:00
Rich Slogar
64d090d85a
am 93cd3929: am c905da57: am 5af2270b: am cd9c0cab: am 708959b5: am 755c5d88: am 56375d90: docs: lint inspection updates
...
* commit '93cd3929ae757e499c13a03f575c4bd0721ac4b6':
docs: lint inspection updates
2015-02-18 23:50:14 +00:00
Rich Slogar
56375d9066
docs: lint inspection updates
...
Change-Id: I870533a8b22b54b848b9245387ca40d79e49295f
2015-02-18 14:17:21 -08:00
Chris Banes
4b201a5731
resolved conflicts for merge of cbc1ac33 to master
...
Change-Id: I107320a07a1646f2ddc3a288b13ae58c538d96e6
2015-02-18 11:32:48 +00:00
Rich Slogar
6c65063aa0
am e9d86f58: am 9f807e7e: am 6de1fd98: am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989
...
* commit 'e9d86f585399c69d8930b7cdfb0464f0ddd5f49a':
docs: site mipmap folder updates
2015-02-18 11:13:15 +00:00
David Friedman
6af7418624
am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b0 automerge: 40191d8
...
automerge: cdf0774
* commit 'cdf0774314842eb16f8db2b822a6d6538f17090e':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
2015-02-17 23:41:29 +00:00
Rich Slogar
9911aa5125
Merge "docs: studio training basics create and run project updates" into lmp-docs
2015-02-17 23:40:36 +00:00
Rich Slogar
40132ee15a
Merge "docs: site mipmap folder updates" into lmp-docs
2015-02-17 22:08:42 +00:00
Rich Slogar
69223702e4
docs: site mipmap folder updates
...
b/12874352
Change-Id: I0b32502c8075740c66f04203110c9bfe8be103f9
2015-02-17 12:34:35 -08:00
David Friedman
d350c5ced5
This file is misplaced, and serves no purpose. I am sending it to oblivion.
...
Change-Id: I91ed7bc228849f3181591357037b368b4b261eee
2015-02-12 21:30:59 -08:00
Shanea King-Roberson
8fcfd06ce5
am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge: 696b68c automerge: accf077
...
automerge: 524c460
* commit '524c46001f3f55552194b774c2e89c8c0ff0507c':
Adding videos for 5.0 changes and watch face development.
2015-02-10 21:01:45 +00:00
Luan Nguyen
5ed11d837f
am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs automerge: 6ee9018
...
automerge: c6ec799
* commit 'c6ec79913fbcf5b915ed55f3cc7b49690ee997f9':
docs: Fix various issues with incorrect code samples.
2015-02-10 20:10:56 +00:00
Shanea King-Roberson
c86ac21f73
Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
2015-02-10 19:57:30 +00:00
Luan Nguyen
e49fbfa21c
Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
2015-02-10 18:31:30 +00:00
Eric Gilmore
d86211292e
Adding videos for 5.0 changes and watch face development.
...
On branch pilot-videos
Changes to be committed:
modified: docs/html/about/versions/android-5.0-changes.jd
modified: docs/html/training/wearables/watch-faces/index.jd
Change-Id: I2dd852f3af8ae39f91ec08aadd5c03ff9996b46b
2015-02-10 10:29:36 -08:00
Luan Nguyen
c25adda636
docs: Fix various issues with incorrect code samples.
...
bug: 15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac
2015-02-10 09:39:44 -08:00
Joe Fernandez
6bfe8325b9
am e3bc656a: am a8b341cd: am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
...
automerge: 843b2c7
* commit '843b2c7aa9e38f39732a279d7901f66893b37ab7':
docs: remove + annotations in version references
2015-02-07 01:56:15 +00:00
Joe Fernandez
ba20f98c88
Merge "docs: remove + annotations in version references" into lmp-docs
2015-02-07 00:55:17 +00:00
Joe Fernandez
7a0e01d41a
am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da automerge: 346a9a2 automerge: f4b2bd4
...
automerge: 14437e4
* commit '14437e4781fea9688b7c68ec6c3201e8a926ab04':
docs: training intent doc error update
2015-01-31 04:25:18 +00:00
Rich Slogar
453467ac9c
docs: studio training basics create and run project updates
...
b/18742781
Change-Id: I80a207e24330c1b073934d671b3b9c94b0fb28e0
2015-01-30 17:14:25 -08:00
Joe Fernandez
1a9bf5c100
Merge "docs: training intent doc error update" into lmp-docs
2015-01-31 01:00:16 +00:00
Rich Slogar
367bfb3b50
docs: training intent doc error update
...
b/18386294
Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1
2015-01-30 16:55:55 -08:00
Scott Rowe
bed638f292
am b2788236: am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs automerge: 1b5a0fb
...
automerge: 811935e
* commit '811935e51c17f116e68b01828ba2a2bf5f4ac41f':
docs: Card View for Android TV training
2015-01-30 02:17:00 +00:00
Scott Rowe
84d180523c
am 4ca01ef2: am 2d1c5dc8: am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text automerge: 9ad282f
...
automerge: ec1e8aa
* commit 'ec1e8aa6afc59a2f2f8581a333a02dcdeffada87':
docs: b/19193358 Android TV overscan instructions: settings reversed in text
2015-01-30 02:15:33 +00:00
Scott Rowe
b86c3b80db
Merge "docs: Card View for Android TV training" into lmp-docs
2015-01-30 01:30:44 +00:00
Scott Rowe
87a1bf0970
docs: b/19193358 Android TV overscan instructions: settings reversed in text
...
Change-Id: I7c617ed67068927d27c5a2243a2dd07b04e668b5
2015-01-29 11:05:13 -08:00
Scott Rowe
da0c5de5fa
docs: Card View for Android TV training
...
Change-Id: I4797c0b3c4ae7106349095016d778992802ccb96
2015-01-29 10:50:25 -08:00
Ricardo Cervera
d05d91358d
am 8ff85c5e: am be3731f0: am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class.
...
automerge: 3c6cd62
* commit '3c6cd6273ce89598c10cc15aa2843a7f8301ff27':
docs: Transitions training class.
2015-01-27 23:44:52 +00:00
Ricardo Cervera
de113066d8
docs: Transitions training class.
...
Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591
2015-01-27 11:35:20 -08:00
Sarah Maddox
5b53481a86
am 83f40802: am 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs automerge: f31eb13 automerge: 1c10480
...
automerge: 77a7fea
* commit '77a7feac6c8832f8162d2339925a12434186eac2':
docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
2015-01-26 21:54:35 +00:00
Sarah Maddox
912cacde86
Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
2015-01-26 20:16:37 +00:00
Ricardo Cervera
e20b9941ae
am ba70d548: am 9c9dc80a: am df07000e: am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
...
automerge: 16325bd
* commit '16325bda7f8afd70a2a1c8444fcc578f451fa00c':
docs: Wear DataItem listener improvements
2015-01-26 20:07:14 +00:00
Ricardo Cervera
edb7a4420b
Merge "docs: Wear DataItem listener improvements" into lmp-docs
2015-01-26 19:32:13 +00:00
Sarah Maddox
ed91b0dd7e
docs: Adds new geocoding sample to Location API training.
...
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.
Bug: 17109822
Change-Id: I96dbf348e9ae41dbbeb075e6540620afc304d3b6
2015-01-26 11:06:55 -08:00
Rich Slogar
78f75b29fa
docs: remove + annotations in version references
...
b/18417182
Change-Id: I16181a4ebb7a4ac40a7307438e120489b806f24e
2015-01-22 17:48:43 -08:00
Luan Nguyen
0829cf2b9a
am 2700393c: am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) automerge: 6117147 automerge: 563e767
...
automerge: 2bffc5e
* commit '2bffc5e7bf2a86024d715716a6fd44def4b5f81c':
docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
2015-01-22 18:09:02 +00:00
Luan Nguyen
1dd76ea276
docs: Fix companion configuration (18864041)
...
Fix declaration of var and incorrect method call (18617393)
bug: 18864041
bug: 18617393
Change-Id: Ic31e44acfe7338f56acdbbd97ba8cc1e87042b53
2015-01-22 08:15:57 -08:00
Andrew Solovay
b94f2ce07e
am ea4c21ea: am a1838a9d: am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 automerge: d4cf09d automerge: 63e822d
...
* commit 'ea4c21ea283bdb98b80140c697b27bb9eb2bb643':
docs: WebView security notes for apps on pre-K devices
2015-01-22 00:03:31 +00:00
Luan Nguyen
a36fb351f8
am 2c27edc0: am 349e3b5a: am f082f898: Merge "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)." into lmp-doc
...
* commit '2c27edc0e043cb8fefa5eb1f5424f46d88712304':
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).
2015-01-22 00:03:28 +00:00
Andrew Solovay
78f4342fac
Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs
2015-01-21 19:20:58 +00:00
Ricardo Cervera
c2be8a6da0
docs: Wear DataItem listener improvements
...
Change-Id: I07bf2ab063556dd4f6e42a5835f73dd5b326d26e
2015-01-21 09:08:53 -08:00
Luan Nguyen
f082f8980e
Merge "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)." into lmp-docs
2015-01-21 16:19:20 +00:00
Luan Nguyen
46e804d2a7
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).
bug: 18832168
bug: 18832171
bug: 18832287
bug: 18832293
Change-Id: I4f071846589ba7edda500342ccd5fac6ecca3161
2015-01-21 08:00:45 -08:00
Andrew Solovay
f92dbe0115
docs: WebView security notes for apps on pre-K devices
...
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
2015-01-20 16:10:07 -08:00
Scott Rowe
bd74a7022c
am cee634df: am 11ce4b75: am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs
...
* commit 'cee634df2c8fe3a10a3aef754b3e168c646d47f3':
docs: removing code captions
2015-01-17 05:38:02 +00:00
Scott Rowe
9d6f65e0a8
am ec015c50: am e019bbb1: am 278f5e2a: am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
...
* commit 'ec015c504fe2cb4c3171e0f405d1b3df0567b5f4':
docs: Add screenshot
2015-01-17 05:37:55 +00:00
