OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle...
Leon Scroggins III [Wed, 28 Jan 2015 18:32:20 +0000 (18:32 +0000)]
am 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 automerge: 5d7bd13

* commit '3c9376a5a2cbcad5c6883dad1e938a7924a8dd4d':

9 years agoam 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch...
Leon Scroggins III [Wed, 28 Jan 2015 18:23:47 +0000 (18:23 +0000)]
am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5
automerge: 5d7bd13

* commit '5d7bd13fc88d066d4c27a2459f3e3a58a1f4dec2':

9 years agoam 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch...
Leon Scroggins III [Wed, 28 Jan 2015 17:39:52 +0000 (17:39 +0000)]
am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.
automerge: 1e0d4b5

* commit '1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
  Handle bad ninepatch data.

9 years agoam c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs
Joe Fernandez [Tue, 27 Jan 2015 23:09:12 +0000 (23:09 +0000)]
am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs

* commit 'c6326f44bf0634f58a7bf6f322b4b676352baeed':
  docs: plugin for gradle typo

9 years agoam 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs
Joe Fernandez [Tue, 27 Jan 2015 23:03:49 +0000 (23:03 +0000)]
am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs

* commit '05defb992eefb8a32742d64c06e8e8fd02dbf670':
  docs: plugin for gradle typo

9 years agoam cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am...
Leon Scroggins III [Tue, 27 Jan 2015 23:02:57 +0000 (23:02 +0000)]
am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit 'cae216f8dc3e1d752f2c353e488da07cadd95570':
  Handle bad ninepatch data.

9 years agoMerge "docs: plugin for gradle typo" into lmp-docs
Joe Fernandez [Tue, 27 Jan 2015 22:57:29 +0000 (22:57 +0000)]
Merge "docs: plugin for gradle typo" into lmp-docs

9 years agoam 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle...
Leon Scroggins III [Tue, 27 Jan 2015 22:55:00 +0000 (22:55 +0000)]
am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit '1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
  Handle bad ninepatch data.

9 years agoam 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch...
Leon Scroggins III [Tue, 27 Jan 2015 22:48:29 +0000 (22:48 +0000)]
am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit '1dbbc2045ae16a4923b30c9576703d02a4363529':
  Handle bad ninepatch data.

9 years agoam 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:42:03 +0000 (22:42 +0000)]
am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit '6106f6a490cb5816602e8e3ae84a5c653dda44d3':
  Handle bad ninepatch data.

9 years agoam 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:31:47 +0000 (22:31 +0000)]
am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit '9352296810926eae663477526545a55e1b1f7a27':
  Handle bad ninepatch data.

9 years agoam 01287549: am 9a6143fa: Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:17:11 +0000 (22:17 +0000)]
am 01287549: am 9a6143fa: Handle bad ninepatch data.

* commit '01287549ad415c51377683696eb37c362d43061a':
  Handle bad ninepatch data.

9 years agoam 9a6143fa: Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:01:08 +0000 (22:01 +0000)]
am 9a6143fa: Handle bad ninepatch data.

* commit '9a6143fab7d93797e4b22a12b89e07c160e5c31d':
  Handle bad ninepatch data.

9 years agoam 8ec3eb4e: am de113066: docs: Transitions training class.
Ricardo Cervera [Tue, 27 Jan 2015 21:23:19 +0000 (21:23 +0000)]
am 8ec3eb4e: am de113066: docs: Transitions training class.

* commit '8ec3eb4e7c38c3c368c62bc47805d802df15f2a8':
  docs: Transitions training class.

9 years agoam de113066: docs: Transitions training class.
Ricardo Cervera [Tue, 27 Jan 2015 21:16:53 +0000 (21:16 +0000)]
am de113066: docs: Transitions training class.

* commit 'de113066d80c3f19979eb531484af73f64640de9':
  docs: Transitions training class.

9 years agodocs: Transitions training class.
Ricardo Cervera [Mon, 12 Jan 2015 20:45:54 +0000 (12:45 -0800)]
docs: Transitions training class.

Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591

9 years agoHandle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 16:12:02 +0000 (11:12 -0500)]
Handle bad ninepatch data.

Changes proposed by Ben Hawkes of Google Project Zero.

NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.

ResourceTypes.h:
Store ninepatch values as unsigned.

BUG:19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
(cherry picked from commit a730ef3f77fc495bc90199b4d45efab26d609782)

9 years agoam 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to Location API...
Sarah Maddox [Mon, 26 Jan 2015 20:30:14 +0000 (20:30 +0000)]
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

* commit '95226c981b4e14a900f7c4224534d370aeb1ca60':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.

9 years agoam 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses...
Sarah Maddox [Mon, 26 Jan 2015 20:23:25 +0000 (20:23 +0000)]
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

* commit '912cacde8619d28ea1d4a3f6ebf30be1c8a5d47a':
  docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.

9 years agoMerge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient...
Sarah Maddox [Mon, 26 Jan 2015 20:12:21 +0000 (20:12 +0000)]
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

9 years agoam d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into...
Ricardo Cervera [Mon, 26 Jan 2015 19:45:33 +0000 (19:45 +0000)]
am d064ce7e: am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs

* commit 'd064ce7e8b4ef75c07b99d466c85ea55ef2f4163':
  docs: Wear DataItem listener improvements

9 years agoam edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
Ricardo Cervera [Mon, 26 Jan 2015 19:39:48 +0000 (19:39 +0000)]
am edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs

* commit 'edb7a4420bfbf3e7f9efc06718b45c56bbd3dc2d':
  docs: Wear DataItem listener improvements

9 years agoMerge "docs: Wear DataItem listener improvements" into lmp-docs
Ricardo Cervera [Mon, 26 Jan 2015 19:32:12 +0000 (19:32 +0000)]
Merge "docs: Wear DataItem listener improvements" into lmp-docs

9 years agodocs: Adds new geocoding sample to Location API training.
Sarah Maddox [Sun, 30 Nov 2014 22:08:26 +0000 (09:08 +1100)]
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

9 years agodocs: plugin for gradle typo
Rich Slogar [Fri, 23 Jan 2015 17:56:50 +0000 (09:56 -0800)]
docs: plugin for gradle typo

b/19106103

Change-Id: I3db503ccd5a93ee0a3bdf6dfb8c76f7391a5e75e

9 years agoam 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines...
Ricardo Cervera [Thu, 22 Jan 2015 18:02:30 +0000 (18:02 +0000)]
am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs

* commit '02d093ca675535f1a7f702a9fffd277123cea8ca':
  docs: Fixes to the watch faces design guidelines

9 years agoam bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
Ricardo Cervera [Thu, 22 Jan 2015 17:56:54 +0000 (17:56 +0000)]
am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs

* commit 'bdfcd56e7f01b7bb1f50c932792b9528c67892e5':
  docs: Fixes to the watch faces design guidelines

9 years agoMerge "docs: Fixes to the watch faces design guidelines" into lmp-docs
Ricardo Cervera [Thu, 22 Jan 2015 17:50:47 +0000 (17:50 +0000)]
Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs

9 years agodocs: Fixes to the watch faces design guidelines
Ricardo Cervera [Wed, 14 Jan 2015 16:29:38 +0000 (08:29 -0800)]
docs: Fixes to the watch faces design guidelines

Bug: 19001253

Change-Id: I356b887de71710afa27acc7544d0efdc3a857e91

9 years agoam edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaratio...
Luan Nguyen [Thu, 22 Jan 2015 17:35:31 +0000 (17:35 +0000)]
am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)

* commit 'edb9ba54f7be81faacda4ee36824c6f8cd314fb3':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)

9 years agoam 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var...
Luan Nguyen [Thu, 22 Jan 2015 17:29:30 +0000 (17:29 +0000)]
am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)

* commit '1dd76ea2760f84496a5b82435fc35d7c28a6dd6d':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)

9 years agodocs: Fix companion configuration (18864041)
Luan Nguyen [Wed, 21 Jan 2015 23:16:36 +0000 (15:16 -0800)]
docs: Fix companion configuration (18864041)
Fix declaration of var and incorrect method call (18617393)

bug: 18864041
bug: 18617393
Change-Id: Ic31e44acfe7338f56acdbbd97ba8cc1e87042b53

