Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2700393c: am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) automerge: 6117147 automerge: 563e767

Browse Source 
* commit '2700393c029baf9443622440f5ebad5073429075':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
This commit is contained in:
Luan Nguyen
2015-01-22 17:57:01 +00:00
committed by Android Git Automerger
parent 4185030ad4 2700393c02
commit 2bffc5e7bf
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
docs/html/training/wearables/data-layer/messages.jd
View File

@@ -39,16 +39,24 @@ 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>
<p>

19
docs/html/training/wearables/watch-faces/configuration.jd
View File

@@ -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