10103 Commits

Author SHA1 Message Date
Johan Euphrosine
fe6d855cf3 am 16580c9b: am 460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
* commit '16580c9bb4ef4cad1f5d59402a855189decb56ba':
  frameworks/base/docs: add jd files for NDK reference
2015-05-22 15:27:01 +00:00
Johan Euphrosine
16580c9bb4 am 460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
* commit '460bcb54d58b8eec86504d2b4518267a69d5eb16':
  frameworks/base/docs: add jd files for NDK reference
2015-05-22 15:15:51 +00:00
Johan Euphrosine
460bcb54d5 Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs 2015-05-22 14:39:35 +00:00
Joe Fernandez
eae90b806a am ee143ce3: docs: M Preview Program overview, update 2
* commit 'ee143ce3eca3db788ddff6f21a8aae6471eec5db':
  docs: M Preview Program overview, update 2
2015-05-22 04:29:13 +00:00
Joe Fernandez
ee143ce3ec docs: M Preview Program overview, update 2
Change-Id: If36aa779a29b9ac0a5c36e7ecf4bfe80a25d5ba4
2015-05-21 21:08:41 -07:00
Dirk Dougherty
0140854a63 am 85dea528: Doc change: updated images, landings, and ndk updates.
* commit '85dea528866217d4b3d40a1162c00c4e836504aa':
  Doc change: updated images, landings, and ndk updates.
2015-05-21 22:13:19 +00:00
Dirk Dougherty
85dea52886 Doc change: updated images, landings, and ndk updates.
Change-Id: If128f8394438471365db6f7c0a42e6b38d25d250
2015-05-21 14:33:21 -07:00
Luan Nguyen
82120b6180 am 5c7dcb30: am 0e7fa9e3: docs: Update the AlwaysOn sample link to point to DAC\'s samples
* commit '5c7dcb3054bef13896631de04aa45fc77782a1c2':
  docs: Update the AlwaysOn sample link to point to DAC's samples
2015-05-21 18:26:34 +00:00
Luan Nguyen
5c7dcb3054 am 0e7fa9e3: docs: Update the AlwaysOn sample link to point to DAC\'s samples
* commit '0e7fa9e32aecdd3d124828ac459ad6c14776c8e4':
  docs: Update the AlwaysOn sample link to point to DAC's samples
2015-05-21 18:12:35 +00:00
Luan Nguyen
0e7fa9e32a docs: Update the AlwaysOn sample link to point to DAC's samples
Change-Id: I54e2457009ef561c49a042e2a65fa55808a370bf
2015-05-21 10:09:24 -07:00
Luan Nguyen
98ebcef18b docs: Add sample links and descriptions for M Preview
bug: 20910953
Change-Id: Ia4c04357b2e6c772ebf98b463c06a7eadb1ff893
2015-05-21 08:22:01 -07:00
Joe Fernandez
18cc51d6df am 23fcc39e: docs: M Preview downloads and SDK Setup pages v2
* commit '23fcc39e419c74533697cc9858709e681266830a':
  docs: M Preview downloads and SDK Setup pages v2
2015-05-21 14:16:39 +00:00
Luan Nguyen
d8573aa517 am dfa79aeb: am d5600855: Merge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1-ub-docs
* commit 'dfa79aeb6fd119127b790704c30f2d27b464b4a8':
  docs: Refresh Wearable support library reference for Diamond
2015-05-21 14:16:34 +00:00
Luan Nguyen
f644f70208 am 6d592518: am 8b959ee9: Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs
* commit '6d592518b863e5cbdb6542003377f4e2bf254be2':
  docs: Remove references to Android Studio 0.8 beta
2015-05-21 14:16:29 +00:00
Luan Nguyen
6a4d4a46f2 am 2801c77e: am 606e84cf: Merge "docs: Add Always-On lesson for Wear apps" into lmp-mr1-ub-docs
* commit '2801c77ef3f76092ae4ef8b1888bc26399ba9188':
  docs: Add Always-On lesson for Wear apps
2015-05-21 14:16:24 +00:00
Luan Nguyen
0444253e69 am 94587871: am 5ee30ed5: Merge "docs: Add always-on design for wearable activities" into lmp-mr1-ub-docs
* commit '94587871d26067a50d4a0a975f6ee6a7eed6f0bd':
  docs: Add always-on design for wearable activities