9 years agoam 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into...
Andrew Solovay [Wed, 21 Jan 2015 23:22:45 +0000 (23:22 +0000)]
am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs
automerge: e628954

* commit 'e628954ea49da6a798879815d221f4d2d871e79a':
  docs: WebView security notes for apps on pre-K devices

9 years agoam f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168...
Luan Nguyen [Wed, 21 Jan 2015 23:21:24 +0000 (23:21 +0000)]
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-docs
automerge: 8884eda

* commit '8884edaaeb0375338f5cf6474c91c3f55f44a172':
  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).

9 years agoam 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into...
Andrew Solovay [Wed, 21 Jan 2015 23:10:59 +0000 (23:10 +0000)]
am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs

* commit '78f4342fac982a130a62dac2a459cef2a4c29f5a':
  docs: WebView security notes for apps on pre-K devices

9 years agoam f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168...
Luan Nguyen [Wed, 21 Jan 2015 23:10:55 +0000 (23:10 +0000)]
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-docs

* commit 'f082f8980e742e9a60aeb91271caff38e10cf0a8':
  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).

9 years agoMerge "docs: WebView security notes for apps on pre-K devices" into lmp-docs
Andrew Solovay [Wed, 21 Jan 2015 19:20:57 +0000 (19:20 +0000)]
Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs

9 years agodocs: Wear DataItem listener improvements
Ricardo Cervera [Tue, 20 Jan 2015 21:41:56 +0000 (13:41 -0800)]
docs: Wear DataItem listener improvements

Change-Id: I07bf2ab063556dd4f6e42a5835f73dd5b326d26e

9 years agoMerge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with...
Luan Nguyen [Wed, 21 Jan 2015 16:19:18 +0000 (16:19 +0000)]
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

9 years agodocs: Fix conditional in ambient mode check method (18832168).
Luan Nguyen [Tue, 20 Jan 2015 16:41:51 +0000 (08:41 -0800)]
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

9 years agodocs: WebView security notes for apps on pre-K devices
Andrew Solovay [Tue, 20 Jan 2015 23:47:31 +0000 (15:47 -0800)]
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

9 years agoam 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug...
Ricardo Cervera [Tue, 20 Jan 2015 18:10:49 +0000 (18:10 +0000)]
am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048
automerge: 458f432

* commit '458f4326bdff638cefe175b179a487872cf678c1':

9 years agoam 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug...
Ricardo Cervera [Tue, 20 Jan 2015 18:03:50 +0000 (18:03 +0000)]
am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4
automerge: eada048

* commit 'eada048addc14a95ced54b17c6a75f5f899e2c2a':

9 years agoam 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug...
Ricardo Cervera [Tue, 20 Jan 2015 17:57:45 +0000 (17:57 +0000)]
am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
automerge: e8f6bd4

* commit 'e8f6bd484627e16fa2fd9509b0f06056ee44be94':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256

9 years agoam 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 03:06:38 +0000 (03:06 +0000)]
am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs

* commit '224624e8e68bd1debd0f76d1b614ae3bdc637cb2':
  docs: removing code captions

9 years agoam 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 03:06:35 +0000 (03:06 +0000)]
am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs

* commit '78001f9338b72876e95b7d25053b706804a21070':
  docs: Add screenshot

9 years agoam c987ca05: Merge "docs: removing code captions" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 02:28:51 +0000 (02:28 +0000)]
am c987ca05: Merge "docs: removing code captions" into lmp-docs

* commit 'c987ca05010a8cc06572d5b04c93fb6404f8bf45':
  docs: removing code captions

9 years agoam ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 02:28:47 +0000 (02:28 +0000)]
am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs

* commit 'ab18d6c82eb92732ef7ab54adffcd27faffd0c57':
  docs: Add screenshot

9 years agoMerge "docs: removing code captions" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 01:31:52 +0000 (01:31 +0000)]
Merge "docs: removing code captions" into lmp-docs

9 years agoMerge "docs: Add screenshot" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 01:31:13 +0000 (01:31 +0000)]
Merge "docs: Add screenshot" into lmp-docs

9 years agoam e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja...
David Friedman [Sat, 17 Jan 2015 00:36:27 +0000 (00:36 +0000)]
am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs

* commit 'e255cb0f9e0ecd5f0aa2c963f1a6d4c7029c85af':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw

9 years agoam fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es...
David Friedman [Sat, 17 Jan 2015 00:30:18 +0000 (00:30 +0000)]
am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs

* commit 'fa66fdd57a494bed0a92d9fb0aadf332395f371f':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw

9 years agoMerge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh...
David Friedman [Sat, 17 Jan 2015 00:23:29 +0000 (00:23 +0000)]
Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs

9 years agoLocalization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
David Friedman [Wed, 19 Nov 2014 21:03:45 +0000 (13:03 -0800)]
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw

Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f

9 years agoam 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code...
Quddus Chong [Fri, 16 Jan 2015 22:28:24 +0000 (22:28 +0000)]
am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs

* commit '930ac01fd728067a79335e2983b870528c13a872':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906

9 years agoam 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into...
Joe Fernandez [Fri, 16 Jan 2015 22:23:22 +0000 (22:23 +0000)]
am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs

* commit '90d2aca7f05b2e2acf8a7bc37d8007074fdbdea5':
  docs: adding studio-sample-in-editor.png file

9 years agoam 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc
Ricardo Cervera [Fri, 16 Jan 2015 22:23:19 +0000 (22:23 +0000)]
am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc

* commit '73f36d47465da113f39270f4f9cf5d601aa0b585':
  docs: Add browseable Wearable Support Lib Javadoc

9 years agoam de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets....
Quddus Chong [Fri, 16 Jan 2015 22:21:34 +0000 (22:21 +0000)]
am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs

* commit 'de0a87007b987a76af2ddd526dd473ad83fbb74b':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906

9 years agoam 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 22:15:25 +0000 (22:15 +0000)]
am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs

* commit '217d145d49940d28a3c5914d94ce2e56f243301b':
  docs: adding studio-sample-in-editor.png file

9 years agoam e229751d: docs: Add browseable Wearable Support Lib Javadoc
Ricardo Cervera [Fri, 16 Jan 2015 22:15:21 +0000 (22:15 +0000)]
am e229751d: docs: Add browseable Wearable Support Lib Javadoc

* commit 'e229751d11692ede7fed3b56472f2d020767b412':
  docs: Add browseable Wearable Support Lib Javadoc

9 years agoMerge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906...
Quddus Chong [Fri, 16 Jan 2015 22:03:31 +0000 (22:03 +0000)]
Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs

9 years agoMerge "docs: adding studio-sample-in-editor.png file" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 21:58:36 +0000 (21:58 +0000)]
Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs

9 years agodocs: adding studio-sample-in-editor.png file
Rich Slogar [Fri, 16 Jan 2015 20:26:20 +0000 (12:26 -0800)]
docs: adding studio-sample-in-editor.png file

Change-Id: I8b200eeb5134e9c66cb198f06ccfaa78a7f6a505

9 years agoam aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into...
Joe Fernandez [Fri, 16 Jan 2015 19:49:08 +0000 (19:49 +0000)]
am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs

* commit 'aafd29beb8d455fd825e2f0f0f8792b1ca6dc6ca':
  docs: studio disk space requirements typo

9 years agodocs: Fixed typos in Game Controller training code snippets.
Quddus Chong [Fri, 16 Jan 2015 19:35:07 +0000 (11:35 -0800)]
docs: Fixed typos in Game Controller training code snippets.
bug: 17959906

Change-Id: I2fa1b01704a69536b3d27fe6aa96c441d7f8fb27

9 years agodocs: Add browseable Wearable Support Lib Javadoc
Ricardo Cervera [Tue, 13 Jan 2015 18:04:04 +0000 (10:04 -0800)]
docs: Add browseable Wearable Support Lib Javadoc

Change-Id: Ied1f25f637c529046b0adc1e1ea173a290b22da1

9 years agoam c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:57:42 +0000 (18:57 +0000)]
am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs

* commit 'c6f70adf2439978954fefe00a9ff24135654ed52':
  docs: link to sdk manager

9 years agoam 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult().
Ricardo Cervera [Fri, 16 Jan 2015 18:57:39 +0000 (18:57 +0000)]
am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult().

