Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61171477 authored by Luan Nguyen's avatar Luan Nguyen Committed by Android Git Automerger
Browse files

am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix... 

am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)

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

docs/html/training/wearables/data-layer/messages.jd

+15 −7
Original line number Diff line number Diff line
@@ -39,15 +39,23 @@ to Google Play services and when to use each in 
</p>



<pre>

Node node; // the connected device to send the message to

GoogleApiClient mGoogleApiClient;

public static final START_ACTIVITY_PATH = "/start/MainActivity";

public static final String START_ACTIVITY_PATH = "/start/MainActivity";

...



    SendMessageResult result = Wearable.MessageApi.sendMessage(

            mGoogleApiClient, node, START_ACTIVITY_PATH, null).await();

    if (!result.getStatus().isSuccess()) {

        Log.e(TAG, "ERROR: failed to send Message: " + result.getStatus());

private void sendStartActivityMessage(String nodeId) {

    Wearable.MessageApi.sendMessage(

      mGoogleApiClient, nodeId, START_ACTIVITY_PATH, new byte[0]).setResultCallback(

          new ResultCallback&lt;SendMessageResult>() {

              &#64;Override

              public void onResult(SendMessageResult sendMessageResult) {

                  if (!sendMessageResult.getStatus().isSuccess()) {

                      Log.e(TAG, "Failed to send message with status code: "

                              + sendMessageResult.getStatus().getStatusCode());

                  }

              }

          }

      );

}

</pre>

docs/html/training/wearables/watch-faces/configuration.jd

+16 −3
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ and declare the following intent filter in the manifest file of the wearable app 
        &lt;action android:name=

            "com.example.android.wearable.watchface.CONFIG_DIGITAL" />

        &lt;category android:name=

       "com.google.android.wearable.watchface.category.WEARABLE_CONFIGURATION" />

        <strong>"com.google.android.wearable.watchface.category.WEARABLE_CONFIGURATION"</strong> />

        &lt;category android:name="android.intent.category.DEFAULT" />

    &lt;/intent-filter>

&lt;/activity>
@@ -119,8 +119,21 @@ a handheld device. For example, a configuration activity on a handheld device en 
present users with elaborate color pickers to select the background color of a watch face.</p>



<p>To create a companion configuration activity, add a new activity to your handheld app module and

declare the same intent filter for this activity as the one in <a href="#WearableActivity">Create

a Wearable Configuration Activity</a>.</p>

declare the following intent filter in the manifest file of the handheld app:</p>



<pre>

&lt;activity

    android:name=".DigitalWatchFaceCompanionConfigActivity"

    android:label="@string/app_name">

    &lt;intent-filter>

        &lt;action android:name=

            "com.example.android.wearable.watchface.CONFIG_DIGITAL" />

        &lt;category android:name=

        <strong>"com.google.android.wearable.watchface.category.COMPANION_CONFIGURATION"</strong> />

        &lt;category android:name="android.intent.category.DEFAULT" />

    &lt;/intent-filter>

&lt;/activity>

</pre>



<p>In your configuration activity, build a UI that provides options to customize all the

configurable elements of your watch face. When users make a selection, use the <a