2015-05-21 14:16:13 +00:00
Johan Euphrosine
b1baab6858 frameworks/base/docs: add jd files for NDK reference
Generated using:
https://android-review.googlesource.com/#/c/151627/

Change-Id: Ib4840ef370d6b254da4f0b8f7b972608828b0d0e
2015-05-21 01:28:48 -07:00
Joe Fernandez
23fcc39e41 docs: M Preview downloads and SDK Setup pages v2
Change-Id: I149061fc41d805722171f037cf62f8c64bffdefe
2015-05-20 21:40:31 -07:00
Luan Nguyen
dfa79aeb6f am d5600855: Merge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1-ub-docs
* commit 'd560085514ca33e187e8e641ebbb0e6ef1f24041':
  docs: Refresh Wearable support library reference for Diamond
2015-05-20 23:09:50 +00:00
Luan Nguyen
6d592518b8 am 8b959ee9: Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs
* commit '8b959ee95b4dfa191c6924b3c88fad72b700d81c':
  docs: Remove references to Android Studio 0.8 beta
2015-05-20 23:09:46 +00:00
Luan Nguyen
2801c77ef3 am 606e84cf: Merge "docs: Add Always-On lesson for Wear apps" into lmp-mr1-ub-docs
* commit '606e84cf6353aec066a34517c2c40a0d35e335bc':
  docs: Add Always-On lesson for Wear apps
2015-05-20 23:09:41 +00:00
Luan Nguyen
94587871d2 am 5ee30ed5: Merge "docs: Add always-on design for wearable activities" into lmp-mr1-ub-docs
* commit '5ee30ed5f5d83ec4d462db9ba6039e3c6cbdb7f4':
  docs: Add always-on design for wearable activities
2015-05-20 23:09:31 +00:00
Luan Nguyen
d560085514 Merge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1-ub-docs 2015-05-20 23:00:13 +00:00
Luan Nguyen
8b959ee95b Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs 2015-05-20 22:59:15 +00:00
Luan Nguyen
606e84cf63 Merge "docs: Add Always-On lesson for Wear apps" into lmp-mr1-ub-docs 2015-05-20 22:58:57 +00:00
Luan Nguyen
5ee30ed5f5 Merge "docs: Add always-on design for wearable activities" into lmp-mr1-ub-docs 2015-05-20 22:58:28 +00:00
Luan Nguyen
8f8e87be3c docs: Add Always-On lesson for Wear apps
bug:20089205
Change-Id: I52c79ee2f96b5599529547d83b32269a0771a461
2015-05-20 15:49:56 -07:00
Luan Nguyen
4396ee480b docs: Add always-on design for wearable activities
bug: 18960180
Change-Id: I57b5052041984ac48648fc65309a58c9ef255611
2015-05-20 09:13:43 -07:00
Luan Nguyen
7e02496311 docs: Remove references to Android Studio 0.8 beta
bug: 21109817
Change-Id: I8cde77651f7dea324aa4ebebdd7cd6437528098a
2015-05-20 09:02:40 -07:00
Joe Fernandez
25a3b7117a am 97c616cb: Merge "docs: M Preview - Updating image for Program Overview" into mnc-preview-docs
* commit '97c616cb113ba3144ff91b7f974d832fdc5ff0f0':
  docs: M Preview - Updating image for Program Overview
2015-05-19 22:07:20 +00:00
Joe Fernandez
97c616cb11 Merge "docs: M Preview - Updating image for Program Overview" into mnc-preview-docs 2015-05-19 21:59:15 +00:00
Joe Fernandez
b6a1b2aa3b docs: M Preview - Updating image for Program Overview
- also removing unused images

Change-Id: Ic120bc3b119ccda70e85fb0a7254d835677467dd
2015-05-19 14:57:19 -07:00
Oliver Woodman
64d78094f6 Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
- The dev guide has moved to Github, where we can easily maintain it
  together with the code.
- I'd like us to still keep this page on the Android site, to direct
  developers toward using ExoPlayer.
- I have no idea what branch this should be on, but can easily cherry-pick
  to another one as required.

