177704 Commits

Author SHA1 Message Date
Rich Slogar
d9d05fe358 am 838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
* commit '838e4aa6e69f6482adfdde2e45867a36dc1db2b0':
  docs: sdk-tools 24.3.3 updates
2015-06-18 23:55:44 +00:00
Rich Slogar
838e4aa6e6 Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs 2015-06-18 23:47:28 +00:00
Rich Slogar
1ba81cff91 docs: sdk-tools 24.3.3 updates
Change-Id: I30267355dc17cd6451b28b2aca6d639b9af320d4
2015-06-18 16:36:52 -07:00
Wei Liu
1dac6bd9fb am ae363d2d: Wear doesn\'t need Shell to send notification when bugreport captured.
* commit 'ae363d2db4398a695606c254b88be8940139edd1':
  Wear doesn't need Shell to send notification when bugreport captured.
2015-06-18 23:24:41 +00:00
Wei Liu
ae363d2db4 Wear doesn't need Shell to send notification when bugreport captured.
b/19179040

Change-Id: Iec74e1e55adee16c8674f28a6e7d697499b85acf
2015-06-17 15:32:05 -07:00
Quddus Chong
93bd81346d am eae09b4a: Merge "docs: Updated Android TV landing page and Live TV 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
2015-06-17 16:23:38 +00:00
Quddus Chong
eae09b4a64 Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387" into mnc-preview-docs 2015-06-17 16:13:21 +00:00
Luan Nguyen
0752aa54a0 am 5cef09b0: Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs
* commit '5cef09b07521cf14eb6a9c9dc59276b9b6482bef':
  docs: Update JavaDoc links for Watch Face class.
2015-06-17 15:03:04 +00:00
Luan Nguyen
ce26f29113 am 5980ae8f: Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs
* commit '5980ae8f06d5a56a5bfc763729533d975079b801':
  docs: Update JavaDoc reference links for Create Wearable Apps class
2015-06-17 15:02:59 +00:00
Luan Nguyen
474b4775ed am d548b29d: Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs
* commit 'd548b29def4006c0a19df090189198e51715bccd':
  docs: Update JavaDoc ref links for UI training.
2015-06-17 15:02:55 +00:00
Luan Nguyen
5cef09b075 Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs 2015-06-17 14:55:45 +00:00
Luan Nguyen
5980ae8f06 Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs 2015-06-17 14:54:51 +00:00
Luan Nguyen
d548b29def Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs 2015-06-17 14:54:30 +00:00
Joe Fernandez
31217aa591 am e343e673: Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs
* commit 'e343e673eca0c0e3b943ce7ddd27b37e29a873f4':
  Update landing page link to skip the Preview landing page plus copy edit
2015-06-17 00:01:57 +00:00
Joe Fernandez
e343e673ec Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs 2015-06-16 23:54:34 +00:00
Quddus Chong
83ee59d5de am 375ad9e1: docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628
* commit '375ad9e1ebc327b87f378f1e0d3cf12f058e5f36':
  docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628
2015-06-16 22:05:54 +00:00
Quddus Chong
375ad9e1eb docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required.
bug: 21400628

Change-Id: I001cb429b94bed8e6a7524f2b7c6a7ced240f33d
2015-06-16 14:54:29 -07:00
Quddus Chong
513cf16d5e docs: Updated Android TV landing page and Live TV training to support channels.
bug: 21786387

Change-Id: I343e00d30d25f46a9081af339ee4c4a2fddba149
2015-06-16 11:27:52 -07:00
Andrew Solovay
c75034f1e4 am c7965b02: Merge "docs: Added new "100 days" video to AfW landing page" into mnc-preview-docs
* commit 'c7965b024d660b62e5500e4bb8a3f942960dddf1':
  docs: Added new "100 days" video to AfW landing page
2015-06-16 17:57:03 +00:00
Andrew Solovay
c7965b024d Merge "docs: Added new "100 days" video to AfW landing page" into mnc-preview-docs 2015-06-16 17:48:46 +00:00
Quddus Chong
418ff64748 am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs
* commit '79b30681bbe26b95a8705e17957c1063517ec8f3':
  docs: Fixed broken links in TV publishing checklist. bug: 19298571
2015-06-15 22:59:13 +00:00
Quddus Chong
79b30681bb Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs 2015-06-15 22:42:43 +00:00
Quddus Chong
e08a39c0cf docs: Fixed broken links in TV publishing checklist.
bug: 19298571

Change-Id: I5a4d6df6e7c8dd0e1f9ffb652375fa265b677013
2015-06-15 15:39:46 -07:00
John Spurlock
4393a7d264 am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.
* commit 'c0d849348ae9fb36e725d0644a4927e2e5146295':
  Fix typo in TtsSpan.
2015-06-15 22:39:12 +00:00
John Spurlock
c0d849348a am 076c599f: am 1ad5c813: Fix typo in TtsSpan.
* commit '076c599feb9a18b250de7020c2f1c01561c509f9':
  Fix typo in TtsSpan.
