Commit Graph

8887 Commits

Author SHA1 Message Date
Joe Fernandez
f9d2cd9931 am 844af56b: am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
automerge: 15cfa4f

* commit '15cfa4f3012f9bdb39b0c9c0d339b3d76694abfa':
  docs: update debug menu for debugging-studio
2014-12-10 20:04:31 +00:00
Joe Fernandez
e4e1687d73 am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs
automerge: 4ded0a1

* commit '4ded0a166f96da7bcb377c0573ba373b77fe596e':
  docs:studio basic links
2014-12-10 19:56:05 +00:00
Joe Fernandez
844af56b85 am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
* commit 'efab8b6fd50e2e4ad3adb03c4bca2bc531ae5d42':
  docs: update debug menu for debugging-studio
2014-12-10 19:54:51 +00:00
Joe Fernandez
5a64a47580 am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs
* commit '9727d1910052e600ebcf417c9fe55436ecf2c9de':
  docs:studio basic links
2014-12-10 19:46:37 +00:00
Luan Nguyen
1032dac1f8 am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps
automerge: ee501ed

* commit 'ee501ed8483bc66fbff38769da921a37837297f2':
  docs: Fix text on step 5 of the opt-in steps
2014-12-10 19:36:26 +00:00
Joe Fernandez
d49977d967 Merge "docs: update debug menu for debugging-studio" into lmp-docs 2014-12-10 19:31:12 +00:00
Luan Nguyen
596d4e7230 am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps
* commit 'c9e5c5f72a563c7b8e030a57cf586941d32006f4':
  docs: Fix text on step 5 of the opt-in steps
2014-12-10 19:26:37 +00:00
Joe Fernandez
3454091dad Merge "docs:studio basic links" into lmp-docs 2014-12-10 19:23:16 +00:00
Rich Slogar
bea1510573 docs: update debug menu for debugging-studio
Change-Id: I04c71104b1ac9c0e4413c518ccd41ba3e6a90f8f
2014-12-10 11:14:15 -08:00
Joe Fernandez
c6ff45522b am 17cf7789: am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs
automerge: 39409f2

* commit '39409f28e68d1e43f845497c33167f2688b6bce9':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
2014-12-10 19:03:32 +00:00
Ricardo Cervera
fc1e25f30d am d56b7a39: am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs
automerge: a41a241

* commit 'a41a241f6e5ef959b8dcc9656422f20dd41f3ba3':
  docs: Creating Custom Watch Faces training class.
2014-12-10 19:02:10 +00:00
Ricardo Cervera
b8217ea7f0 am 2a34e719: am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev
automerge: 7061697

* commit '7061697bfd7c2280ae780356b68ac5c47b3aa1d8':
  docs: Add details to Packaging Wearable apps.
2014-12-10 19:00:49 +00:00
Ricardo Cervera
85cc409076 am 0342d70e: am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs
automerge: 1b46c2c

* commit '1b46c2ccb700749bf7d06c454b8f4337bacde371':
  docs: Design guidelines for watch faces draft.
2014-12-10 18:59:28 +00:00
smain@google.com
835ad71635 am 5a267e72: am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." int
automerge: 6c1facd

* commit '6c1facdc40bbb02ca5390e0281f1e72172c8065e':
  misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.
2014-12-10 18:56:52 +00:00
Joe Fernandez
b721e45a43 am 913a683d: am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs
automerge: caad620

* commit 'caad620d042628457bcad5850f889f46250a2d7c':
  docs: Add Distributing to Android Wear doc
2014-12-10 18:55:29 +00:00
Ricardo Cervera
b33c8fb4b5 am 600224c9: am 730a52d0: am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs
automerge: 768d97d

* commit '768d97d0b6f3e416deaf29d1c8ca139337af334c':
  docs: Add new classes to Wearable UI library
2014-12-10 18:53:59 +00:00
Ricardo Cervera
9c6e82e70e am 45ea5690: am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs
automerge: 739d0a8c

* commit '739d0a8c6b08abcdc56d592e05f3ad7c01e5b5d2':
  docs: Add links to wearable support zip for ADT
2014-12-10 18:52:44 +00:00
Quddus Chong
d710011151 am 15e0f7fd: am bdb327ad: am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs
automerge: 20baf9e

* commit '20baf9e47e8e89ff595a843de54867fb56a5580d':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
2014-12-10 18:51:16 +00:00
Luan Nguyen
258da73846 docs: Fix text on step 5 of the opt-in steps
Bug: 18702823
Change-Id: I294eb017592e896217d7eeea024aa32b9f4f1511
2014-12-10 10:37:43 -08:00
Rich Slogar
8866975b53 docs:studio basic links
Change-Id: Ib097530baa3035bc83eeb49a3e14eadbac58aca1
2014-12-10 10:18:09 -08:00
Joe Fernandez
17cf77898a am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs
* commit '5ff0805238787f938bf5bcadba46ac8f92e8d440':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
2014-12-10 05:57:19 +00:00
Ricardo Cervera
d56b7a39e1 am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs
* commit '504e213fd514f7210eaa95df48620c26c0382487':
  docs: Creating Custom Watch Faces training class.
2014-12-10 05:46:39 +00:00
Ricardo Cervera
2a34e71947 am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev
* commit 'c0d08616f2280d7c7359bf27e33c0c012a906803':
  docs: Add details to Packaging Wearable apps.
