Sync sample prebuilts to lmp-mr1-ub-docs

Upstream commit: f76d10f3b6abad250d94b5b9a5c73faae6ce8cc5

Change-Id: I32f2690e36f444cae123134268472fb526c26163
This commit is contained in:
Trevor Johns
2015-04-28 10:39:50 -07:00
parent 9a2076aef4
commit 03236391f1
43 changed files with 908 additions and 179 deletions

View File

@@ -210,6 +210,7 @@ public class MainActivity extends Activity implements DataApi.DataListener,
* indexes. For example, question0 should come before question1.
*/
private static class Question implements Comparable<Question> {
private String question;
private int questionIndex;
private String[] answers;
@@ -253,6 +254,7 @@ public class MainActivity extends Activity implements DataApi.DataListener,
/**
* Create a quiz, as defined in Quiz.json, when the user clicks on "Read quiz from file."
*
* @throws IOException
*/
public void readQuizFromFile(View view) throws IOException, JSONException {
@@ -411,17 +413,18 @@ public class MainActivity extends Activity implements DataApi.DataListener,
private void sendMessageToWearable(final String path, final byte[] data) {
Wearable.NodeApi.getConnectedNodes(mGoogleApiClient).setResultCallback(
new ResultCallback<NodeApi.GetConnectedNodesResult>() {
@Override
public void onResult(NodeApi.GetConnectedNodesResult nodes) {
for (Node node : nodes.getNodes()) {
Wearable.MessageApi.sendMessage(mGoogleApiClient, node.getId(), path, data);
}
@Override
public void onResult(NodeApi.GetConnectedNodesResult nodes) {
for (Node node : nodes.getNodes()) {
Wearable.MessageApi
.sendMessage(mGoogleApiClient, node.getId(), path, data);
}
if (path.equals(QUIZ_EXITED_PATH) && mGoogleApiClient.isConnected()) {
mGoogleApiClient.disconnect();
}
}
});
if (path.equals(QUIZ_EXITED_PATH) && mGoogleApiClient.isConnected()) {
mGoogleApiClient.disconnect();
}
}
});
}
/**
@@ -429,7 +432,7 @@ public class MainActivity extends Activity implements DataApi.DataListener,
*/
public void resetQuiz(View view) {
// Reset quiz status in phone layout.
for(int i = 0; i < questionsContainer.getChildCount(); i++) {
for (int i = 0; i < questionsContainer.getChildCount(); i++) {
LinearLayout questionStatusElement = (LinearLayout) questionsContainer.getChildAt(i);
TextView questionText = (TextView) questionStatusElement.findViewById(R.id.question);
TextView questionStatus = (TextView) questionStatusElement.findViewById(R.id.status);
@@ -481,11 +484,12 @@ public class MainActivity extends Activity implements DataApi.DataListener,
* Callback that marks a DataItem, which represents a question, as unanswered and not deleted.
*/
private class ResetDataItemCallback implements ResultCallback<DataApi.DataItemResult> {
@Override
public void onResult(DataApi.DataItemResult dataItemResult) {
if (dataItemResult.getStatus().isSuccess()) {
PutDataMapRequest request = PutDataMapRequest.createFromDataMapItem(
DataMapItem.fromDataItem(dataItemResult.getDataItem()));
DataMapItem.fromDataItem(dataItemResult.getDataItem()));
DataMap dataMap = request.getDataMap();
dataMap.putBoolean(QUESTION_WAS_ANSWERED, false);
dataMap.putBoolean(QUESTION_WAS_DELETED, false);