2015-06-15 22:23:24 +00:00
John Spurlock
076c599feb am 1ad5c813: Fix typo in TtsSpan.
* commit '1ad5c813211d4d855a0d5396855c80653480aaa4':
  Fix typo in TtsSpan.
2015-06-15 22:11:30 +00:00
Luan Nguyen
aa3315d6b1 docs: Update JavaDoc reference links for Create Wearable Apps class
bug: 21723175
Change-Id: I3afc72be12e4c08b8dfa0380e315ef5709e2b27c
2015-06-15 14:45:25 -07:00
Andrew Solovay
789eddfbd6 docs: Added new "100 days" video to AfW landing page
See first comment for doc stage location.

Change-Id: Ic05d35efe8a8529d6cc45ba4e055a137ce88f945
2015-06-15 11:58:53 -07:00
John Spurlock
1ad5c81321 Fix typo in TtsSpan.
Change-Id: Ic32f141f0c51ee3bee8fd71464f104ef725de880
2015-06-15 17:24:57 +00:00
Diego Perez
fa794eb002 am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
* commit '2f7103565cf1732d6d1281195cfa49a1564751d7':
  Fix for shadows on theme editor
2015-06-15 10:14:30 +00:00
Diego Perez
40a216d959 am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit 'df6f63badfe2572284dad8e34f152fd1c24a873e':
  Fix GcSnapshot drawInLayer when clipping is used.
2015-06-15 10:14:24 +00:00
Diego Perez
2f7103565c am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
* commit '13c06d6c91e67962b7ffdf92c56e3b01125e4a8d':
  Fix for shadows on theme editor
2015-06-15 10:04:02 +00:00
Diego Perez
df6f63badf am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit '2422011d867f4d4516605148641bbeb7d9c2501b':
  Fix GcSnapshot drawInLayer when clipping is used.
2015-06-15 10:03:58 +00:00
Diego Perez
13c06d6c91 am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
* commit '1f33bdad98dd5138f887642d39c9495e1d7df14b':
  Fix for shadows on theme editor
2015-06-15 09:50:58 +00:00
Diego Perez
2422011d86 am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit 'b2411c622cf9124f6af5f70d416adb179f9c88bb':
  Fix GcSnapshot drawInLayer when clipping is used.
2015-06-15 09:50:51 +00:00
Diego Perez
1f33bdad98 am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
* commit '5e50e00c663a5d0b11d1f41509e1fb4e56d166f1':
  Fix for shadows on theme editor
2015-06-15 09:36:39 +00:00
Diego Perez
b2411c622c am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit 'ead59b0d479c3a911be87261b523255e8e51f76a':
  Fix GcSnapshot drawInLayer when clipping is used.
2015-06-15 09:36:34 +00:00
Diego Perez
5e50e00c66 Merge "Fix for shadows on theme editor" into lmp-mr1-dev 2015-06-15 08:35:00 +00:00
Diego Perez
ead59b0d47 Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 2015-06-15 08:34:04 +00:00
Dirk Dougherty
c6d3342064 am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs
* commit '4decc115ae4fc846fffda238569d6c55451a63af':
  Doc change: move ndk docs jd into main docs tree.
2015-06-13 02:57:04 +00:00
Dirk Dougherty
4decc115ae Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs 2015-06-13 02:43:43 +00:00
Dirk Dougherty
a73450cd27 Doc change: move ndk docs jd into main docs tree.
Change-Id: I5c1ac7645dc68c28da97f46babcab5926c38dbea
2015-06-12 15:18:07 -07:00
Andrew Solovay
ecc50268d7 am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs
* commit '6243dfd9ab25dfd11d0e09cbe02e8a863ddafe07':
  docs: Added AfW videos to "Android for Work" landing page
2015-06-12 20:48:58 +00:00
Andrew Solovay
6243dfd9ab Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs 2015-06-12 20:37:45 +00:00
Rich Slogar
afb19e27cc am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs
* commit '726db0aff535e7e734426c6c33ae2c5443e34fa5':
  docs: sdk tools 24.3.2 download updates
2015-06-12 17:40:29 +00:00
Luan Nguyen
cce9c74f4e docs: Update JavaDoc links for Watch Face class.
bug: 21731309
Change-Id: I4d0899f42e3150aad399efc8d1e1e4f63dc6bc9d
2015-06-12 10:36:57 -07:00
Rich Slogar
726db0aff5 Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs 2015-06-12 17:26:58 +00:00
Diego Perez
ce5a79dacf am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev
* commit 'd717682df97e812d4a25f93b0c9e84548767d8e1':
  New custom widgets library
2015-06-12 16:29:59 +00:00
Diego Perez
5a53816b0d am c051c556: am e10e8005: am 68155986: am f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev
* commit 'c051c556669f88e284f2922f8d28fad2138598ae':
  Fix crash when shadowSize is 0
2015-06-12 16:29:54 +00:00
Prashant Malani
a8cff2acb7 am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
* commit '327b481f1f2499eaa5ab938e63a2c12c21fe7482':
  DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
2015-06-12 16:29:47 +00:00