2014-12-10 05:46:34 +00:00
Joe Fernandez
dfd05f0a86 am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs
* commit '1832978cf6355515016139e453ced187f4b4e29d':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
2014-12-10 05:42:56 +00:00
Ricardo Cervera
900efcc91c docs: Add details to Packaging Wearable apps.
Bug: 17943949

(cherry picked from commit 07c9c63e3d)

Change-Id: I765285b7e1a17928778ac161c73b2e48b82b54d6
2014-12-10 05:36:09 +00:00
Joe Fernandez
1832978cf6 Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 2014-12-10 05:35:22 +00:00
Ricardo Cervera
0342d70e4e am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs
* commit 'f94ee2c10ce168f6eef39cc25dd663bb8b79eac9':
  docs: Design guidelines for watch faces draft.
2014-12-10 05:34:57 +00:00
Ricardo Cervera
ea15366ae3 am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs
* commit '26e2105575939918e362f14b854176bc54e39b44':
  docs: Creating Custom Watch Faces training class.
2014-12-10 05:34:39 +00:00
Ricardo Cervera
c6361d8df2 Merge "docs: Add details to Packaging Wearable apps." into lmp-dev 2014-12-10 05:32:19 +00:00
Ricardo Cervera
26e2105575 Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 2014-12-10 05:28:33 +00:00
Ricardo Cervera
7db2979684 docs: Creating Custom Watch Faces training class.
Bug: 18338418
Bug: 18533881

Change-Id: I71d38c73b6a76c9bec8b646967a93d60b05c639b
2014-12-09 21:26:58 -08:00
Ricardo Cervera
0024f12dec Merge "docs: Design guidelines for watch faces draft." into lmp-docs 2014-12-10 05:12:50 +00:00
smain@google.com
5a267e72b2 am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." into lmp-docs
* commit '5b16e21b9f1b750d66060a25fadfe35c3ebfed30':
  misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.
2014-12-10 03:53:26 +00:00
Joe Fernandez
913a683de9 am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs
* commit 'f8527c7f82d1197a7ebaf9caf1a199165b47e353':
  docs: Add Distributing to Android Wear doc
2014-12-10 03:53:22 +00:00
Ricardo Cervera
600224c958 am 730a52d0: am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs
* commit '730a52d0cc9c8644791b68530520460860719d1a':
  docs: Add new classes to Wearable UI library
2014-12-10 03:53:18 +00:00
Ricardo Cervera
45ea56904a am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs
* commit '5edaf136c8c3b45dded99e69fad2b5f2fb3a57f2':
  docs: Add links to wearable support zip for ADT
2014-12-10 03:53:14 +00:00
Quddus Chong
15e0f7fdb3 am bdb327ad: am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs
* commit 'bdb327adb3faf3604becfe0174ef90ca6ff458c2':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
2014-12-10 03:53:08 +00:00
smain@google.com
1a2308bb85 Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." into lmp-docs 2014-12-10 03:28:26 +00:00
Joe Fernandez
1e82428495 Merge "docs: Add Distributing to Android Wear doc" into lmp-docs 2014-12-10 02:10:07 +00:00
smain@google.com
cf18fa6cd8 misc updates related to Android Studio.
clarify a few doc titles for improved search results clarity.
update "get started" page link to Android Studio, add First App link,
and remove some biased language.

Change-Id: I5e4faef8a6eb0a08eec45981a4f9436cb07a995c
2014-12-09 17:26:07 -08:00
Ricardo Cervera
d412b9ab74 Merge "docs: Add new classes to Wearable UI library" into lmp-docs 2014-12-10 00:56:50 +00:00
Ricardo Cervera
0d8f141720 Merge "docs: Add links to wearable support zip for ADT" into lmp-docs 2014-12-10 00:56:15 +00:00
Quddus Chong
09e72628fc Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs 2014-12-10 00:02:17 +00:00
Joe Fernandez
41a635e083 am a82fc60c: am 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs automerge: d36d2aa
automerge: 509815b

* commit '509815b8a7059fbe67bd44c0b071a1e96977ce60':
  :docs studio tips and tricks headings updates
2014-12-09 23:58:36 +00:00
Luan Nguyen
cbd0032df2 docs: Add Distributing to Android Wear doc
Change-Id: I123f53b4d7a1098c1caabc88a1e6fd6dd828d3fb
2014-12-09 15:30:24 -08:00
Joe Fernandez
d36d2aad9d am a82fc60c: am 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs
* commit 'a82fc60ce4cc0f7d1167330f4cbb5736551ddd5c':
  :docs studio tips and tricks headings updates
2014-12-09 23:22:42 +00:00
Ricardo Cervera
0318a2281d am 614889aa: am 4a6bafcb: am 12a24dc9: am 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
* commit '614889aa1ad68f9e92517bb618193744adc78c0d':
  docs: Adding links to material design videos
2014-12-09 23:15:38 +00:00
Joe Fernandez
b35a509d0e Merge ":docs studio tips and tricks headings updates" into lmp-docs 2014-12-09 22:56:37 +00:00
Ricardo Cervera
4a6bafcb56 am 12a24dc9: am 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
* commit '12a24dc91fa4de5b897acff9a6435647429040d7':
  docs: Adding links to material design videos
2014-12-09 22:49:10 +00:00
Quddus Chong
da125f4f12 docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
Change-Id: I240feafe4002884dbb2495ffefc599a76b6b7a35
2014-12-09 14:44:05 -08:00