OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 056bc731: am 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer page, replacin...
Oliver Woodman [Tue, 26 May 2015 05:52:59 +0000 (05:52 +0000)]
am 056bc731: am 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs

* commit '056bc731ca7a53067027b0e72f58779aaf3c558a':
  Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.

9 years agoam 165d4585: am 1ccbe54f: am 46350fea: frameworks/base/docs/ndk: add missing doxygen css
Johan Euphrosine [Tue, 26 May 2015 05:52:54 +0000 (05:52 +0000)]
am 165d4585: am 1ccbe54f: am 46350fea: frameworks/base/docs/ndk: add missing doxygen css

* commit '165d4585605f0fd7bcab798d9759f465ce4dca44':
  frameworks/base/docs/ndk: add missing doxygen css

9 years agoam 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with...
Oliver Woodman [Tue, 26 May 2015 05:37:07 +0000 (05:37 +0000)]
am 1ddb7cae: am eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs

* commit '1ddb7caedba247aa9174fc6c78c4ea6b3b4f5a89':
  Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.

9 years agoam 1ccbe54f: am 46350fea: frameworks/base/docs/ndk: add missing doxygen css
Johan Euphrosine [Tue, 26 May 2015 05:37:01 +0000 (05:37 +0000)]
am 1ccbe54f: am 46350fea: frameworks/base/docs/ndk: add missing doxygen css

* commit '1ccbe54f2d651df7b9f9e5dfd3b58eaa2d92a9c8':
  frameworks/base/docs/ndk: add missing doxygen css

9 years agoam 0417dbac: Merge "Doc change: remove older diffs from static server hosting. Reques...
Dirk Dougherty [Mon, 25 May 2015 19:19:50 +0000 (19:19 +0000)]
am 0417dbac: Merge "Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage." into mnc-preview-docs

* commit '0417dbac1358661e2101e7ff1c9a873c59714bb9':
  Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.

9 years agoMerge "Doc change: remove older diffs from static server hosting. Requests will redir...
Dirk Dougherty [Mon, 25 May 2015 19:07:23 +0000 (19:07 +0000)]
Merge "Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage." into mnc-preview-docs

9 years agoam 10d44b75: Doc change: Updates to preview and distribute.
Dirk Dougherty [Sun, 24 May 2015 12:31:01 +0000 (12:31 +0000)]
am 10d44b75: Doc change: Updates to preview and distribute.

* commit '10d44b7581b67d6619c7060ca1d339e0d355c7af':
  Doc change: Updates to preview and distribute.

9 years agoDoc change: Updates to preview and distribute.
Dirk Dougherty [Sat, 23 May 2015 21:46:57 +0000 (14:46 -0700)]
Doc change: Updates to preview and distribute.

Change-Id: I097213ce68d50d10b23840f2ad61f26279293948

9 years agoDoc change: remove older diffs from static server hosting. Requests will redirect...
Dirk Dougherty [Sat, 23 May 2015 23:32:50 +0000 (16:32 -0700)]
Doc change: remove older diffs from static server hosting. Requests will redirect to downloadable zips in cloud storage.

Change-Id: Id3144b172808b1cde555d778f31ad5b4db0d941b

9 years agoam eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlay...
Oliver Woodman [Sat, 23 May 2015 11:29:02 +0000 (11:29 +0000)]
am eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs

* commit 'eb09fe5e3a9911daf4cb8e95145d2a6936aa189d':
  Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.

9 years agoMerge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site....
Oliver Woodman [Sat, 23 May 2015 11:15:34 +0000 (11:15 +0000)]
Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs

9 years agoam 38097510: docs: M Preview - Automatic Backups (Dolly) page
Joe Fernandez [Sat, 23 May 2015 10:08:49 +0000 (10:08 +0000)]
am 38097510: docs: M Preview - Automatic Backups (Dolly) page

* commit '380975104a9246c4f72f7882d855aec524267b6f':
  docs: M Preview - Automatic Backups (Dolly) page

9 years agodocs: M Preview - Automatic Backups (Dolly) page
Joe Fernandez [Wed, 13 May 2015 08:13:51 +0000 (01:13 -0700)]
docs: M Preview - Automatic Backups (Dolly) page

Change-Id: Ia9e6815271f5f22d6f11f1d61e68b6670f51a53d