Change-Id: I9179b822988698053463eed7162e970cab3e1ae4
2015-05-19 17:30:02 +01:00
Joe Fernandez
e7e9d17715 am 2b18c39d: Merge "docs: M Preview landing page updates" into mnc-preview-docs
* commit '2b18c39dacd6a14a677b13556e3c8bafa8e110d6':
  docs: M Preview landing page updates
2015-05-19 00:16:51 +00:00
Rich Slogar
80f67b6212 am 3f3cde41: am a01f2e73: am c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit '3f3cde41d178267aeff9a41ec56bc95ce1ad45bf':
  docs: emulator updates
2015-05-19 00:16:46 +00:00
Joe Fernandez
2b18c39dac Merge "docs: M Preview landing page updates" into mnc-preview-docs 2015-05-19 00:07:59 +00:00
Joe Fernandez
7c884e6fa8 docs: M Preview landing page updates
- Simplify the action links
- Remove data binding section: this is too much emphasis on that tool

Change-Id: Ic81cef14985a6cc3f14bc9176dd8311ef265d9da
2015-05-18 17:06:05 -07:00
Rich Slogar
3f3cde41d1 am a01f2e73: am c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit 'a01f2e737c23ea8a45d34b9709b9a1010385b4c5':
  docs: emulator updates
2015-05-19 00:05:35 +00:00
Rich Slogar
a01f2e737c am c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit 'c03a39ab74f5d4c6f62d5323d4049855758fdfcf':
  docs: emulator updates
2015-05-18 23:45:33 +00:00
Dirk Dougherty
905bc335a5 am bd5cf5de: Merge "Doc change: edits and image updates." into mnc-preview-docs
* commit 'bd5cf5de84d802d7858371cf1f06b47c7f7b56cf':
  Doc change: edits and image updates.
2015-05-18 18:44:23 +00:00
Dirk Dougherty
bd5cf5de84 Merge "Doc change: edits and image updates." into mnc-preview-docs 2015-05-18 18:33:17 +00:00
Dirk Dougherty
7af29cc9b9 Doc change: edits and image updates.
Change-Id: Ic09da0c7cab676aa8ad4da9eae22e9c631fc288e
2015-05-18 11:32:09 -07:00
Rich Slogar
54f2ca6ed4 am 348d105e: am 4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
* commit '348d105e3590b167330356d2ae98d341d98cb18e':
  docs: build-cmd-line-updates
2015-05-18 17:39:00 +00:00
Rich Slogar
348d105e35 am 4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
* commit '4e793fba568950ee2b3758e1482006661430440e':
  docs: build-cmd-line-updates
2015-05-18 17:24:50 +00:00
Rich Slogar
c03a39ab74 Merge "docs: emulator updates" into lmp-docs 2015-05-18 17:12:47 +00:00
Rich Slogar
4e793fba56 Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs 2015-05-18 17:12:23 +00:00
Mike Colagrosso
b17ba8532a Android Training: Add missing word
The description of when to use an IntentService in create-service.jd is
missing a word, which makes it difficult to follow. The cruical phrase
is that an IntentService "is the preferred way to *perform* simple
background operations".

Change-Id: I13e4338cd2bad968d05b945ea398e2332f307850
(cherry picked from commit eb26cfa4ceb6b89ab2cd39cf026f2cfeec7462c2)
2015-05-18 16:19:25 +00:00
Dirk Dougherty
ab6d537604 am 74709453: Doc change: adjust distribute and preview card grids and styles.
* commit '747094539612e565f512e42ca9a750cb316ed573':
  Doc change: adjust distribute and preview card grids and styles.
2015-05-18 03:48:35 +00:00
Dirk Dougherty
7470945396 Doc change: adjust distribute and preview card grids and styles.
Change-Id: I0b0fd5688c5efdb881d677173afdfb5f63d2fa73
2015-05-17 20:36:16 -07:00
Joe Fernandez
71bbd81f54 am a06ac3a0: docs: M Preview Content Sync #1
* commit 'a06ac3a0d8f5e9da99107803586533503a11f60a':
  docs: M Preview Content Sync #1
2015-05-15 22:59:03 +00:00