From a088275ef3211d30a9f941d19c5859427948233e Mon Sep 17 00:00:00 2001 From: Jonathan Dormody Date: Wed, 13 Dec 2017 10:35:34 -0700 Subject: [PATCH] Docs: Moved // BEGIN_INCLUDE a few lines up so readers understand the context of the Binding class (it's an inner-class) Test: make ds-docs Bug: 2781699 Change-Id: I90c70f9b9f918a941c719e8b020b3c69f826cd43 --- .../example/android/apis/app/LocalServiceActivities.java | 6 +++--- .../android/apis/app/MessengerServiceActivities.java | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceActivities.java b/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceActivities.java index a6c3fd822..536bd8117 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceActivities.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceActivities.java @@ -79,18 +79,18 @@ public class LocalServiceActivities { // ---------------------------------------------------------------------- +// BEGIN_INCLUDE(bind) /** * Example of binding and unbinding to the local service. * This demonstrates the implementation of a service which the client will - * bind to, receiving an object through which it can communicate with the service.

+ * bind to, receiving an object through which it can communicate with the service. * - *

Note that this is implemented as an inner class only keep the sample + * Note that this is implemented as an inner class only keep the sample * all together; typically this code would appear in some separate class. */ public static class Binding extends Activity { private boolean mIsBound; -// BEGIN_INCLUDE(bind) private LocalService mBoundService; private ServiceConnection mConnection = new ServiceConnection() { diff --git a/samples/ApiDemos/src/com/example/android/apis/app/MessengerServiceActivities.java b/samples/ApiDemos/src/com/example/android/apis/app/MessengerServiceActivities.java index 8d0ac8c16..9c0cacd1b 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/MessengerServiceActivities.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/MessengerServiceActivities.java @@ -21,16 +21,17 @@ import android.widget.TextView; import android.widget.Toast; public class MessengerServiceActivities { + +// BEGIN_INCLUDE(bind) /** * Example of binding and unbinding to the remote service. * This demonstrates the implementation of a service which the client will - * bind to, interacting with it through an aidl interface.

+ * bind to, interacting with it through an aidl interface. * - *

Note that this is implemented as an inner class only keep the sample + * Note that this is implemented as an inner class only keep the sample * all together; typically this code would appear in some separate class. */ public static class Binding extends Activity { -// BEGIN_INCLUDE(bind) /** Messenger for communicating with service. */ Messenger mService = null; /** Flag indicating whether we have called bind on the service. */