* commit '85bfcbd3e2367768c1d026cbba6fe0fa9a6b2dae':
  docs: Added info on noHistory and onActivityResult().

9 years agoam 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:56:25 +0000 (18:56 +0000)]
am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs

* commit '8304b8b9ceae4c35ddf4ae80b552127e5ed77ce4':
  docs: studio disk space requirements typo

9 years agoam c84021ba: Merge "docs: link to sdk manager" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:52:12 +0000 (18:52 +0000)]
am c84021ba: Merge "docs: link to sdk manager" into lmp-docs

* commit 'c84021ba99d9326b016120a1d7aab4ee551bcce9':
  docs: link to sdk manager

9 years agoam 97c4ba98: docs: Added info on noHistory and onActivityResult().
Ricardo Cervera [Fri, 16 Jan 2015 18:52:08 +0000 (18:52 +0000)]
am 97c4ba98: docs: Added info on noHistory and onActivityResult().

* commit '97c4ba9862006e2c9f4cea07f55dc7120d305e5a':
  docs: Added info on noHistory and onActivityResult().

9 years agoMerge "docs: studio disk space requirements typo" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:49:27 +0000 (18:49 +0000)]
Merge "docs: studio disk space requirements typo" into lmp-docs

9 years agoMerge "docs: link to sdk manager" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:47:51 +0000 (18:47 +0000)]
Merge "docs: link to sdk manager" into lmp-docs

9 years agoam 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
Ricardo Cervera [Fri, 16 Jan 2015 18:29:25 +0000 (18:29 +0000)]
am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev

* commit '93f94c2ca5bf23533fc5a9bd70a4795584d20618':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256

9 years agoresolved conflicts for merge of e8f6bd48 to lmp-dev
Ricardo Cervera [Fri, 16 Jan 2015 17:54:30 +0000 (09:54 -0800)]
resolved conflicts for merge of e8f6bd48 to lmp-dev

Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff

9 years agodocs: Added info on noHistory and onActivityResult().
Ricardo Cervera [Fri, 4 Apr 2014 18:17:06 +0000 (11:17 -0700)]
docs: Added info on noHistory and onActivityResult().

Bug: 13807256

Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83

Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f

9 years agoam 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug...
Ricardo Cervera [Fri, 16 Jan 2015 17:21:32 +0000 (17:21 +0000)]
am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256

* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256

9 years agoam 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
Ricardo Cervera [Fri, 16 Jan 2015 17:14:44 +0000 (17:14 +0000)]
am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256

* commit '92f6a747085b4b5ed692de4bdb0050c096eae393':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256

9 years agoam 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:58:57 +0000 (00:58 +0000)]
am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs

* commit '3212c3aa226f8cc7cf54e72772a001906fd4d7c3':
  docs: studio support library revisions update

9 years agoam d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into...
Dirk Dougherty [Fri, 16 Jan 2015 00:58:53 +0000 (00:58 +0000)]
am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs

* commit 'd1ff86058a06874d6d607dea951b34370e053654':
  Doc change: Add new analytics information to Distribute.

9 years agoam 3b7dbd66: Merge "docs: build link update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:50:15 +0000 (00:50 +0000)]
am 3b7dbd66: Merge "docs: build link update" into lmp-docs

* commit '3b7dbd66d8d8df89bb4700bfdfaf86f264ff7ea4':
  docs: build link update

9 years agoam 485b9566: Merge "docs: Plugin reference update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:50:12 +0000 (00:50 +0000)]
am 485b9566: Merge "docs: Plugin reference update" into lmp-docs

* commit '485b9566a9fc98be8b4dee40ddca43690de1a465':
  docs: Plugin reference update

9 years agoam 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:50:08 +0000 (00:50 +0000)]
am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs

* commit '48fc1d7ba7e3e2c0efd71b3b7ed29997d3454857':
  docs: studio sample procedure update

9 years agoMerge "docs: studio support library revisions update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:43:56 +0000 (00:43 +0000)]
Merge "docs: studio support library revisions update" into lmp-docs