9 years agoam 84fff53c: Merge "docs: M Preview - update the preview section TOC" into mnc-previe...
Joe Fernandez [Sat, 23 May 2015 08:03:24 +0000 (08:03 +0000)]
am 84fff53c: Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs

* commit '84fff53cd73ed017ed1f9342d39cc496fe74cac2':
  docs: M Preview - update the preview section TOC

9 years agoMerge "docs: M Preview - update the preview section TOC" into mnc-preview-docs
Joe Fernandez [Sat, 23 May 2015 07:50:48 +0000 (07:50 +0000)]
Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs

9 years agodocs: M Preview - update the preview section TOC
Joe Fernandez [Sat, 16 May 2015 00:38:39 +0000 (17:38 -0700)]
docs: M Preview - update the preview section TOC

Change-Id: I5776d367df3baec13aee27a8e920de9d9b69782d

9 years agoam 6a7406bc: frameworks/base/docs/ndk: fix typo in landing page
Johan Euphrosine [Sat, 23 May 2015 04:33:18 +0000 (04:33 +0000)]
am 6a7406bc: frameworks/base/docs/ndk: fix typo in landing page

* commit '6a7406bc1787d0b555ca3a3226a291d42554a94c':
  frameworks/base/docs/ndk: fix typo in landing page

9 years agoam 6cf938c3: Merge "docs: Add sample links and descriptions for M Preview" into mnc...
Joe Fernandez [Sat, 23 May 2015 01:09:02 +0000 (01:09 +0000)]
am 6cf938c3: Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs

* commit '6cf938c3021dd3492b43de6ee2664609e041a0c8':
  docs: Add sample links and descriptions for M Preview

9 years agoframeworks/base/docs/ndk: fix typo in landing page
Johan Euphrosine [Sat, 23 May 2015 01:01:57 +0000 (18:01 -0700)]
frameworks/base/docs/ndk: fix typo in landing page

Change-Id: Ie792506b73e85dd58ebf481339801aa1d8036031

9 years agoMerge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs
Joe Fernandez [Sat, 23 May 2015 00:57:21 +0000 (00:57 +0000)]
Merge "docs: Add sample links and descriptions for M Preview" into mnc-preview-docs

9 years agoam b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs
Dirk Dougherty [Sat, 23 May 2015 00:08:42 +0000 (00:08 +0000)]
am b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs

* commit 'b1410bc306195dc807f223bc5955780275fc6468':
  Doc change: updates for preview.

9 years agoam b373f49a: docs: NDK table of contents fixes
Joe Fernandez [Sat, 23 May 2015 00:08:36 +0000 (00:08 +0000)]
am b373f49a: docs: NDK table of contents fixes

* commit 'b373f49a85fcbe82993940416ce04e0a1fb1e340':
  docs: NDK table of contents fixes

9 years agoMerge "Doc change: updates for preview." into mnc-preview-docs
Dirk Dougherty [Fri, 22 May 2015 23:59:16 +0000 (23:59 +0000)]
Merge "Doc change: updates for preview." into mnc-preview-docs

9 years agoDoc change: updates for preview.
Dirk Dougherty [Fri, 22 May 2015 23:58:14 +0000 (16:58 -0700)]
Doc change: updates for preview.

Change-Id: Ie741785ae4b21373fa49dbd7f725cab1f812891a

9 years agodocs: NDK table of contents fixes
Joe Fernandez [Fri, 22 May 2015 19:27:04 +0000 (12:27 -0700)]
docs: NDK table of contents fixes

- fixing the encoding of the left navigation files for
  - Guides
  - References
  - Samples
  - Downloads

Change-Id: Ic3a45ff661f1c8e5784e833047764fecc6445cae

9 years agoam 61e6be64: Merge "Doc change: updates for preview content." into mnc-preview-docs
Dirk Dougherty [Fri, 22 May 2015 23:14:47 +0000 (23:14 +0000)]
am 61e6be64: Merge "Doc change: updates for preview content." into mnc-preview-docs

* commit '61e6be640b1e5d6ae4cacf0a2e62a7f66f42202c':
  Doc change: updates for preview content.

9 years agoam 46350fea: frameworks/base/docs/ndk: add missing doxygen css
Johan Euphrosine [Fri, 22 May 2015 23:06:20 +0000 (23:06 +0000)]
am 46350fea: frameworks/base/docs/ndk: add missing doxygen css

* commit '46350feac7398aecb661880827b1c8963f0e8cc5':
  frameworks/base/docs/ndk: add missing doxygen css

9 years agoMerge "Doc change: updates for preview content." into mnc-preview-docs
Dirk Dougherty [Fri, 22 May 2015 23:05:13 +0000 (23:05 +0000)]
Merge "Doc change: updates for preview content." into mnc-preview-docs

9 years agoDoc change: updates for preview content.
Dirk Dougherty [Fri, 22 May 2015 17:23:10 +0000 (10:23 -0700)]
Doc change: updates for preview content.

Change-Id: Ife06f0e5b3ef6950d5d6fe452940c8dd87ed89ea

9 years agoam dd4dc4a0: resolved conflicts for merge of 7044ee16 to mnc-preview-docs
David Friedman [Fri, 22 May 2015 22:32:19 +0000 (22:32 +0000)]
am dd4dc4a0: resolved conflicts for merge of 7044ee16 to mnc-preview-docs

* commit 'dd4dc4a0bec72cbfae8a3b27c72d75e90d38c79b':
  Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.

9 years agoframeworks/base/docs/ndk: add missing doxygen css
Johan Euphrosine [Fri, 22 May 2015 22:25:24 +0000 (15:25 -0700)]
frameworks/base/docs/ndk: add missing doxygen css

Change-Id: I509f51879ab5dab28f5128b756babc372ba16b74

9 years agoresolved conflicts for merge of 7044ee16 to mnc-preview-docs
David Friedman [Fri, 22 May 2015 22:23:12 +0000 (15:23 -0700)]
resolved conflicts for merge of 7044ee16 to mnc-preview-docs

Change-Id: Ia0d831660d7744f34c68dba62e19a11c83ec2ee7

9 years agoam 8f585128: (-s ours) am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionS...
Griff Hazen [Fri, 22 May 2015 20:07:11 +0000 (20:07 +0000)]
am 8f585128: (-s ours) am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev

* commit '8f585128f5ce28219f4f56bef27caac139bbfbd7':

9 years agoam dc085ed2: (-s ours) am 5825ad23: (-s ours) Revert "Reduce display device log spam...
Griff Hazen [Fri, 22 May 2015 20:07:06 +0000 (20:07 +0000)]
am dc085ed2: (-s ours) am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE

* commit 'dc085ed27a70296d4b4d30ba414b39b6f5a8eb9f':

9 years agoam e23031c9: Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
David Friedman [Fri, 22 May 2015 19:50:14 +0000 (19:50 +0000)]
am e23031c9: Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.

* commit 'e23031c974c9b051ba639f9ad68f891e2ae87da3':
  Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.

9 years agoDocs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
David Friedman [Fri, 22 May 2015 10:20:03 +0000 (03:20 -0700)]
Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.

Change-Id: I3867d70f9d669fa08cd7d533d79e02c15339d4ff

9 years agoam fe6d855c: am 16580c9b: am 460bcb54: Merge "frameworks/base/docs: add jd files...
Johan Euphrosine [Fri, 22 May 2015 15:37:49 +0000 (15:37 +0000)]
am fe6d855c: am 16580c9b: am 460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs

* commit 'fe6d855cf3239558f780f91ded6679f54cd47661':
  frameworks/base/docs: add jd files for NDK reference

9 years agoam 16580c9b: am 460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference...
Johan Euphrosine [Fri, 22 May 2015 15:27:01 +0000 (15:27 +0000)]
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

9 years agoam 460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp...
Johan Euphrosine [Fri, 22 May 2015 15:15:51 +0000 (15:15 +0000)]
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

9 years agoMerge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
Johan Euphrosine [Fri, 22 May 2015 14:39:33 +0000 (14:39 +0000)]
Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs

9 years agoam ee143ce3: docs: M Preview Program overview, update 2
Joe Fernandez [Fri, 22 May 2015 04:29:13 +0000 (04:29 +0000)]
am ee143ce3: docs: M Preview Program overview, update 2

* commit 'ee143ce3eca3db788ddff6f21a8aae6471eec5db':
  docs: M Preview Program overview, update 2

9 years agodocs: M Preview Program overview, update 2
Joe Fernandez [Fri, 22 May 2015 04:08:41 +0000 (21:08 -0700)]
docs: M Preview Program overview, update 2

Change-Id: If36aa779a29b9ac0a5c36e7ecf4bfe80a25d5ba4

9 years agoam d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO...
Griff Hazen [Thu, 21 May 2015 22:58:25 +0000 (22:58 +0000)]
am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev

* commit 'd4e00d2b9d29e62b1ad989afb1fe2bfe3b519891':
  Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE

9 years agoam 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
Griff Hazen [Thu, 21 May 2015 22:58:21 +0000 (22:58 +0000)]
am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE

* commit '5825ad231319207a64debacaa3db4812548b0442':
  Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE

9 years agoam d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO...
Griff Hazen [Thu, 21 May 2015 22:55:23 +0000 (22:55 +0000)]
am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev

* commit 'd4e00d2b9d29e62b1ad989afb1fe2bfe3b519891':
  Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE

9 years agoam 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
Griff Hazen [Thu, 21 May 2015 22:55:18 +0000 (22:55 +0000)]
am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE

* commit '5825ad231319207a64debacaa3db4812548b0442':
  Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE

9 years agoMerge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into...
Griff Hazen [Thu, 21 May 2015 22:43:45 +0000 (22:43 +0000)]
Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev

9 years agoam 85dea528: Doc change: updated images, landings, and ndk updates.
Dirk Dougherty [Thu, 21 May 2015 22:13:19 +0000 (22:13 +0000)]
am 85dea528: Doc change: updated images, landings, and ndk updates.

* commit '85dea528866217d4b3d40a1162c00c4e836504aa':
  Doc change: updated images, landings, and ndk updates.

9 years agoDoc change: updated images, landings, and ndk updates.
Dirk Dougherty [Thu, 21 May 2015 21:20:25 +0000 (14:20 -0700)]
Doc change: updated images, landings, and ndk updates.

Change-Id: If128f8394438471365db6f7c0a42e6b38d25d250

9 years agoRevert "Reduce display device log spam." DO NOT MERGE ANYWHERE
Griff Hazen [Thu, 21 May 2015 21:15:12 +0000 (21:15 +0000)]
Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE

This CL didn't ship with diamond-release, but will make diamond-mr1.

This reverts commit 80fa3fa027c06be0f4bbd3a4ab319914377d883d.

Change-Id: I1b037b6ac6a504235463a36a5dcd152b6a1434f3

9 years agoRevert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
Griff Hazen [Thu, 21 May 2015 20:48:59 +0000 (20:48 +0000)]
Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE

This CL didn't ship with diamond-release, but will make diamond-mr1.

This reverts commit c663d99f007c0faa7b66a569ec4083b82d60ef15.

Change-Id: I1430ed7a3221a4f06ad730778c757a68e16b808b

9 years agoam 5c7dcb30: am 0e7fa9e3: docs: Update the AlwaysOn sample link to point to DAC\...
Luan Nguyen [Thu, 21 May 2015 18:26:34 +0000 (18:26 +0000)]
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

9 years agoam 0e7fa9e3: docs: Update the AlwaysOn sample link to point to DAC\'s samples
Luan Nguyen [Thu, 21 May 2015 18:12:35 +0000 (18:12 +0000)]
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

9 years agodocs: Update the AlwaysOn sample link to point to DAC's samples
Luan Nguyen [Thu, 21 May 2015 17:09:24 +0000 (10:09 -0700)]
docs: Update the AlwaysOn sample link to point to DAC's samples

Change-Id: I54e2457009ef561c49a042e2a65fa55808a370bf

9 years agodocs: Add sample links and descriptions for M Preview
Luan Nguyen [Tue, 12 May 2015 20:21:34 +0000 (13:21 -0700)]
docs: Add sample links and descriptions for M Preview

bug: 20910953
Change-Id: Ia4c04357b2e6c772ebf98b463c06a7eadb1ff893

9 years agoam 23fcc39e: docs: M Preview downloads and SDK Setup pages v2
Joe Fernandez [Thu, 21 May 2015 14:16:39 +0000 (14:16 +0000)]
am 23fcc39e: docs: M Preview downloads and SDK Setup pages v2

* commit '23fcc39e419c74533697cc9858709e681266830a':
  docs: M Preview downloads and SDK Setup pages v2

9 years agoam dfa79aeb: am d5600855: Merge "docs: Refresh Wearable support library reference...
Luan Nguyen [Thu, 21 May 2015 14:16:34 +0000 (14:16 +0000)]
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

9 years agoam 6d592518: am 8b959ee9: Merge "docs: Remove references to Android Studio 0.8 beta...
Luan Nguyen [Thu, 21 May 2015 14:16:29 +0000 (14:16 +0000)]
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

9 years agoam 2801c77e: am 606e84cf: Merge "docs: Add Always-On lesson for Wear apps" into lmp...
Luan Nguyen [Thu, 21 May 2015 14:16:24 +0000 (14:16 +0000)]
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

9 years agoam 94587871: am 5ee30ed5: Merge "docs: Add always-on design for wearable activities...
Luan Nguyen [Thu, 21 May 2015 14:16:13 +0000 (14:16 +0000)]
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

9 years agoframeworks/base/docs: add jd files for NDK reference
Johan Euphrosine [Thu, 21 May 2015 08:28:48 +0000 (01:28 -0700)]
frameworks/base/docs: add jd files for NDK reference

Generated using:
https://android-review.googlesource.com/#/c/151627/

Change-Id: Ib4840ef370d6b254da4f0b8f7b972608828b0d0e

9 years agodocs: M Preview downloads and SDK Setup pages v2
Joe Fernandez [Tue, 19 May 2015 19:27:07 +0000 (12:27 -0700)]
docs: M Preview downloads and SDK Setup pages v2

Change-Id: I149061fc41d805722171f037cf62f8c64bffdefe

9 years agoam 037c9cac: Merge "Fix build." into cw-d-mr1-dev
Filip Gruszczynski [Thu, 21 May 2015 02:55:33 +0000 (02:55 +0000)]
am 037c9cac: Merge "Fix build." into cw-d-mr1-dev

* commit '037c9caccdc98bfe9d952e797535611c791787aa':
  Fix build.

9 years agoMerge "Fix build." into cw-d-mr1-dev
Filip Gruszczynski [Thu, 21 May 2015 02:41:06 +0000 (02:41 +0000)]
Merge "Fix build." into cw-d-mr1-dev

9 years agoFix build.
Filip Gruszczynski [Thu, 21 May 2015 02:40:27 +0000 (19:40 -0700)]
Fix build.

Change-Id: I49f669ee8eed53cf2fc30077cf0a066312865733

9 years agoam d5600855: Merge "docs: Refresh Wearable support library reference for Diamond...
Luan Nguyen [Wed, 20 May 2015 23:09:50 +0000 (23:09 +0000)]
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

9 years agoam 8b959ee9: Merge "docs: Remove references to Android Studio 0.8 beta" into lmp...
Luan Nguyen [Wed, 20 May 2015 23:09:46 +0000 (23:09 +0000)]
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

9 years agoam 606e84cf: Merge "docs: Add Always-On lesson for Wear apps" into lmp-mr1-ub-docs
Luan Nguyen [Wed, 20 May 2015 23:09:41 +0000 (23:09 +0000)]
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

9 years agoam 5ee30ed5: Merge "docs: Add always-on design for wearable activities" into lmp...
Luan Nguyen [Wed, 20 May 2015 23:09:31 +0000 (23:09 +0000)]
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

9 years agoMerge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1...
Luan Nguyen [Wed, 20 May 2015 23:00:12 +0000 (23:00 +0000)]
Merge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1-ub-docs

9 years agoMerge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs
Luan Nguyen [Wed, 20 May 2015 22:59:14 +0000 (22:59 +0000)]
Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs

9 years agoMerge "docs: Add Always-On lesson for Wear apps" into lmp-mr1-ub-docs
Luan Nguyen [Wed, 20 May 2015 22:58:55 +0000 (22:58 +0000)]
Merge "docs: Add Always-On lesson for Wear apps" into lmp-mr1-ub-docs

9 years agoMerge "docs: Add always-on design for wearable activities" into lmp-mr1-ub-docs
Luan Nguyen [Wed, 20 May 2015 22:58:27 +0000 (22:58 +0000)]
Merge "docs: Add always-on design for wearable activities" into lmp-mr1-ub-docs

9 years agoam cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-dev
Filip Gruszczynski [Wed, 20 May 2015 22:54:14 +0000 (22:54 +0000)]
am cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-dev

* commit 'cb89ac84c621e047d81873428325dfd747b90a6b':
  Support for devices with a chin.

9 years agodocs: Add Always-On lesson for Wear apps
Luan Nguyen [Fri, 1 May 2015 14:57:41 +0000 (07:57 -0700)]
docs: Add Always-On lesson for Wear apps

bug:20089205
Change-Id: I52c79ee2f96b5599529547d83b32269a0771a461

9 years agoMerge "Support for devices with a chin." into cw-d-mr1-dev
Filip Gruszczynski [Wed, 20 May 2015 22:41:42 +0000 (22:41 +0000)]
Merge "Support for devices with a chin." into cw-d-mr1-dev

9 years agoam 80cf2210: Add config_forceVoiceInteractionServicePackage to allow a device to...
Cedric Ho [Wed, 20 May 2015 21:56:27 +0000 (21:56 +0000)]
am 80cf2210: Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.

* commit '80cf2210226bc652181abafe606b69ebce63af78':
  Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.

9 years agoSupport for devices with a chin.
Filip Gruszczynski [Mon, 20 Apr 2015 15:40:57 +0000 (08:40 -0700)]
Support for devices with a chin.

Information about the chin is now part of the config.xml instead of the
theme. It is retrieved by WindowManagerService and passed to the clients
as insets. Clients can adjust their behavior in a way that makes it
invisible to the user, that part of the surface doesn't actually exist.

Bug: 19908853

Change-Id: Iedf57bf3c848201b854f91ffeb3b59187d375c1f

9 years agoAdd config_forceVoiceInteractionServicePackage to allow a device to config its VoiceI...
Cedric Ho [Tue, 19 May 2015 22:44:31 +0000 (15:44 -0700)]
Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.

Change-Id: Ic40d90f1a7a9942f5e82080668552239bbed9b03

9 years agodocs: Add always-on design for wearable activities
Luan Nguyen [Wed, 22 Apr 2015 17:45:00 +0000 (10:45 -0700)]
docs: Add always-on design for wearable activities

bug: 18960180
Change-Id: I57b5052041984ac48648fc65309a58c9ef255611

9 years agodocs: Remove references to Android Studio 0.8 beta
Luan Nguyen [Wed, 13 May 2015 17:26:39 +0000 (10:26 -0700)]
docs: Remove references to Android Studio 0.8 beta

bug: 21109817
Change-Id: I8cde77651f7dea324aa4ebebdd7cd6437528098a

9 years agoam 97c616cb: Merge "docs: M Preview - Updating image for Program Overview" into mnc...
Joe Fernandez [Tue, 19 May 2015 22:07:20 +0000 (22:07 +0000)]
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

9 years agoMerge "docs: M Preview - Updating image for Program Overview" into mnc-preview-docs
Joe Fernandez [Tue, 19 May 2015 21:59:14 +0000 (21:59 +0000)]
Merge "docs: M Preview - Updating image for Program Overview" into mnc-preview-docs

9 years agodocs: M Preview - Updating image for Program Overview
Joe Fernandez [Tue, 19 May 2015 21:57:19 +0000 (14:57 -0700)]
docs: M Preview - Updating image for Program Overview

- also removing unused images

Change-Id: Ic120bc3b119ccda70e85fb0a7254d835677467dd

9 years agoMerge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp...
Yigit Boyar [Tue, 19 May 2015 18:40:36 +0000 (18:40 +0000)]
Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev

9 years agoRemove most of ExoPlayer page, replacing it with links to ExoPlayer site.
Oliver Woodman [Tue, 19 May 2015 16:30:02 +0000 (17:30 +0100)]
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

9 years agoam 2b18c39d: Merge "docs: M Preview landing page updates" into mnc-preview-docs
Joe Fernandez [Tue, 19 May 2015 00:16:51 +0000 (00:16 +0000)]
am 2b18c39d: Merge "docs: M Preview landing page updates" into mnc-preview-docs

* commit '2b18c39dacd6a14a677b13556e3c8bafa8e110d6':
  docs: M Preview landing page updates

9 years agoam 3f3cde41: am a01f2e73: am c03a39ab: Merge "docs: emulator updates" into lmp-docs
Rich Slogar [Tue, 19 May 2015 00:16:46 +0000 (00:16 +0000)]
am 3f3cde41: am a01f2e73: am c03a39ab: Merge "docs: emulator updates" into lmp-docs

* commit '3f3cde41d178267aeff9a41ec56bc95ce1ad45bf':
  docs: emulator updates

9 years agoMerge "docs: M Preview landing page updates" into mnc-preview-docs
Joe Fernandez [Tue, 19 May 2015 00:07:58 +0000 (00:07 +0000)]
Merge "docs: M Preview landing page updates" into mnc-preview-docs

9 years agodocs: M Preview landing page updates
Joe Fernandez [Tue, 19 May 2015 00:02:57 +0000 (17:02 -0700)]
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

9 years agoam a01f2e73: am c03a39ab: Merge "docs: emulator updates" into lmp-docs
Rich Slogar [Tue, 19 May 2015 00:05:35 +0000 (00:05 +0000)]
am a01f2e73: am c03a39ab: Merge "docs: emulator updates" into lmp-docs

* commit 'a01f2e737c23ea8a45d34b9709b9a1010385b4c5':
  docs: emulator updates

9 years agoam c03a39ab: Merge "docs: emulator updates" into lmp-docs
Rich Slogar [Mon, 18 May 2015 23:45:33 +0000 (23:45 +0000)]
am c03a39ab: Merge "docs: emulator updates" into lmp-docs

* commit 'c03a39ab74f5d4c6f62d5323d4049855758fdfcf':
  docs: emulator updates

9 years agoRevert "Make VPA.setInterpolator(null) unset the interpolator."
Yigit Boyar [Mon, 18 May 2015 23:38:41 +0000 (23:38 +0000)]
Revert "Make VPA.setInterpolator(null) unset the interpolator."

This reverts commit 58ae164100060d1b8a9709aeea7a2b488ff0ac98.

Change-Id: I6d9942b41694f6a5e6c211df839aa385eea0c496

9 years agoMerge "Make VPA.setInterpolator(null) unset the interpolator." into lmp-mr1-ub-dev
Vladislav Kaznacheev [Mon, 18 May 2015 23:32:55 +0000 (23:32 +0000)]
Merge "Make VPA.setInterpolator(null) unset the interpolator." into lmp-mr1-ub-dev

9 years agoam bd5cf5de: Merge "Doc change: edits and image updates." into mnc-preview-docs
Dirk Dougherty [Mon, 18 May 2015 18:44:23 +0000 (18:44 +0000)]
am bd5cf5de: Merge "Doc change: edits and image updates." into mnc-preview-docs

* commit 'bd5cf5de84d802d7858371cf1f06b47c7f7b56cf':
  Doc change: edits and image updates.

9 years agoMerge "Doc change: edits and image updates." into mnc-preview-docs
Dirk Dougherty [Mon, 18 May 2015 18:33:16 +0000 (18:33 +0000)]
Merge "Doc change: edits and image updates." into mnc-preview-docs

9 years agoDoc change: edits and image updates.
Dirk Dougherty [Mon, 18 May 2015 18:32:09 +0000 (11:32 -0700)]
Doc change: edits and image updates.

Change-Id: Ic09da0c7cab676aa8ad4da9eae22e9c631fc288e

9 years agoam 348d105e: am 4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
Rich Slogar [Mon, 18 May 2015 17:39:00 +0000 (17:39 +0000)]
am 348d105e: am 4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs

* commit '348d105e3590b167330356d2ae98d341d98cb18e':
  docs: build-cmd-line-updates

9 years agoam 4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
Rich Slogar [Mon, 18 May 2015 17:24:50 +0000 (17:24 +0000)]
am 4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs

* commit '4e793fba568950ee2b3758e1482006661430440e':
  docs: build-cmd-line-updates

9 years agoMerge "docs: emulator updates" into lmp-docs
Rich Slogar [Mon, 18 May 2015 17:12:46 +0000 (17:12 +0000)]
Merge "docs: emulator updates" into lmp-docs