9 years agoMerge "Doc change: Add new analytics information to Distribute." into lmp-docs
Dirk Dougherty [Fri, 16 Jan 2015 00:41:55 +0000 (00:41 +0000)]
Merge "Doc change: Add new analytics information to Distribute." into lmp-docs

9 years agoDoc change: Add new analytics information to Distribute.
Dirk Dougherty [Fri, 12 Dec 2014 19:51:13 +0000 (11:51 -0800)]
Doc change: Add new analytics information to Distribute.

Change-Id: I0ce5c457469cc2628dad8a1b7254fc9068babc84

9 years agoMerge "docs: build link update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:27:49 +0000 (00:27 +0000)]
Merge "docs: build link update" into lmp-docs

9 years agoMerge "docs: Plugin reference update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:27:00 +0000 (00:27 +0000)]
Merge "docs: Plugin reference update" into lmp-docs

9 years agoMerge "docs: studio sample procedure update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:26:38 +0000 (00:26 +0000)]
Merge "docs: studio sample procedure update" into lmp-docs

9 years agodocs: studio support library revisions update
Rich Slogar [Thu, 11 Dec 2014 23:51:18 +0000 (15:51 -0800)]
docs: studio support library revisions update

Change-Id: I9df9ffbcbb99e8b661ee5b67ac0efe28d6d19b4b

9 years agoam d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations.
Luan Nguyen [Thu, 15 Jan 2015 19:30:08 +0000 (19:30 +0000)]
am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations.

* commit 'd3cc11a1647c2aa9d830c1538e6a3b1355c9ca1f':
  docs: Remove reference to handheld app for bitmap resource locations.

9 years agodocs: Remove reference to handheld app for bitmap resource locations.
Luan Nguyen [Thu, 15 Jan 2015 17:24:09 +0000 (09:24 -0800)]
docs: Remove reference to handheld app for bitmap resource locations.

bug: 17577838
Change-Id: I54cfd7a73d21464077d8644bbe1a2d8896f745e6

9 years agodocs: removing code captions
Scott Rowe [Mon, 12 Jan 2015 23:28:04 +0000 (15:28 -0800)]
docs: removing code captions

Change-Id: Ifbeedf014741ff680640e1bdd0b35fa2d68f9e45

9 years agoam f5569413: docs: Fix broken link in Common Intents
Ricardo Cervera [Tue, 13 Jan 2015 16:42:22 +0000 (16:42 +0000)]
am f5569413: docs: Fix broken link in Common Intents
automerge: c2d373a

* commit 'c2d373a0a7bb45e8c8a282781c5bc4f75db86b7d':
  docs: Fix broken link in Common Intents

9 years agoam f5569413: docs: Fix broken link in Common Intents
Ricardo Cervera [Tue, 13 Jan 2015 16:35:04 +0000 (16:35 +0000)]
am f5569413: docs: Fix broken link in Common Intents

* commit 'f556941357ea391cae6dcd2e22b71a837a216d06':
  docs: Fix broken link in Common Intents

9 years agodocs: Fix broken link in Common Intents
Ricardo Cervera [Tue, 13 Jan 2015 16:28:22 +0000 (08:28 -0800)]
docs: Fix broken link in Common Intents

Bug: 18991366

Change-Id: I998e5213bb7117ebd26ab335206f430f60d1c537

9 years agodocs: Add screenshot
Scott Rowe [Mon, 5 Jan 2015 21:35:46 +0000 (13:35 -0800)]
docs: Add screenshot

Change-Id: I0995d23e1df30ce17ce381c14a6cbd2de389c396

9 years agoam a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into...
Ricardo Cervera [Mon, 12 Jan 2015 21:59:33 +0000 (21:59 +0000)]
am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs

* commit 'a87f35555d4aca13902a334691815cfa462feb30':
  docs: Add parent calls to WatchFaces snippet.

9 years agoam d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
Ricardo Cervera [Mon, 12 Jan 2015 21:53:27 +0000 (21:53 +0000)]
am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs

* commit 'd8bd117ce017d7e9b967d7949f8ca3e661e2cd39':
  docs: Add parent calls to WatchFaces snippet.

9 years agoMerge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
Ricardo Cervera [Mon, 12 Jan 2015 21:49:21 +0000 (21:49 +0000)]
Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs