Update sample prebuilts for mnc-preview-docs

Synced to developers/samples/android commit
d816ff3c5943f1a3e6ced9d94d70b7dde5747355.

Change-Id: I15c6667538faf9897b7f5aa5d82208294f2a9cc7
diff --git a/prebuilts/gradle/AgendaData/Application/src/main/java/com/example/android/wearable/agendadata/MainActivity.java b/prebuilts/gradle/AgendaData/Application/src/main/java/com/example/android/wearable/agendadata/MainActivity.java
index 8e4063d..62dc349 100644
--- a/prebuilts/gradle/AgendaData/Application/src/main/java/com/example/android/wearable/agendadata/MainActivity.java
+++ b/prebuilts/gradle/AgendaData/Application/src/main/java/com/example/android/wearable/agendadata/MainActivity.java
@@ -96,28 +96,33 @@
                     .setResultCallback(new ResultCallback<DataItemBuffer>() {
                         @Override
                         public void onResult(DataItemBuffer result) {
-                            if (result.getStatus().isSuccess()) {
-                                deleteDataItems(result);
-                            } else {
-                                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                                    Log.d(TAG, "onDeleteEventsClicked(): failed to get Data Items");
+                            try {
+                                if (result.getStatus().isSuccess()) {
+                                    // Store the DataItem URIs in a List and release the buffer.
+                                    // Then use these URIs to delete the DataItems.
+                                    List<DataItem> dataItemList = FreezableUtils
+                                            .freezeIterable(result);
+                                    deleteDataItems(dataItemList);
+                                } else {
+                                    if (Log.isLoggable(TAG, Log.DEBUG)) {
+                                        Log.d(TAG,"onDeleteEventsClicked(): failed to get Data "
+                                                + "Items");
+
+                                    }
                                 }
+                            } finally {
+                                result.release();
                             }
-                            result.close();
                         }
                     });
         } else {
             Log.e(TAG, "Failed to delete data items"
-                     + " - Client disconnected from Google Play Services");
+                    + " - Client disconnected from Google Play Services");
         }
     }
 
-    private void deleteDataItems(DataItemBuffer dataItems) {
+    private void deleteDataItems(final List<DataItem> dataItemList) {
         if (mGoogleApiClient.isConnected()) {
-            // Store the DataItem URIs in a List and close the buffer. Then use these URIs
-            // to delete the DataItems.
-            final List<DataItem> dataItemList = FreezableUtils.freezeIterable(dataItems);
-            dataItems.close();
             for (final DataItem dataItem : dataItemList) {
                 final Uri dataItemUri = dataItem.getUri();
                 // In a real calendar application, this might delete the corresponding calendar
diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/Camera2Basic/Application/src/main/AndroidManifest.xml
index 87d9af1..5b0b5b0 100644
--- a/prebuilts/gradle/Camera2Basic/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/Camera2Basic/Application/src/main/AndroidManifest.xml
@@ -15,16 +15,14 @@
  limitations under the License.
 -->
 
-
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.camera2basic"
-    android:versionCode="1"
-    android:versionName="1.0">
+    package="com.example.android.camera2basic">
 
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
     <uses-permission android:name="android.permission.CAMERA" />
 
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+
     <application android:allowBackup="true"
         android:label="@string/app_name"
         android:icon="@drawable/ic_launcher"
diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java b/prebuilts/gradle/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java
index 2414ed6..020ca14 100644
--- a/prebuilts/gradle/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java
+++ b/prebuilts/gradle/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java
@@ -55,7 +55,6 @@
 import android.widget.Toast;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -264,14 +263,16 @@
                     break;
                 }
                 case STATE_WAITING_LOCK: {
-                    int afState = result.get(CaptureResult.CONTROL_AF_STATE);
-                    if (CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED == afState ||
+                    Integer afState = result.get(CaptureResult.CONTROL_AF_STATE);
+                    if (afState == null) {
+                        captureStillPicture();
+                    } else if (CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED == afState ||
                             CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED == afState) {
                         // CONTROL_AE_STATE can be null on some devices
                         Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE);
                         if (aeState == null ||
                                 aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED) {
-                            mState = STATE_WAITING_NON_PRECAPTURE;
+                            mState = STATE_PICTURE_TAKEN;
                             captureStillPicture();
                         } else {
                             runPrecaptureSequence();
@@ -636,6 +637,8 @@
                     (float) viewWidth / mPreviewSize.getWidth());
             matrix.postScale(scale, scale, centerX, centerY);
             matrix.postRotate(90 * (rotation - 2), centerX, centerY);
+        } else if (Surface.ROTATION_180 == rotation) {
+            matrix.postRotate(180, centerX, centerY);
         }
         mTextureView.setTransform(matrix);
     }
@@ -657,7 +660,7 @@
                     CameraMetadata.CONTROL_AF_TRIGGER_START);
             // Tell #mCaptureCallback to wait for the lock.
             mState = STATE_WAITING_LOCK;
-            mCaptureSession.setRepeatingRequest(mPreviewRequestBuilder.build(), mCaptureCallback,
+            mCaptureSession.capture(mPreviewRequestBuilder.build(), mCaptureCallback,
                     mBackgroundHandler);
         } catch (CameraAccessException e) {
             e.printStackTrace();
@@ -794,8 +797,6 @@
             try {
                 output = new FileOutputStream(mFile);
                 output.write(bytes);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
             } catch (IOException e) {
                 e.printStackTrace();
             } finally {
diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/layout-land/fragment_camera2_basic.xml b/prebuilts/gradle/Camera2Basic/Application/src/main/res/layout-land/fragment_camera2_basic.xml
index 3a3e2ff..8b2e1ad 100644
--- a/prebuilts/gradle/Camera2Basic/Application/src/main/res/layout-land/fragment_camera2_basic.xml
+++ b/prebuilts/gradle/Camera2Basic/Application/src/main/res/layout-land/fragment_camera2_basic.xml
@@ -26,14 +26,14 @@
         android:layout_alignParentTop="true" />
 
     <FrameLayout
+        android:id="@+id/control"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
-        android:layout_below="@id/texture"
         android:layout_toRightOf="@id/texture"
-        android:background="#4285f4"
+        android:background="@color/control_background"
         android:orientation="horizontal">
 
         <Button
diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/layout/fragment_camera2_basic.xml b/prebuilts/gradle/Camera2Basic/Application/src/main/res/layout/fragment_camera2_basic.xml
index 7d05ab3..9c6dc65 100644
--- a/prebuilts/gradle/Camera2Basic/Application/src/main/res/layout/fragment_camera2_basic.xml
+++ b/prebuilts/gradle/Camera2Basic/Application/src/main/res/layout/fragment_camera2_basic.xml
@@ -25,12 +25,12 @@
         android:layout_alignParentTop="true" />
 
     <FrameLayout
+        android:id="@+id/control"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="112dp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
-        android:layout_below="@id/texture"
-        android:background="#4285f4">
+        android:background="@color/control_background">
 
         <Button
             android:id="@+id/picture"
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-v21/base-colors.xml b/prebuilts/gradle/Camera2Basic/Application/src/main/res/values/colors.xml
similarity index 79%
rename from prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-v21/base-colors.xml
rename to prebuilts/gradle/Camera2Basic/Application/src/main/res/values/colors.xml
index 8b6ec3f..4b75d2b 100644
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-v21/base-colors.xml
+++ b/prebuilts/gradle/Camera2Basic/Application/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
- Copyright 2013 The Android Open Source Project
+ Copyright 2015 The Android Open Source Project
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -14,8 +14,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
 <resources>
-
-
+    <color name="control_background">#cc4285f4</color>
 </resources>
diff --git a/prebuilts/gradle/ElizaChat/Application/src/main/java/com/example/android/wearable/elizachat/MainActivity.java b/prebuilts/gradle/ElizaChat/Application/src/main/java/com/example/android/wearable/elizachat/MainActivity.java
index 982e3de..2e132a8 100644
--- a/prebuilts/gradle/ElizaChat/Application/src/main/java/com/example/android/wearable/elizachat/MainActivity.java
+++ b/prebuilts/gradle/ElizaChat/Application/src/main/java/com/example/android/wearable/elizachat/MainActivity.java
@@ -55,11 +55,12 @@
             }
         };
         mHistoryView = (TextView) findViewById(R.id.history);
-        startResponderService();
+        startResponderService(ResponderService.ACTION_INCOMING);
     }
 
-    private void startResponderService() {
-        Intent serviceIntent = new Intent(ResponderService.ACTION_INCOMING);
+    private void startResponderService(String action) {
+        Intent serviceIntent = new Intent(this, ResponderService.class);
+        serviceIntent.setAction(action);
         startService(serviceIntent);
     }
 
@@ -69,9 +70,7 @@
         LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver,
                 new IntentFilter(ACTION_NOTIFY));
         mHistoryView.setText("");
-        Intent serviceIntent = new Intent(ACTION_GET_CONVERSATION);
-        startService(serviceIntent);
-
+        startResponderService(ACTION_GET_CONVERSATION);
     }
 
     @Override
diff --git a/prebuilts/gradle/FindMyPhone/Wearable/src/main/java/com/example/android/wearable/findphone/FindPhoneService.java b/prebuilts/gradle/FindMyPhone/Wearable/src/main/java/com/example/android/wearable/findphone/FindPhoneService.java
index 97204b4..c6c6d67 100644
--- a/prebuilts/gradle/FindMyPhone/Wearable/src/main/java/com/example/android/wearable/findphone/FindPhoneService.java
+++ b/prebuilts/gradle/FindMyPhone/Wearable/src/main/java/com/example/android/wearable/findphone/FindPhoneService.java
@@ -73,19 +73,22 @@
             if (intent.getAction().equals(ACTION_TOGGLE_ALARM)) {
                 // Get current state of the alarm.
                 DataItemBuffer result = Wearable.DataApi.getDataItems(mGoogleApiClient).await();
-                if (result.getStatus().isSuccess()) {
-                    if (result.getCount() == 1) {
-                        alarmOn = DataMap.fromByteArray(result.get(0).getData())
-                                .getBoolean(FIELD_ALARM_ON, false);
-                    } else {
-                        Log.e(TAG, "Unexpected number of DataItems found.\n"
-                                + "\tExpected: 1\n"
-                                + "\tActual: " + result.getCount());
+                try {
+                    if (result.getStatus().isSuccess()) {
+                        if (result.getCount() == 1) {
+                            alarmOn = DataMap.fromByteArray(result.get(0).getData())
+                                    .getBoolean(FIELD_ALARM_ON, false);
+                        } else {
+                            Log.e(TAG, "Unexpected number of DataItems found.\n"
+                                    + "\tExpected: 1\n"
+                                    + "\tActual: " + result.getCount());
+                        }
+                    } else if (Log.isLoggable(TAG, Log.DEBUG)) {
+                        Log.d(TAG, "onHandleIntent: failed to get current alarm state");
                     }
-                } else if (Log.isLoggable(TAG, Log.DEBUG)) {
-                    Log.d(TAG, "onHandleIntent: failed to get current alarm state");
+                } finally {
+                    result.release();
                 }
-                result.close();
                 // Toggle alarm.
                 alarmOn = !alarmOn;
                 // Change notification text based on new value of alarmOn.
diff --git a/prebuilts/gradle/MessagingService/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/MessagingService/Application/src/main/AndroidManifest.xml
index f8a5850..955f8d4 100644
--- a/prebuilts/gradle/MessagingService/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/MessagingService/Application/src/main/AndroidManifest.xml
@@ -37,13 +37,17 @@
         <service android:name=".MessagingService">
         </service>
 
-        <receiver android:name=".MessageReadReceiver">
+        <receiver
+            android:name=".MessageReadReceiver"
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.example.android.messagingservice.ACTION_MESSAGE_READ"/>
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".MessageReplyReceiver">
+        <receiver
+            android:name=".MessageReplyReceiver"
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.example.android.messagingservice.ACTION_MESSAGE_REPLY"/>
             </intent-filter>
diff --git a/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/Conversations.java b/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/Conversations.java
index 7425df4..88ef7aa 100644
--- a/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/Conversations.java
+++ b/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/Conversations.java
@@ -17,7 +17,6 @@
 package com.example.android.messagingservice;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessageLogger.java b/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessageLogger.java
index d1007b5..3459178 100644
--- a/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessageLogger.java
+++ b/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessageLogger.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -27,13 +28,13 @@
  * and replies. Don't use this in a real world application. This logger is only
  * used for displaying the messages in the text view.
  */
-public class MessageLogger {
+class MessageLogger {
 
     private static final String PREF_MESSAGE = "MESSAGE_LOGGER";
-    private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    private static final DateFormat DATE_FORMAT = SimpleDateFormat.getDateTimeInstance();
+    private static final String LINE_BREAKS = "\n\n";
 
     public static final String LOG_KEY = "message_data";
-    public static final String LINE_BREAKS = "\n\n";
 
     public static void logMessage(Context context, String message) {
         SharedPreferences prefs = getPrefs(context);
diff --git a/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessageReadReceiver.java b/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessageReadReceiver.java
index f28a3a7..63c244f 100644
--- a/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessageReadReceiver.java
+++ b/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessageReadReceiver.java
@@ -16,7 +16,6 @@
 
 package com.example.android.messagingservice;
 
-import android.app.NotificationManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -35,8 +34,8 @@
         if (conversationId != -1) {
             Log.d(TAG, "Conversation " + conversationId + " was read");
             MessageLogger.logMessage(context, "Conversation " + conversationId + " was read.");
-            NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
-            notificationManager.cancel(conversationId);
+            NotificationManagerCompat.from(context)
+                    .cancel(conversationId);
         }
     }
 }
diff --git a/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessagingFragment.java b/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessagingFragment.java
index f8efcc0..703bc80 100644
--- a/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessagingFragment.java
+++ b/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessagingFragment.java
@@ -51,7 +51,7 @@
     private Messenger mService;
     private boolean mBound;
 
-    private ServiceConnection mConnection = new ServiceConnection() {
+    private final ServiceConnection mConnection = new ServiceConnection() {
         @Override
         public void onServiceConnected(ComponentName componentName, IBinder service) {
             mService = new Messenger(service);
@@ -67,7 +67,7 @@
         }
     };
 
-    private SharedPreferences.OnSharedPreferenceChangeListener listener =
+    private final SharedPreferences.OnSharedPreferenceChangeListener listener =
             new SharedPreferences.OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
diff --git a/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessagingService.java b/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessagingService.java
index f590061..73199ed 100644
--- a/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessagingService.java
+++ b/prebuilts/gradle/MessagingService/Application/src/main/java/com/example/android/messagingservice/MessagingService.java
@@ -31,41 +31,24 @@
 import android.support.v4.app.RemoteInput;
 import android.util.Log;
 
+import java.lang.ref.WeakReference;
 import java.util.Iterator;
 
 public class MessagingService extends Service {
     private static final String TAG = MessagingService.class.getSimpleName();
-
-    public static final String READ_ACTION =
+    private static final String EOL = "\n";
+    private static final String READ_ACTION =
             "com.example.android.messagingservice.ACTION_MESSAGE_READ";
+
     public static final String REPLY_ACTION =
             "com.example.android.messagingservice.ACTION_MESSAGE_REPLY";
     public static final String CONVERSATION_ID = "conversation_id";
     public static final String EXTRA_VOICE_REPLY = "extra_voice_reply";
     public static final int MSG_SEND_NOTIFICATION = 1;
-    public static final String EOL = "\n";
 
     private NotificationManagerCompat mNotificationManager;
 
-    private final Messenger mMessenger = new Messenger(new IncomingHandler());
-
-    /**
-     * Handler of incoming messages from clients.
-     */
-    class IncomingHandler extends Handler {
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MSG_SEND_NOTIFICATION:
-                    int howManyConversations = msg.arg1 <= 0 ? 1 : msg.arg1;
-                    int messagesPerConv = msg.arg2 <= 0 ? 1 : msg.arg2;
-                    sendNotification(howManyConversations, messagesPerConv);
-                    break;
-                default:
-                    super.handleMessage(msg);
-            }
-        }
-    }
+    private final Messenger mMessenger = new Messenger(new IncomingHandler(this));
 
     @Override
     public void onCreate() {
@@ -79,18 +62,6 @@
         return mMessenger.getBinder();
     }
 
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        Log.d(TAG, "onStartCommand");
-        return START_STICKY;
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        Log.d(TAG, "onDestroy");
-    }
-
     // Creates an intent that will be triggered when a message is marked as read.
     private Intent getMessageReadIntent(int id) {
         return new Intent()
@@ -171,4 +142,31 @@
 
         mNotificationManager.notify(conversation.getConversationId(), builder.build());
     }
+
+    /**
+     * Handler for incoming messages from clients.
+     */
+    private static class IncomingHandler extends Handler {
+        private final WeakReference<MessagingService> mReference;
+
+        IncomingHandler(MessagingService service) {
+            mReference = new WeakReference<>(service);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            MessagingService service = mReference.get();
+            switch (msg.what) {
+                case MSG_SEND_NOTIFICATION:
+                    int howManyConversations = msg.arg1 <= 0 ? 1 : msg.arg1;
+                    int messagesPerConversation = msg.arg2 <= 0 ? 1 : msg.arg2;
+                    if (service != null) {
+                        service.sendNotification(howManyConversations, messagesPerConversation);
+                    }
+                    break;
+                default:
+                    super.handleMessage(msg);
+            }
+        }
+    }
 }
diff --git a/prebuilts/gradle/MessagingService/Application/src/main/res/layout-land/fragment_message_me.xml b/prebuilts/gradle/MessagingService/Application/src/main/res/layout-land/fragment_message_me.xml
index 6f4f88b..0cfd1cf 100644
--- a/prebuilts/gradle/MessagingService/Application/src/main/res/layout-land/fragment_message_me.xml
+++ b/prebuilts/gradle/MessagingService/Application/src/main/res/layout-land/fragment_message_me.xml
@@ -21,7 +21,8 @@
               android:paddingBottom="@dimen/activity_vertical_margin"
               android:paddingLeft="@dimen/activity_horizontal_margin"
               android:paddingRight="@dimen/activity_horizontal_margin"
-              android:paddingTop="@dimen/activity_vertical_margin">
+              android:paddingTop="@dimen/activity_vertical_margin"
+              android:baselineAligned="false">
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="match_parent"
diff --git a/prebuilts/gradle/MessagingService/Application/src/main/res/layout/fragment_message_me.xml b/prebuilts/gradle/MessagingService/Application/src/main/res/layout/fragment_message_me.xml
index 29a8c44..404bd4d 100644
--- a/prebuilts/gradle/MessagingService/Application/src/main/res/layout/fragment_message_me.xml
+++ b/prebuilts/gradle/MessagingService/Application/src/main/res/layout/fragment_message_me.xml
@@ -14,7 +14,6 @@
   limitations under the License.
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
diff --git a/prebuilts/gradle/MessagingService/Application/src/main/res/values/strings.xml b/prebuilts/gradle/MessagingService/Application/src/main/res/values/strings.xml
index 001b10e..3f8390d 100644
--- a/prebuilts/gradle/MessagingService/Application/src/main/res/values/strings.xml
+++ b/prebuilts/gradle/MessagingService/Application/src/main/res/values/strings.xml
@@ -16,8 +16,6 @@
   -->
 <resources>
     <string name="app_name">Messaging Sample</string>
-    <string name="action_settings">Settings</string>
-    <string name="title">Messaging Sample</string>
     <string name="notification_reply">Reply by Voice</string>
     <string name="send_2_conversations">Send 2 conversations with 1 message</string>
     <string name="send_1_conversation">Send 1 conversation with 1 message</string>
diff --git a/prebuilts/gradle/Quiz/Application/src/main/java/com/example/android/wearable/quiz/MainActivity.java b/prebuilts/gradle/Quiz/Application/src/main/java/com/example/android/wearable/quiz/MainActivity.java
index 1e58935..855fcd6 100644
--- a/prebuilts/gradle/Quiz/Application/src/main/java/com/example/android/wearable/quiz/MainActivity.java
+++ b/prebuilts/gradle/Quiz/Application/src/main/java/com/example/android/wearable/quiz/MainActivity.java
@@ -445,16 +445,19 @@
                     .setResultCallback(new ResultCallback<DataItemBuffer>() {
                         @Override
                         public void onResult(DataItemBuffer result) {
-                            if (result.getStatus().isSuccess()) {
-                                List<DataItem> dataItemList = FreezableUtils.freezeIterable(result);
-                                result.close();
-                                resetDataItems(dataItemList);
-                            } else {
-                                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                                    Log.d(TAG, "Reset quiz: failed to get Data Items to reset");
+                            try {
+                                if (result.getStatus().isSuccess()) {
+                                    List<DataItem> dataItemList = FreezableUtils
+                                            .freezeIterable(result);
+                                    resetDataItems(dataItemList);
+                                } else {
+                                    if (Log.isLoggable(TAG, Log.DEBUG)) {
+                                        Log.d(TAG, "Reset quiz: failed to get Data Items to reset");
+                                    }
                                 }
+                            } finally {
+                                result.release();
                             }
-                            result.close();
                         }
                     });
         } else {
@@ -521,19 +524,23 @@
                     .setResultCallback(new ResultCallback<DataItemBuffer>() {
                         @Override
                         public void onResult(DataItemBuffer result) {
-                            if (result.getStatus().isSuccess()) {
-                                List<Uri> dataItemUriList = new ArrayList<Uri>();
-                                for (final DataItem dataItem : result) {
-                                    dataItemUriList.add(dataItem.getUri());
+                            try {
+                                if (result.getStatus().isSuccess()) {
+                                    List<Uri> dataItemUriList = new ArrayList<Uri>();
+                                    for (final DataItem dataItem : result) {
+                                        dataItemUriList.add(dataItem.getUri());
+                                    }
+                                    deleteDataItems(dataItemUriList);
+                                } else {
+                                    if (Log.isLoggable(TAG, Log.DEBUG)) {
+                                        Log.d(TAG, "Clear quiz: failed to get Data Items for "
+                                                + "deletion");
+
+                                    }
                                 }
-                                result.close();
-                                deleteDataItems(dataItemUriList);
-                            } else {
-                                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                                    Log.d(TAG, "Clear quiz: failed to get Data Items for deletion");
-                                }
+                            } finally {
+                                result.release();
                             }
-                            result.close();
                         }
                     });
         } else {
diff --git a/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/AnalogWatchFaceService.java b/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/AnalogWatchFaceService.java
index 15c550f..16194b1 100644
--- a/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/AnalogWatchFaceService.java
+++ b/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/AnalogWatchFaceService.java
@@ -213,6 +213,17 @@
         }
 
         @Override
+        public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+            if (mBackgroundScaledBitmap == null
+                    || mBackgroundScaledBitmap.getWidth() != width
+                    || mBackgroundScaledBitmap.getHeight() != height) {
+                mBackgroundScaledBitmap = Bitmap.createScaledBitmap(mBackgroundBitmap,
+                        width, height, true /* filter */);
+            }
+            super.onSurfaceChanged(holder, format, width, height);
+        }
+
+        @Override
         public void onDraw(Canvas canvas, Rect bounds) {
             mCalendar.setTimeInMillis(System.currentTimeMillis());
 
@@ -220,12 +231,6 @@
             int height = bounds.height();
 
             // Draw the background, scaled to fit.
-            if (mBackgroundScaledBitmap == null
-                    || mBackgroundScaledBitmap.getWidth() != width
-                    || mBackgroundScaledBitmap.getHeight() != height) {
-                mBackgroundScaledBitmap = Bitmap.createScaledBitmap(mBackgroundBitmap,
-                        width, height, true /* filter */);
-            }
             canvas.drawBitmap(mBackgroundScaledBitmap, 0, 0, null);
 
             // Find the center. Ignore the window insets so that, on round watches with a
diff --git a/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/DigitalWatchFaceService.java b/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/DigitalWatchFaceService.java
index 0bc420d..a661cdc 100644
--- a/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/DigitalWatchFaceService.java
+++ b/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/DigitalWatchFaceService.java
@@ -46,7 +46,10 @@
 import com.google.android.gms.wearable.DataMapItem;
 import com.google.android.gms.wearable.Wearable;
 
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 
@@ -123,16 +126,26 @@
                 .addApi(Wearable.API)
                 .build();
 
-        final BroadcastReceiver mTimeZoneReceiver = new BroadcastReceiver() {
+        /**
+         * Handles time zone and locale changes.
+         */
+        final BroadcastReceiver mReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
                 mCalendar.setTimeZone(TimeZone.getDefault());
+                initFormats();
                 invalidate();
             }
         };
-        boolean mRegisteredTimeZoneReceiver = false;
+
+        /**
+         * Unregistering an unregistered receiver throws an exception. Keep track of the
+         * registration state to prevent that.
+         */
+        boolean mRegisteredReceiver = false;
 
         Paint mBackgroundPaint;
+        Paint mDatePaint;
         Paint mHourPaint;
         Paint mMinutePaint;
         Paint mSecondPaint;
@@ -140,10 +153,16 @@
         Paint mColonPaint;
         float mColonWidth;
         boolean mMute;
+
         Calendar mCalendar;
+        Date mDate;
+        SimpleDateFormat mDayOfWeekFormat;
+        java.text.DateFormat mDateFormat;
+
         boolean mShouldDrawColons;
         float mXOffset;
         float mYOffset;
+        float mLineHeight;
         String mAmString;
         String mPmString;
         int mInteractiveBackgroundColor =
@@ -175,11 +194,13 @@
                     .build());
             Resources resources = DigitalWatchFaceService.this.getResources();
             mYOffset = resources.getDimension(R.dimen.digital_y_offset);
+            mLineHeight = resources.getDimension(R.dimen.digital_line_height);
             mAmString = resources.getString(R.string.digital_am);
             mPmString = resources.getString(R.string.digital_pm);
 
             mBackgroundPaint = new Paint();
             mBackgroundPaint.setColor(mInteractiveBackgroundColor);
+            mDatePaint = createTextPaint(resources.getColor(R.color.digital_date));
             mHourPaint = createTextPaint(mInteractiveHourDigitsColor, BOLD_TYPEFACE);
             mMinutePaint = createTextPaint(mInteractiveMinuteDigitsColor);
             mSecondPaint = createTextPaint(mInteractiveSecondDigitsColor);
@@ -187,6 +208,8 @@
             mColonPaint = createTextPaint(resources.getColor(R.color.digital_colons));
 
             mCalendar = Calendar.getInstance();
+            mDate = new Date();
+            initFormats();
         }
 
         @Override
@@ -219,8 +242,9 @@
 
                 registerReceiver();
 
-                // Update time zone in case it changed while we weren't visible.
+                // Update time zone and date formats, in case they changed while we weren't visible.
                 mCalendar.setTimeZone(TimeZone.getDefault());
+                initFormats();
             } else {
                 unregisterReceiver();
 
@@ -235,21 +259,29 @@
             updateTimer();
         }
 
+        private void initFormats() {
+            mDayOfWeekFormat = new SimpleDateFormat("EEEE", Locale.getDefault());
+            mDayOfWeekFormat.setCalendar(mCalendar);
+            mDateFormat = DateFormat.getDateFormat(DigitalWatchFaceService.this);
+            mDateFormat.setCalendar(mCalendar);
+        }
+
         private void registerReceiver() {
-            if (mRegisteredTimeZoneReceiver) {
+            if (mRegisteredReceiver) {
                 return;
             }
-            mRegisteredTimeZoneReceiver = true;
+            mRegisteredReceiver = true;
             IntentFilter filter = new IntentFilter(Intent.ACTION_TIMEZONE_CHANGED);
-            DigitalWatchFaceService.this.registerReceiver(mTimeZoneReceiver, filter);
+            filter.addAction(Intent.ACTION_LOCALE_CHANGED);
+            DigitalWatchFaceService.this.registerReceiver(mReceiver, filter);
         }
 
         private void unregisterReceiver() {
-            if (!mRegisteredTimeZoneReceiver) {
+            if (!mRegisteredReceiver) {
                 return;
             }
-            mRegisteredTimeZoneReceiver = false;
-            DigitalWatchFaceService.this.unregisterReceiver(mTimeZoneReceiver);
+            mRegisteredReceiver = false;
+            DigitalWatchFaceService.this.unregisterReceiver(mReceiver);
         }
 
         @Override
@@ -269,6 +301,7 @@
             float amPmSize = resources.getDimension(isRound
                     ? R.dimen.digital_am_pm_size_round : R.dimen.digital_am_pm_size);
 
+            mDatePaint.setTextSize(resources.getDimension(R.dimen.digital_date_text_size));
             mHourPaint.setTextSize(textSize);
             mMinutePaint.setTextSize(textSize);
             mSecondPaint.setTextSize(textSize);
@@ -321,6 +354,7 @@
 
             if (mLowBitAmbient) {
                 boolean antiAlias = !inAmbientMode;
+                mDatePaint.setAntiAlias(antiAlias);
                 mHourPaint.setAntiAlias(antiAlias);
                 mMinutePaint.setAntiAlias(antiAlias);
                 mSecondPaint.setAntiAlias(antiAlias);
@@ -335,7 +369,7 @@
         }
 
         private void adjustPaintColorToCurrentMode(Paint paint, int interactiveColor,
-                int ambientColor) {
+                                                   int ambientColor) {
             paint.setColor(isInAmbientMode() ? ambientColor : interactiveColor);
         }
 
@@ -353,6 +387,7 @@
             if (mMute != inMuteMode) {
                 mMute = inMuteMode;
                 int alpha = inMuteMode ? MUTE_ALPHA : NORMAL_ALPHA;
+                mDatePaint.setAlpha(alpha);
                 mHourPaint.setAlpha(alpha);
                 mMinutePaint.setAlpha(alpha);
                 mColonPaint.setAlpha(alpha);
@@ -409,7 +444,9 @@
 
         @Override
         public void onDraw(Canvas canvas, Rect bounds) {
-            mCalendar.setTimeInMillis(System.currentTimeMillis());
+            long now = System.currentTimeMillis();
+            mCalendar.setTimeInMillis(now);
+            mDate.setTime(now);
             boolean is24Hour = DateFormat.is24HourFormat(DigitalWatchFaceService.this);
 
             // Show colons for the first half of each second so the colons blink on when the time
@@ -430,9 +467,6 @@
                     hour = 12;
                 }
                 hourString = String.valueOf(hour);
-                if (hour < 10) {
-                    x += mHourPaint.measureText("0");
-                }
             }
             canvas.drawText(hourString, x, mYOffset, mHourPaint);
             x += mHourPaint.measureText(hourString);
@@ -463,6 +497,19 @@
                 canvas.drawText(getAmPmString(
                         mCalendar.get(Calendar.AM_PM)), x, mYOffset, mAmPmPaint);
             }
+
+            // Only render the day of week and date if there is no peek card, so they do not bleed
+            // into each other in ambient mode.
+            if (getPeekCardPosition().isEmpty()) {
+                // Day of week
+                canvas.drawText(
+                        mDayOfWeekFormat.format(mDate),
+                        mXOffset, mYOffset + mLineHeight, mDatePaint);
+                // Date
+                canvas.drawText(
+                        mDateFormat.format(mDate),
+                        mXOffset, mYOffset + mLineHeight * 2, mDatePaint);
+            }
         }
 
         /**
diff --git a/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/SweepWatchFaceService.java b/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/SweepWatchFaceService.java
index 193f29a..d547f1c 100644
--- a/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/SweepWatchFaceService.java
+++ b/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/SweepWatchFaceService.java
@@ -171,6 +171,17 @@
         }
 
         @Override
+        public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+            if (mBackgroundScaledBitmap == null
+                    || mBackgroundScaledBitmap.getWidth() != width
+                    || mBackgroundScaledBitmap.getHeight() != height) {
+                mBackgroundScaledBitmap = Bitmap.createScaledBitmap(mBackgroundBitmap,
+                        width, height, true /* filter */);
+            }
+            super.onSurfaceChanged(holder, format, width, height);
+        }
+
+        @Override
         public void onDraw(Canvas canvas, Rect bounds) {
             if (Log.isLoggable(TAG, Log.VERBOSE)) {
                 Log.v(TAG, "onDraw");
@@ -182,12 +193,6 @@
             int height = bounds.height();
 
             // Draw the background, scaled to fit.
-            if (mBackgroundScaledBitmap == null
-                    || mBackgroundScaledBitmap.getWidth() != width
-                    || mBackgroundScaledBitmap.getHeight() != height) {
-                mBackgroundScaledBitmap = Bitmap.createScaledBitmap(mBackgroundBitmap,
-                        width, height, true /* filter */);
-            }
             canvas.drawBitmap(mBackgroundScaledBitmap, 0, 0, null);
 
             // Find the center. Ignore the window insets so that, on round watches with a
diff --git a/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/TiltWatchFaceService.java b/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/TiltWatchFaceService.java
index ffb0b6c..879473c 100644
--- a/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/TiltWatchFaceService.java
+++ b/prebuilts/gradle/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/TiltWatchFaceService.java
@@ -45,7 +45,7 @@
     private static final long FPS = 60;
 
     /** Z distance from the camera to the watchface. */
-    private static final float EYE_Z = 2.3f;
+    private static final float EYE_Z = -2.3f;
 
     /** How long each frame is displayed at expected frame rate. */
     private static final long FRAME_PERIOD_MS = TimeUnit.SECONDS.toMillis(1) / FPS;
diff --git a/prebuilts/gradle/WatchFace/Wearable/src/main/res/values/color.xml b/prebuilts/gradle/WatchFace/Wearable/src/main/res/values/color.xml
index 0da08ed..1370192 100644
--- a/prebuilts/gradle/WatchFace/Wearable/src/main/res/values/color.xml
+++ b/prebuilts/gradle/WatchFace/Wearable/src/main/res/values/color.xml
@@ -14,6 +14,7 @@
  limitations under the License.
 -->
 <resources>
+    <color name="digital_date">#aaaaaa</color>
     <color name="digital_am_pm">#aaaaa0</color>
     <color name="digital_colons">#aaaaa0</color>
     <color name="config_activity_background">#ffffff</color>
diff --git a/prebuilts/gradle/WatchFace/Wearable/src/main/res/values/dimens.xml b/prebuilts/gradle/WatchFace/Wearable/src/main/res/values/dimens.xml
index 8f04e56..aef847b 100644
--- a/prebuilts/gradle/WatchFace/Wearable/src/main/res/values/dimens.xml
+++ b/prebuilts/gradle/WatchFace/Wearable/src/main/res/values/dimens.xml
@@ -16,11 +16,13 @@
 <resources>
     <dimen name="digital_text_size">40dp</dimen>
     <dimen name="digital_text_size_round">45dp</dimen>
+    <dimen name="digital_date_text_size">20dp</dimen>
     <dimen name="digital_am_pm_size">25dp</dimen>
     <dimen name="digital_am_pm_size_round">30dp</dimen>
     <dimen name="digital_x_offset">15dp</dimen>
     <dimen name="digital_x_offset_round">25dp</dimen>
-    <dimen name="digital_y_offset">90dp</dimen>
+    <dimen name="digital_y_offset">80dp</dimen>
+    <dimen name="digital_line_height">25dp</dimen>
     <dimen name="digital_config_color_picker_item_margin">32dp</dimen>
     <dimen name="content_padding_start">12dp</dimen>
 </resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/.google/packaging.yaml b/prebuilts/gradle/XYZTouristAttractions/.google/packaging.yaml
deleted file mode 100644
index 44b92db..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/.google/packaging.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-# GOOGLE SAMPLE PACKAGING DATA
-#
-# This file is used by Google as part of our samples packaging process.
-# End users may safely ignore this file. It has no relevance to other systems.
----
-status:       PUBLISHED
-technologies: [Android]
-categories:   [Wearable, Location, Notification]
-languages:    [Java]
-solutions:    [Mobile]
-github:       android-XYZTouristAttractions
-level:        INTERMEDIATE
-icon:         screenshots/icon-web.png
-apiRefs:
-    - android:android.support.v7.appcompat
-    - android:android.support.v7.widget.RecyclerView
-    - android:android.support.v7.widget.GridLayoutManager
-    - android:com.google.android.gms.common.api.GoogleApiClient
-    - android:com.google.android.gms.wearable.Wearable
-    - android:com.google.android.gms.wearable.DataApi
-    - android:com.google.android.gms.wearable.NodeApi
-    - android:com.google.android.gms.wearable.WearableListenerService
-    - android:com.google.android.gms.location.LocationServices.GeofencingApi
-    - android:com.google.android.gms.location.LocationServices.FusedLocationApi
-    - android:android.support.wearable.view.DismissOverlayView
-    - android:android.support.wearable.view.DotsPageIndicator
-    - android:android.support.wearable.view.GridViewPager
-    - android:android.support.wearable.activity.ConfirmationActivity
-    - android:android.support.wearable.view.CardFrame
-    - android:android.support.wearable.view.CardScrollView
-    - android:android.support.wearable.view.GridPagerAdapter
-    - android:android.support.wearable.view.WatchViewStub
-    - android:android.support.wearable.view.ActionPage
-license: apache2
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/build.gradle b/prebuilts/gradle/XYZTouristAttractions/Application/build.gradle
deleted file mode 100644
index 3346713..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/build.gradle
+++ /dev/null
@@ -1,83 +0,0 @@
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
-    }
-}
-
-apply plugin: 'com.android.application'
-
-
-repositories {
-    jcenter()
-}
-
-dependencies {
-    compile 'com.android.support:appcompat-v7:22.1.1'
-    compile 'com.google.android.gms:play-services-location:7.3.0'
-    compile 'com.google.maps.android:android-maps-utils:0.3.2'
-    compile 'com.github.bumptech.glide:glide:3.5.2'
-    compile 'com.android.support:recyclerview-v7:22.1.1'
-    compile 'com.google.android.gms:play-services-wearable:7.3.0'
-    compile 'com.android.support:support-v13:22.1.0'
-    compile project(':Shared')
-    wearApp project(':Wearable')
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
-    'main',     // main sample code; look here for the interesting stuff.
-    'common',   // components that are reused by multiple samples
-    'template'] // boilerplate code that is generated by the sample template process
-
-android {
-    compileSdkVersion 22
-
-    buildToolsVersion "22.0.1"
-
-    defaultConfig {
-        minSdkVersion 18
-        targetSdkVersion 22
-        versionCode 1
-        versionName "1.0"
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
-    sourceSets {
-        main {
-            dirs.each { dir ->
-                java.srcDirs "src/${dir}/java"
-                res.srcDirs "src/${dir}/res"
-            }
-        }
-        androidTest.setRoot('tests')
-        androidTest.java.srcDirs = ['tests/src']
-
-    }
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 76f0198..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.xyztouristattractions" >
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/XYZAppTheme" >
-
-        <activity
-            android:name=".ui.AttractionListActivity"
-            android:label="@string/app_name" >
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-        </activity>
-
-        <activity
-            android:name=".ui.DetailActivity"
-            android:label="@string/app_name"
-            android:theme="@style/XYZAppTheme.Detail"
-            android:parentActivityName=".ui.AttractionListActivity" />
-
-        <receiver android:name=".service.UtilityReceiver" />
-
-        <service android:name=".service.UtilityService" />
-
-        <service android:name=".service.ListenerService">
-            <intent-filter>
-                <action android:name="com.google.android.gms.wearable.BIND_LISTENER" />
-            </intent-filter>
-        </service>
-
-        <meta-data android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
-
-        <meta-data
-            android:name="com.example.android.xyztouristattractions.config.GlideConfiguration"
-            android:value="GlideModule"/>
-
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/config/GlideConfiguration.java b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/config/GlideConfiguration.java
deleted file mode 100644
index 77d6fc8..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/config/GlideConfiguration.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.config;
-
-import android.content.Context;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.GlideBuilder;
-import com.bumptech.glide.load.DecodeFormat;
-import com.bumptech.glide.module.GlideModule;
-
-/**
- * This allows global overriding of some default Glide configuration values.
- * For additional information see the Glide docs:
- * https://github.com/bumptech/glide/wiki/Configuration
- */
-public class GlideConfiguration implements GlideModule {
-    @Override
-    public void applyOptions(Context context, GlideBuilder builder) {
-        // Set Glide decode format to the higher quality ARGB_8888 format
-        builder.setDecodeFormat(DecodeFormat.PREFER_ARGB_8888);
-    }
-
-    @Override
-    public void registerComponents(Context context, Glide glide) {
-
-    }
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/provider/TouristAttractions.java b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/provider/TouristAttractions.java
deleted file mode 100644
index 50be362..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/provider/TouristAttractions.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.provider;
-
-import android.net.Uri;
-
-import com.example.android.xyztouristattractions.BuildConfig;
-import com.example.android.xyztouristattractions.common.Attraction;
-import com.google.android.gms.location.Geofence;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.maps.android.SphericalUtil;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Static data content provider.
- */
-public class TouristAttractions {
-
-    public static final String CITY_SYDNEY = "Sydney";
-
-    public static final String TEST_CITY = CITY_SYDNEY;
-
-    private static final float TRIGGER_RADIUS = 2000; // 2KM
-    private static final int TRIGGER_TRANSITION = Geofence.GEOFENCE_TRANSITION_ENTER |
-            Geofence.GEOFENCE_TRANSITION_EXIT;
-    private static final long EXPIRATION_DURATION = Geofence.NEVER_EXPIRE;
-
-    public static final Map<String, LatLng> CITY_LOCATIONS = new HashMap<String, LatLng>() {{
-        put(CITY_SYDNEY, new LatLng(-33.873651, 151.2068896));
-    }};
-
-    /**
-     * All photos used with permission under the Creative Commons Attribution-ShareAlike License.
-     */
-    public static final HashMap<String, List<Attraction>> ATTRACTIONS =
-            new HashMap<String, List<Attraction>>() {{
-
-        put(CITY_SYDNEY, new ArrayList<Attraction>() {{
-            add(new Attraction(
-                    "Sydney Opera House",
-                    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vitae bibendum justo, vitae cursus velit. Suspendisse potenti.",
-                    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vitae bibendum justo, vitae cursus velit. Suspendisse potenti. Suspendisse scelerisque risus justo, non tincidunt nibh blandit et. Vivamus elit lacus, luctus nec erat in, pharetra semper turpis. Quisque viverra nulla ligula, non pulvinar ante dictum sit amet. Vestibulum aliquet tortor mauris, vel suscipit nisl malesuada eget. Aliquam maximus dictum euismod. Maecenas leo quam, volutpat id diam eget, placerat fringilla ipsum. Nam pretium vehicula augue quis euismod.\n\nNam sed blandit magna. Vestibulum a fermentum arcu. Vestibulum et ligula at nisi luctus facilisis. Proin fermentum enim a nibh commodo finibus. Suspendisse justo elit, vulputate ut ipsum at, pellentesque auctor massa. Praesent vestibulum erat interdum imperdiet dapibus. In hac habitasse platea dictumst. Proin varius orci vitae tempor vulputate.\n\nEtiam sed mollis orci. Integer et ex sed tortor scelerisque blandit semper id libero. Nulla facilisi. Pellentesque tempor magna eget massa ultrices, et efficitur lectus finibus.",
-                    Uri.parse("https://lh5.googleusercontent.com/-7fb5ybQhUbo/VGLWjIL4RmI/AAAAAAAAACM/2jLe_msj_tk/w600-no/IMG_0049.JPG"),
-                    Uri.parse("https://lh3.googleusercontent.com/-EFEw6s7mT6I/VGLkCH4Xt4I/AAAAAAAAADY/ZlznhaQvb8E/w600-no/DSC_2775.JPG"),
-                    new LatLng(-33.858667, 151.214028),
-                    CITY_SYDNEY
-            ));
-
-            add(new Attraction(
-                    "Sydney Harbour Bridge",
-                    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris ut nulla neque. Morbi nec felis vel neque rhoncus malesuada.",
-                    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris ut nulla neque. Morbi nec felis vel neque rhoncus malesuada. Mauris non nisi est. Nunc in ipsum euismod, suscipit dolor eget, efficitur nisi. Integer venenatis mauris mauris, quis luctus risus pellentesque a. Duis tempus est at ligula vehicula fermentum. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.\n\nNam ut sodales nibh, euismod aliquet lectus. Curabitur ornare dictum nisi, at faucibus magna. Morbi tempus nibh sed sodales volutpat. Etiam sodales, turpis sit amet porttitor tristique, libero libero faucibus est, viverra dictum risus ipsum vel augue. Nulla dolor magna, iaculis ac ornare id, fermentum eget massa. Sed mattis, odio nec sodales vehicula, neque metus ullamcorper nulla, sit amet ullamcorper risus lectus a ipsum. Curabitur venenatis feugiat quam nec elementum. Curabitur a interdum urna. Curabitur tincidunt tortor eget neque condimentum blandit. Etiam imperdiet, enim nec blandit convallis, nunc augue.",
-                    Uri.parse("https://lh6.googleusercontent.com/-ORRJtfLQlaw/VGLmQPv3n8I/AAAAAAAAAD8/2TzSCCPzl9k/w600-no/DSC04114.JPG"),
-                    Uri.parse("https://lh4.googleusercontent.com/-ch9Kk-7pD68/VGLkCNh5niI/AAAAAAAAADc/ztxkRHWX-po/w600-no/DSC_2739.JPG"),
-                    new LatLng(-33.852222, 151.210556),
-                    CITY_SYDNEY
-            ));
-
-            add(new Attraction(
-                    "Darling Harbour",
-                    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam ut dui in ipsum suscipit aliquet pretium aliquet odio.",
-                    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam ut dui in ipsum suscipit aliquet pretium aliquet odio. Nam posuere nunc sed risus molestie varius. Suspendisse posuere faucibus urna, id vestibulum ante iaculis et. Vivamus placerat suscipit sem, a tempor nunc vehicula ac. Ut libero velit, dapibus sit amet euismod vel, dignissim a nisl.\n\nDonec non dui non felis laoreet malesuada. Fusce ac metus ultrices, fermentum felis quis, varius velit. Donec ac felis semper, scelerisque diam sed, dignissim risus. Maecenas vel semper sapien. Fusce euismod justo posuere, efficitur risus tincidunt, congue tellus. In hac habitasse platea dictumst. Sed lobortis risus consequat vehicula facilisis.\n\nIn hendrerit, neque in gravida rutrum, purus enim aliquet lectus, sit amet vulputate tortor lacus at sem. Aenean lorem metus, finibus rhoncus eros at, ullamcorper fringilla velit. Nulla vitae porttitor metus, quis gravida lectus. In rhoncus, diam a elementum luctus, erat nisi tempus ex, in porta est.",
-                    Uri.parse("https://lh5.googleusercontent.com/-qX43g6s92LY/VGLaTT3N35I/AAAAAAAAAC8/BbueQmch0Rw/w600-no/68001.jpg"),
-                    Uri.parse("https://lh6.googleusercontent.com/-SQ6T1Ure6l8/VGLaTg2iGuI/AAAAAAAAACo/m6_RkTW2G1o/w600-no/IMG_20140201_082851.jpg"),
-                    new LatLng(-33.8723, 151.19896),
-                    CITY_SYDNEY
-            ));
-
-            add(new Attraction(
-                    "Bondi Beach",
-                    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam et nunc in leo laoreet placerat. Interdum et malesuada fames ac ante ipsum primis in faucibus.",
-                    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam et nunc in leo laoreet placerat. Interdum et malesuada fames ac ante ipsum primis in faucibus. Proin vestibulum laoreet odio nec posuere. Quisque ante arcu, malesuada vitae velit a, auctor tincidunt ante. Mauris varius eros eros, eget scelerisque mi scelerisque ut. Donec vehicula vitae urna ac hendrerit. Phasellus egestas risus nec euismod auctor.\n\nInteger fermentum velit et dolor varius sagittis. Proin et viverra sapien. Nulla aliquet ante et hendrerit egestas. Duis vulputate libero in nisi gravida cursus. Praesent laoreet nec dolor non iaculis. Aliquam eleifend ultricies ipsum, eu pellentesque libero rutrum non. Mauris et purus erat. Nullam semper mi id tincidunt viverra. Ut porta sem congue lectus luctus ultricies. Suspendisse iaculis lacinia nibh, eu accumsan magna volutpat vel. Sed id interdum mi, vel sollicitudin elit. Fusce facilisis elementum gravida. Duis at volutpat odio. Integer porta convallis tincidunt. Donec aliquam, leo ut.",
-                    Uri.parse("https://lh4.googleusercontent.com/-wbNgVdUkBiE/VHe99hGVtNI/AAAAAAAAAFY/fAHfhchNLJw/w600-no/IMG_20141124_143747.jpg"),
-                    Uri.parse("https://lh6.googleusercontent.com/-sjY_xlEOic4/VHe9-I4DD9I/AAAAAAAAAFI/Mt0VnjU7SxQ/w600-no/IMG_20141124_144008.jpg"),
-                    new LatLng(-33.89102, 151.277726),
-                    CITY_SYDNEY
-            ));
-
-            add(new Attraction(
-                    "Taronga Zoo",
-                    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam eros velit, faucibus in mi in, accumsan eleifend magna. Fusce efficitur volutpat leo nec finibus. Vivamus luctus quis dolor ac interdum.",
-                    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam eros velit, faucibus in mi in, accumsan eleifend magna. Fusce efficitur volutpat leo nec finibus. Vivamus luctus quis dolor ac interdum. Donec iaculis, orci quis semper vulputate, tortor nisi porttitor tortor, at pretium ante quam ut odio. Donec fringilla sapien et dolor pharetra ultrices. Aenean faucibus felis non vulputate iaculis.\n\nEtiam eget dapibus ligula. Nunc facilisis dignissim tortor et elementum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aliquam condimentum pellentesque mollis. Aliquam finibus urna ipsum, sed accumsan ante blandit quis. Vestibulum vel lacinia ligula. Nunc justo ex, volutpat nec justo ut, efficitur gravida lectus. Mauris cursus dui libero, vel tristique purus laoreet non.\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse ultrices ullamcorper est, at consequat massa. Nam egestas at urna at pellentesque. Quisque lacus quam, efficitur vel erat eget, placerat feugiat eros. Mauris.",
-                    Uri.parse("https://lh6.googleusercontent.com/-kypwDfnk674/VGLWpQPm4VI/AAAAAAAAAB0/SrfL0fE9DnE/w500-no/OI000020_2.jpg"),
-                    Uri.parse("https://lh3.googleusercontent.com/-6_Ioko2ysgU/VHva2PjmRCI/AAAAAAAAAGM/cHjJC7ney4Q/w500-no/PC190054.JPG"),
-                    new LatLng(-33.843333, 151.241111),
-                    CITY_SYDNEY
-            ));
-        }});
-
-    }};
-
-    /**
-     * Creates a list of geofences based on the city locations
-     */
-    public static List<Geofence> getGeofenceList() {
-        List<Geofence> geofenceList = new ArrayList<Geofence>();
-        for (String city : CITY_LOCATIONS.keySet()) {
-            LatLng cityLatLng = CITY_LOCATIONS.get(city);
-            geofenceList.add(new Geofence.Builder()
-                    .setCircularRegion(cityLatLng.latitude, cityLatLng.longitude, TRIGGER_RADIUS)
-                    .setRequestId(city)
-                    .setTransitionTypes(TRIGGER_TRANSITION)
-                    .setExpirationDuration(EXPIRATION_DURATION)
-                    .build());
-        }
-        return geofenceList;
-    }
-
-    public static String getClosestCity(LatLng curLatLng) {
-        if (curLatLng == null) {
-            // In debug build still return a city so some data is displayed
-            if (BuildConfig.DEBUG) {
-                return TEST_CITY;
-            }
-            return null;
-        }
-
-        double minDistance = 0;
-        String closestCity = null;
-        for (Map.Entry<String, LatLng> entry: CITY_LOCATIONS.entrySet()) {
-            double distance = SphericalUtil.computeDistanceBetween(curLatLng, entry.getValue());
-            if (minDistance == 0 || distance < minDistance) {
-                minDistance = distance;
-                closestCity = entry.getKey();
-            }
-        }
-        return closestCity;
-    }
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/service/ListenerService.java b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/service/ListenerService.java
deleted file mode 100644
index c8a5790..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/service/ListenerService.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.service;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.util.Log;
-
-import com.example.android.xyztouristattractions.ui.DetailActivity;
-import com.google.android.gms.wearable.MessageEvent;
-import com.google.android.gms.wearable.WearableListenerService;
-import com.example.android.xyztouristattractions.common.Constants;
-
-/**
- * A Wear listener service, used to receive inbound messages from
- * the Wear device.
- */
-public class ListenerService extends WearableListenerService {
-    private static final String TAG = ListenerService.class.getSimpleName();
-
-    @Override
-    public void onMessageReceived(MessageEvent messageEvent) {
-        Log.v(TAG, "onMessageReceived: " + messageEvent);
-
-        if (Constants.CLEAR_NOTIFICATIONS_PATH.equals(messageEvent.getPath())) {
-            // Request for this device to clear its notifications
-            UtilityService.clearNotification(this);
-        } else if (Constants.START_ATTRACTION_PATH.equals(messageEvent.getPath())) {
-            // Request for this device open the attraction detail screen
-            // to a specific tourist attraction
-            String attractionName = new String(messageEvent.getData());
-            Intent intent = DetailActivity.getLaunchIntent(this, attractionName);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(intent);
-        } else if (Constants.START_NAVIGATION_PATH.equals(messageEvent.getPath())) {
-            // Request for this device to start Maps walking navigation to
-            // specific tourist attraction
-            String attractionQuery = new String(messageEvent.getData());
-            Uri uri = Uri.parse(Constants.MAPS_NAVIGATION_INTENT_URI + Uri.encode(attractionQuery));
-            Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(intent);
-        }
-    }
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/service/UtilityReceiver.java b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/service/UtilityReceiver.java
deleted file mode 100644
index 0a10ba2..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/service/UtilityReceiver.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.service;
-
-import android.content.Context;
-import android.content.Intent;
-import android.support.v4.content.WakefulBroadcastReceiver;
-
-/**
- * A simply utility receiver used to ensure the device stays awake for the
- * duration of the work being done by
- * {@link com.example.android.xyztouristattractions.service.UtilityService}.
- */
-public class UtilityReceiver extends WakefulBroadcastReceiver {
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        // Pass right over to UtilityService class, the wakeful receiver is
-        // just needed in case the geofence is triggered while the device
-        // is asleep otherwise the service may not have time to trigger the
-        // notification.
-        intent.setClass(context, UtilityService.class);
-        intent.setAction(UtilityService.ACTION_GEOFENCE_TRIGGERED);
-        startWakefulService(context, intent);
-    }
-
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java
deleted file mode 100644
index 4112a65..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.service;
-
-import android.app.IntentService;
-import android.app.Notification;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.graphics.Bitmap;
-import android.location.Location;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
-import android.support.v4.content.LocalBroadcastManager;
-import android.util.Log;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.example.android.xyztouristattractions.R;
-import com.example.android.xyztouristattractions.common.Attraction;
-import com.example.android.xyztouristattractions.common.Constants;
-import com.example.android.xyztouristattractions.common.Utils;
-import com.example.android.xyztouristattractions.provider.TouristAttractions;
-import com.example.android.xyztouristattractions.ui.DetailActivity;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.location.FusedLocationProviderApi;
-import com.google.android.gms.location.Geofence;
-import com.google.android.gms.location.GeofencingEvent;
-import com.google.android.gms.location.LocationRequest;
-import com.google.android.gms.location.LocationServices;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.wearable.DataApi;
-import com.google.android.gms.wearable.DataMap;
-import com.google.android.gms.wearable.PutDataMapRequest;
-import com.google.android.gms.wearable.PutDataRequest;
-import com.google.android.gms.wearable.Wearable;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import static com.example.android.xyztouristattractions.provider.TouristAttractions.ATTRACTIONS;
-import static com.google.android.gms.location.LocationServices.FusedLocationApi;
-import static com.google.android.gms.location.LocationServices.GeofencingApi;
-
-/**
- * A utility IntentService, used for a variety of asynchronous background
- * operations that do not necessarily need to be tied to a UI.
- */
-public class UtilityService extends IntentService {
-    private static final String TAG = UtilityService.class.getSimpleName();
-
-    public static final String ACTION_GEOFENCE_TRIGGERED = "geofence_triggered";
-    private static final String ACTION_LOCATION_UPDATED = "location_updated";
-    private static final String ACTION_REQUEST_LOCATION = "request_location";
-    private static final String ACTION_ADD_GEOFENCES = "add_geofences";
-    private static final String ACTION_CLEAR_NOTIFICATION = "clear_notification";
-    private static final String ACTION_CLEAR_REMOTE_NOTIFICATIONS = "clear_remote_notifications";
-    private static final String ACTION_FAKE_UPDATE = "fake_update";
-    private static final String EXTRA_TEST_MICROAPP = "test_microapp";
-
-    public static IntentFilter getLocationUpdatedIntentFilter() {
-        return new IntentFilter(UtilityService.ACTION_LOCATION_UPDATED);
-    }
-
-    public static void triggerWearTest(Context context, boolean microApp) {
-        Intent intent = new Intent(context, UtilityService.class);
-        intent.setAction(UtilityService.ACTION_FAKE_UPDATE);
-        intent.putExtra(EXTRA_TEST_MICROAPP, microApp);
-        context.startService(intent);
-    }
-
-    public static void addGeofences(Context context) {
-        Intent intent = new Intent(context, UtilityService.class);
-        intent.setAction(UtilityService.ACTION_ADD_GEOFENCES);
-        context.startService(intent);
-    }
-
-    public static void requestLocation(Context context) {
-        Intent intent = new Intent(context, UtilityService.class);
-        intent.setAction(UtilityService.ACTION_REQUEST_LOCATION);
-        context.startService(intent);
-    }
-
-    public static void clearNotification(Context context) {
-        Intent intent = new Intent(context, UtilityService.class);
-        intent.setAction(UtilityService.ACTION_CLEAR_NOTIFICATION);
-        context.startService(intent);
-    }
-
-    public static Intent getClearRemoteNotificationsIntent(Context context) {
-        Intent intent = new Intent(context, UtilityService.class);
-        intent.setAction(UtilityService.ACTION_CLEAR_REMOTE_NOTIFICATIONS);
-        return intent;
-    }
-
-    public UtilityService() {
-        super(TAG);
-    }
-
-    @Override
-    protected void onHandleIntent(Intent intent) {
-        String action = intent != null ? intent.getAction() : null;
-        if (ACTION_ADD_GEOFENCES.equals(action)) {
-            addGeofencesInternal();
-        } else if (ACTION_GEOFENCE_TRIGGERED.equals(action)) {
-            geofenceTriggered(intent);
-        } else if (ACTION_REQUEST_LOCATION.equals(action)) {
-            requestLocationInternal();
-        } else if (ACTION_LOCATION_UPDATED.equals(action)) {
-            locationUpdated(intent);
-        } else if (ACTION_CLEAR_NOTIFICATION.equals(action)) {
-            clearNotificationInternal();
-        } else if (ACTION_CLEAR_REMOTE_NOTIFICATIONS.equals(action)) {
-            clearRemoteNotifications();
-        } else if (ACTION_FAKE_UPDATE.equals(action)) {
-            LatLng currentLocation = Utils.getLocation(this);
-
-            // If location unknown use test city, otherwise use closest city
-            String city = currentLocation == null ? TouristAttractions.TEST_CITY :
-                    TouristAttractions.getClosestCity(currentLocation);
-
-            showNotification(city,
-                    intent.getBooleanExtra(EXTRA_TEST_MICROAPP, Constants.USE_MICRO_APP));
-        }
-    }
-
-    /**
-     * Add geofences using Play Services
-     */
-    private void addGeofencesInternal() {
-        Log.v(TAG, ACTION_ADD_GEOFENCES);
-        GoogleApiClient googleApiClient = new GoogleApiClient.Builder(this)
-                .addApi(LocationServices.API)
-                .build();
-
-        // It's OK to use blockingConnect() here as we are running in an
-        // IntentService that executes work on a separate (background) thread.
-        ConnectionResult connectionResult = googleApiClient.blockingConnect(
-                Constants.GOOGLE_API_CLIENT_TIMEOUT_S, TimeUnit.SECONDS);
-
-        if (connectionResult.isSuccess() && googleApiClient.isConnected()) {
-            PendingIntent pendingIntent = PendingIntent.getBroadcast(
-                    this, 0, new Intent(this, UtilityReceiver.class), 0);
-            GeofencingApi.addGeofences(googleApiClient,
-                    TouristAttractions.getGeofenceList(), pendingIntent);
-            googleApiClient.disconnect();
-        } else {
-            Log.e(TAG, String.format(Constants.GOOGLE_API_CLIENT_ERROR_MSG,
-                    connectionResult.getErrorCode()));
-        }
-    }
-
-    /**
-     * Called when a geofence is triggered
-     */
-    private void geofenceTriggered(Intent intent) {
-        Log.v(TAG, ACTION_GEOFENCE_TRIGGERED);
-
-        // Check if geofences are enabled
-        boolean geofenceEnabled = Utils.getGeofenceEnabled(this);
-
-        // Extract the geofences from the intent
-        GeofencingEvent event = GeofencingEvent.fromIntent(intent);
-        List<Geofence> geofences = event.getTriggeringGeofences();
-
-        if (geofenceEnabled && geofences != null && geofences.size() > 0) {
-            if (event.getGeofenceTransition() == Geofence.GEOFENCE_TRANSITION_ENTER) {
-                // Trigger the notification based on the first geofence
-                showNotification(geofences.get(0).getRequestId(), Constants.USE_MICRO_APP);
-            } else if (event.getGeofenceTransition() == Geofence.GEOFENCE_TRANSITION_EXIT) {
-                // Clear notifications
-                clearNotificationInternal();
-                clearRemoteNotifications();
-            }
-        }
-        UtilityReceiver.completeWakefulIntent(intent);
-    }
-
-    /**
-     * Called when a location update is requested
-     */
-    private void requestLocationInternal() {
-        Log.v(TAG, ACTION_REQUEST_LOCATION);
-        GoogleApiClient googleApiClient = new GoogleApiClient.Builder(this)
-                .addApi(LocationServices.API)
-                .build();
-
-        // It's OK to use blockingConnect() here as we are running in an
-        // IntentService that executes work on a separate (background) thread.
-        ConnectionResult connectionResult = googleApiClient.blockingConnect(
-                Constants.GOOGLE_API_CLIENT_TIMEOUT_S, TimeUnit.SECONDS);
-
-        if (connectionResult.isSuccess() && googleApiClient.isConnected()) {
-
-            Intent locationUpdatedIntent = new Intent(this, UtilityService.class);
-            locationUpdatedIntent.setAction(ACTION_LOCATION_UPDATED);
-
-            // Send last known location out first if available
-            Location location = FusedLocationApi.getLastLocation(googleApiClient);
-            if (location != null) {
-                Intent lastLocationIntent = new Intent(locationUpdatedIntent);
-                lastLocationIntent.putExtra(
-                        FusedLocationProviderApi.KEY_LOCATION_CHANGED, location);
-                startService(lastLocationIntent);
-            }
-
-            // Request new location
-            LocationRequest mLocationRequest = new LocationRequest()
-                    .setPriority(LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY);
-            FusedLocationApi.requestLocationUpdates(
-                    googleApiClient, mLocationRequest,
-                    PendingIntent.getService(this, 0, locationUpdatedIntent, 0));
-
-            googleApiClient.disconnect();
-        } else {
-            Log.e(TAG, String.format(Constants.GOOGLE_API_CLIENT_ERROR_MSG,
-                    connectionResult.getErrorCode()));
-        }
-    }
-
-    /**
-     * Called when the location has been updated
-     */
-    private void locationUpdated(Intent intent) {
-        Log.v(TAG, ACTION_LOCATION_UPDATED);
-
-        // Extra new location
-        Location location =
-                intent.getParcelableExtra(FusedLocationProviderApi.KEY_LOCATION_CHANGED);
-
-        if (location != null) {
-            LatLng latLngLocation = new LatLng(location.getLatitude(), location.getLongitude());
-
-            // Store in a local preference as well
-            Utils.storeLocation(this, latLngLocation);
-
-            // Send a local broadcast so if an Activity is open it can respond
-            // to the updated location
-            LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
-        }
-    }
-
-    /**
-     * Clears the local device notification
-     */
-    private void clearNotificationInternal() {
-        Log.v(TAG, ACTION_CLEAR_NOTIFICATION);
-        NotificationManagerCompat.from(this).cancel(Constants.MOBILE_NOTIFICATION_ID);
-    }
-
-    /**
-     * Clears remote device notifications using the Wearable message API
-     */
-    private void clearRemoteNotifications() {
-        Log.v(TAG, ACTION_CLEAR_REMOTE_NOTIFICATIONS);
-        GoogleApiClient googleApiClient = new GoogleApiClient.Builder(this)
-                .addApi(Wearable.API)
-                .build();
-
-        // It's OK to use blockingConnect() here as we are running in an
-        // IntentService that executes work on a separate (background) thread.
-        ConnectionResult connectionResult = googleApiClient.blockingConnect(
-                Constants.GOOGLE_API_CLIENT_TIMEOUT_S, TimeUnit.SECONDS);
-
-        if (connectionResult.isSuccess() && googleApiClient.isConnected()) {
-
-            // Loop through all nodes and send a clear notification message
-            Iterator<String> itr = Utils.getNodes(googleApiClient).iterator();
-            while (itr.hasNext()) {
-                Wearable.MessageApi.sendMessage(
-                        googleApiClient, itr.next(), Constants.CLEAR_NOTIFICATIONS_PATH, null);
-            }
-            googleApiClient.disconnect();
-        }
-    }
-
-
-    /**
-     * Show the notification. Either the regular notification with wearable features
-     * added to enhance, or trigger the full micro app on the wearable.
-     *
-     * @param cityId The city to trigger the notification for
-     * @param microApp If the micro app should be triggered or just enhanced notifications
-     */
-    private void showNotification(String cityId, boolean microApp) {
-
-        List<Attraction> attractions = ATTRACTIONS.get(cityId);
-
-        if (microApp) {
-            // If micro app we first need to transfer some data over
-            sendDataToWearable(attractions);
-        }
-
-        // The first (closest) tourist attraction
-        Attraction attraction = attractions.get(0);
-
-        // Limit attractions to send
-        int count = attractions.size() > Constants.MAX_ATTRACTIONS ?
-                Constants.MAX_ATTRACTIONS : attractions.size();
-
-        // Pull down the tourist attraction images from the network and store
-        HashMap<String, Bitmap> bitmaps = new HashMap<>();
-        try {
-            for (int i = 0; i < count; i++) {
-                bitmaps.put(attractions.get(i).name,
-                        Glide.with(this)
-                                .load(attractions.get(i).imageUrl)
-                                .asBitmap()
-                                .diskCacheStrategy(DiskCacheStrategy.SOURCE)
-                                .into(Constants.WEAR_IMAGE_SIZE, Constants.WEAR_IMAGE_SIZE)
-                                .get());
-            }
-        } catch (InterruptedException | ExecutionException e) {
-            Log.e(TAG, "Error fetching image from network: " + e);
-        }
-
-        // The intent to trigger when the notification is tapped
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0,
-                DetailActivity.getLaunchIntent(this, attraction.name),
-                PendingIntent.FLAG_UPDATE_CURRENT);
-
-        // The intent to trigger when the notification is dismissed, in this case
-        // we want to clear remote notifications as well
-        PendingIntent deletePendingIntent =
-                PendingIntent.getService(this, 0, getClearRemoteNotificationsIntent(this), 0);
-
-        // Construct the main notification
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(this)
-                .setStyle(new NotificationCompat.BigPictureStyle()
-                                .bigPicture(bitmaps.get(attraction.name))
-                                .setBigContentTitle(attraction.name)
-                                .setSummaryText(getString(R.string.nearby_attraction))
-                )
-                .setLocalOnly(microApp)
-                .setContentTitle(attraction.name)
-                .setContentText(getString(R.string.nearby_attraction))
-                .setSmallIcon(R.drawable.ic_stat_maps_pin_drop)
-                .setContentIntent(pendingIntent)
-                .setDeleteIntent(deletePendingIntent)
-                .setColor(getResources().getColor(R.color.colorPrimary))
-                .setCategory(Notification.CATEGORY_RECOMMENDATION)
-                .setAutoCancel(true);
-
-        if (!microApp) {
-            // If not a micro app, create some wearable pages for
-            // the other nearby tourist attractions.
-            ArrayList<Notification> pages = new ArrayList<Notification>();
-            for (int i = 1; i < count; i++) {
-
-                // Calculate the distance from current location to tourist attraction
-                String distance = Utils.formatDistanceBetween(
-                        Utils.getLocation(this), attractions.get(i).location);
-
-                // Construct the notification and add it as a page
-                pages.add(new NotificationCompat.Builder(this)
-                        .setContentTitle(attractions.get(i).name)
-                        .setContentText(distance)
-                        .setSmallIcon(R.drawable.ic_stat_maps_pin_drop)
-                        .extend(new NotificationCompat.WearableExtender()
-                                .setBackground(bitmaps.get(attractions.get(i).name))
-                        )
-                        .build());
-            }
-            builder.extend(new NotificationCompat.WearableExtender().addPages(pages));
-        }
-
-        // Trigger the notification
-        NotificationManagerCompat.from(this).notify(
-                Constants.MOBILE_NOTIFICATION_ID, builder.build());
-    }
-
-    /**
-     * Transfer the required data over to the wearable
-     * @param attractions list of attraction data to transfer over
-     */
-    private void sendDataToWearable(List<Attraction> attractions) {
-        GoogleApiClient googleApiClient = new GoogleApiClient.Builder(this)
-                .addApi(Wearable.API)
-                .build();
-
-        // It's OK to use blockingConnect() here as we are running in an
-        // IntentService that executes work on a separate (background) thread.
-        ConnectionResult connectionResult = googleApiClient.blockingConnect(
-                Constants.GOOGLE_API_CLIENT_TIMEOUT_S, TimeUnit.SECONDS);
-
-        // Limit attractions to send
-        int count = attractions.size() > Constants.MAX_ATTRACTIONS ?
-                Constants.MAX_ATTRACTIONS : attractions.size();
-
-        ArrayList<DataMap> attractionsData = new ArrayList<>(count);
-
-        for (int i = 0; i < count; i++) {
-            Attraction attraction = attractions.get(i);
-
-            Bitmap image = null;
-            Bitmap secondaryImage = null;
-
-            try {
-                // Fetch and resize attraction image bitmap
-                image = Glide.with(this)
-                        .load(attraction.imageUrl)
-                        .asBitmap()
-                        .diskCacheStrategy(DiskCacheStrategy.SOURCE)
-                        .into(Constants.WEAR_IMAGE_SIZE_PARALLAX_WIDTH, Constants.WEAR_IMAGE_SIZE)
-                        .get();
-
-                secondaryImage = Glide.with(this)
-                        .load(attraction.secondaryImageUrl)
-                        .asBitmap()
-                        .diskCacheStrategy(DiskCacheStrategy.SOURCE)
-                        .into(Constants.WEAR_IMAGE_SIZE_PARALLAX_WIDTH, Constants.WEAR_IMAGE_SIZE)
-                        .get();
-            } catch (InterruptedException | ExecutionException e) {
-                Log.e(TAG, "Exception loading bitmap from network");
-            }
-
-            if (image != null && secondaryImage != null) {
-
-                DataMap attractionData = new DataMap();
-
-                String distance = Utils.formatDistanceBetween(
-                        Utils.getLocation(this), attraction.location);
-
-                attractionData.putString(Constants.EXTRA_TITLE, attraction.name);
-                attractionData.putString(Constants.EXTRA_DESCRIPTION, attraction.description);
-                attractionData.putDouble(
-                        Constants.EXTRA_LOCATION_LAT, attraction.location.latitude);
-                attractionData.putDouble(
-                        Constants.EXTRA_LOCATION_LNG, attraction.location.longitude);
-                attractionData.putString(Constants.EXTRA_DISTANCE, distance);
-                attractionData.putString(Constants.EXTRA_CITY, attraction.city);
-                attractionData.putAsset(Constants.EXTRA_IMAGE,
-                        Utils.createAssetFromBitmap(image));
-                attractionData.putAsset(Constants.EXTRA_IMAGE_SECONDARY,
-                        Utils.createAssetFromBitmap(secondaryImage));
-
-                attractionsData.add(attractionData);
-            }
-        }
-
-        if (connectionResult.isSuccess() && googleApiClient.isConnected()
-                && attractionsData.size() > 0) {
-
-            PutDataMapRequest dataMap = PutDataMapRequest.create(Constants.ATTRACTION_PATH);
-            dataMap.getDataMap().putDataMapArrayList(Constants.EXTRA_ATTRACTIONS, attractionsData);
-            dataMap.getDataMap().putLong(Constants.EXTRA_TIMESTAMP, new Date().getTime());
-            PutDataRequest request = dataMap.asPutDataRequest();
-
-            // Send the data over
-            DataApi.DataItemResult result =
-                    Wearable.DataApi.putDataItem(googleApiClient, request).await();
-
-            if (!result.getStatus().isSuccess()) {
-                Log.e(TAG, String.format("Error sending data using DataApi (error code = %d)",
-                        result.getStatus().getStatusCode()));
-            }
-
-        } else {
-            Log.e(TAG, String.format(Constants.GOOGLE_API_CLIENT_ERROR_MSG,
-                    connectionResult.getErrorCode()));
-        }
-        googleApiClient.disconnect();
-    }
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/AttractionListActivity.java b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/AttractionListActivity.java
deleted file mode 100644
index 8d2908c..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/AttractionListActivity.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.ui;
-
-import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.Toast;
-
-import com.example.android.xyztouristattractions.R;
-import com.example.android.xyztouristattractions.common.Utils;
-import com.example.android.xyztouristattractions.service.UtilityService;
-
-/**
- * The main tourist attraction activity screen which contains a list of
- * attractions sorted by distance.
- */
-public class AttractionListActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        if (savedInstanceState == null) {
-            getSupportFragmentManager().beginTransaction()
-                    .add(R.id.container, new AttractionListFragment())
-                    .commit();
-        }
-
-        UtilityService.addGeofences(this);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        UtilityService.requestLocation(this);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.main, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        switch (item.getItemId()) {
-            case R.id.test_notification:
-                UtilityService.triggerWearTest(this, false);
-                showDebugDialog(R.string.action_test_notification,
-                        R.string.action_test_notification_dialog);
-                return true;
-            case R.id.test_microapp:
-                UtilityService.triggerWearTest(this, true);
-                showDebugDialog(R.string.action_test_microapp,
-                        R.string.action_test_microapp_dialog);
-                return true;
-            case R.id.test_toggle_geofence:
-                boolean geofenceEnabled = Utils.getGeofenceEnabled(this);
-                Utils.storeGeofenceEnabled(this, !geofenceEnabled);
-                Toast.makeText(this, geofenceEnabled ?
-                        "Debug: Geofencing trigger disabled" :
-                        "Debug: Geofencing trigger enabled", Toast.LENGTH_SHORT).show();
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    /**
-     * Show a basic debug dialog to provide more info on the built-in debug
-     * options.
-     */
-    private void showDebugDialog(int titleResId, int bodyResId) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this)
-                .setTitle(titleResId)
-                .setMessage(bodyResId)
-                .setPositiveButton(android.R.string.ok, null);
-        builder.create().show();
-    }
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/AttractionListFragment.java b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/AttractionListFragment.java
deleted file mode 100644
index 0f1bc8b..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/AttractionListFragment.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.ui;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.location.Location;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.example.android.xyztouristattractions.R;
-import com.example.android.xyztouristattractions.common.Attraction;
-import com.example.android.xyztouristattractions.common.Constants;
-import com.example.android.xyztouristattractions.common.Utils;
-import com.example.android.xyztouristattractions.provider.TouristAttractions;
-import com.example.android.xyztouristattractions.service.UtilityService;
-import com.google.android.gms.location.FusedLocationProviderApi;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.maps.android.SphericalUtil;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import static com.example.android.xyztouristattractions.provider.TouristAttractions.ATTRACTIONS;
-
-/**
- * The main tourist attraction fragment which contains a list of attractions
- * sorted by distance (contained inside
- * {@link com.example.android.xyztouristattractions.ui.AttractionListActivity}).
- */
-public class AttractionListFragment extends Fragment {
-
-    private AttractionAdapter mAdapter;
-    private LatLng mLatestLocation;
-    private int mImageSize;
-
-    public AttractionListFragment() {}
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Load a larger size image to make the activity transition to the detail screen smooth
-        mImageSize = getResources().getDimensionPixelSize(R.dimen.image_size)
-                * Constants.IMAGE_ANIM_MULTIPLIER;
-
-        mLatestLocation = Utils.getLocation(getActivity());
-        List<Attraction> attractions = loadAttractionsFromLocation(mLatestLocation);
-        mAdapter = new AttractionAdapter(getActivity(), attractions);
-
-        View view = inflater.inflate(R.layout.fragment_main, container, false);
-        AttractionsRecyclerView recyclerView =
-                (AttractionsRecyclerView) view.findViewById(android.R.id.list);
-        recyclerView.setEmptyView(view.findViewById(android.R.id.empty));
-        recyclerView.setHasFixedSize(true);
-        recyclerView.setLayoutManager(new GridLayoutManager(
-                getActivity(), getResources().getInteger(R.integer.list_columns)));
-        recyclerView.setAdapter(mAdapter);
-
-        return view;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        LocalBroadcastManager.getInstance(getActivity()).registerReceiver(
-                mBroadcastReceiver, UtilityService.getLocationUpdatedIntentFilter());
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        LocalBroadcastManager.getInstance(getActivity()).unregisterReceiver(mBroadcastReceiver);
-    }
-
-    private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            Location location =
-                    intent.getParcelableExtra(FusedLocationProviderApi.KEY_LOCATION_CHANGED);
-            if (location != null) {
-                mLatestLocation = new LatLng(location.getLatitude(), location.getLongitude());
-                mAdapter.mAttractionList = loadAttractionsFromLocation(mLatestLocation);
-                mAdapter.notifyDataSetChanged();
-            }
-        }
-    };
-
-    private static List<Attraction> loadAttractionsFromLocation(final LatLng curLatLng) {
-        String closestCity = TouristAttractions.getClosestCity(curLatLng);
-        if (closestCity != null) {
-            List<Attraction> attractions = ATTRACTIONS.get(closestCity);
-            if (curLatLng != null) {
-                Collections.sort(attractions,
-                        new Comparator<Attraction>() {
-                            @Override
-                            public int compare(Attraction lhs, Attraction rhs) {
-                                double lhsDistance = SphericalUtil.computeDistanceBetween(
-                                        lhs.location, curLatLng);
-                                double rhsDistance = SphericalUtil.computeDistanceBetween(
-                                        rhs.location, curLatLng);
-                                return (int) (lhsDistance - rhsDistance);
-                            }
-                        }
-                );
-            }
-            return attractions;
-        }
-        return null;
-    }
-
-    private class AttractionAdapter extends RecyclerView.Adapter<ViewHolder>
-            implements ItemClickListener {
-
-        public List<Attraction> mAttractionList;
-        private Context mContext;
-
-        public AttractionAdapter(Context context, List<Attraction> attractions) {
-            super();
-            mContext = context;
-            mAttractionList = attractions;
-        }
-
-        @Override
-        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            LayoutInflater inflater = LayoutInflater.from(mContext);
-            View view = inflater.inflate(R.layout.list_row, parent, false);
-            return new ViewHolder(view, this);
-        }
-
-        @Override
-        public void onBindViewHolder(ViewHolder holder, int position) {
-            Attraction attraction = mAttractionList.get(position);
-
-            holder.mTitleTextView.setText(attraction.name);
-            holder.mDescriptionTextView.setText(attraction.description);
-            Glide.with(mContext)
-                    .load(attraction.imageUrl)
-                    .diskCacheStrategy(DiskCacheStrategy.SOURCE)
-                    .placeholder(R.drawable.empty_photo)
-                    .override(mImageSize, mImageSize)
-                    .into(holder.mImageView);
-
-            String distance =
-                    Utils.formatDistanceBetween(mLatestLocation, attraction.location);
-            if (TextUtils.isEmpty(distance)) {
-                holder.mOverlayTextView.setVisibility(View.GONE);
-            } else {
-                holder.mOverlayTextView.setVisibility(View.VISIBLE);
-                holder.mOverlayTextView.setText(distance);
-            }
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public int getItemCount() {
-            return mAttractionList == null ? 0 : mAttractionList.size();
-        }
-
-        @Override
-        public void onItemClick(View view, int position) {
-            View heroView = view.findViewById(android.R.id.icon);
-            DetailActivity.launch(
-                    getActivity(), mAdapter.mAttractionList.get(position).name, heroView);
-        }
-    }
-
-    private static class ViewHolder extends RecyclerView.ViewHolder
-            implements View.OnClickListener {
-
-        TextView mTitleTextView;
-        TextView mDescriptionTextView;
-        TextView mOverlayTextView;
-        ImageView mImageView;
-        ItemClickListener mItemClickListener;
-
-        public ViewHolder(View view, ItemClickListener itemClickListener) {
-            super(view);
-            mTitleTextView = (TextView) view.findViewById(android.R.id.text1);
-            mDescriptionTextView = (TextView) view.findViewById(android.R.id.text2);
-            mOverlayTextView = (TextView) view.findViewById(R.id.overlaytext);
-            mImageView = (ImageView) view.findViewById(android.R.id.icon);
-            mItemClickListener = itemClickListener;
-            view.setOnClickListener(this);
-        }
-
-        @Override
-        public void onClick(View v) {
-            mItemClickListener.onItemClick(v, getPosition());
-        }
-    }
-
-    interface ItemClickListener {
-        void onItemClick(View view, int position);
-    }
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsRecyclerView.java b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsRecyclerView.java
deleted file mode 100644
index cca3bf1..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsRecyclerView.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.ui;
-
-import android.content.Context;
-import android.support.v7.widget.RecyclerView;
-import android.util.AttributeSet;
-import android.view.View;
-
-/**
- * Simple RecyclerView subclass that supports providing an empty view (which
- * is displayed when the adapter has no data and hidden otherwise).
- */
-public class AttractionsRecyclerView extends RecyclerView {
-    private View mEmptyView;
-
-    private AdapterDataObserver mDataObserver = new AdapterDataObserver() {
-        @Override
-        public void onChanged() {
-            super.onChanged();
-            updateEmptyView();
-        }
-    };
-
-    public AttractionsRecyclerView(Context context) {
-        super(context);
-    }
-
-    public AttractionsRecyclerView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public AttractionsRecyclerView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    /**
-     * Designate a view as the empty view. When the backing adapter has no
-     * data this view will be made visible and the recycler view hidden.
-     *
-     */
-    public void setEmptyView(View emptyView) {
-        mEmptyView = emptyView;
-    }
-
-    @Override
-    public void setAdapter(RecyclerView.Adapter adapter) {
-        if (getAdapter() != null) {
-            getAdapter().unregisterAdapterDataObserver(mDataObserver);
-        }
-        if (adapter != null) {
-            adapter.registerAdapterDataObserver(mDataObserver);
-        }
-        super.setAdapter(adapter);
-        updateEmptyView();
-    }
-
-    private void updateEmptyView() {
-        if (mEmptyView != null && getAdapter() != null) {
-            boolean showEmptyView = getAdapter().getItemCount() == 0;
-            mEmptyView.setVisibility(showEmptyView ? VISIBLE : GONE);
-            setVisibility(showEmptyView ? GONE : VISIBLE);
-        }
-    }
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/DetailActivity.java b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/DetailActivity.java
deleted file mode 100644
index 3950785..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/DetailActivity.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.ui;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-
-import com.example.android.xyztouristattractions.R;
-
-/**
- * The tourist attraction detail activity screen which contains the details of
- * a single attraction.
- */
-public class DetailActivity extends AppCompatActivity {
-
-    private static final String EXTRA_ATTRACTION = "attraction";
-
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public static void launch(Activity activity, String attraction, View heroView) {
-        Intent intent = getLaunchIntent(activity, attraction);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(
-                    activity, heroView, heroView.getTransitionName());
-            ActivityCompat.startActivity(activity, intent, options.toBundle());
-        } else {
-            activity.startActivity(intent);
-        }
-    }
-
-    public static Intent getLaunchIntent(Context context, String attraction) {
-        Intent intent = new Intent(context, DetailActivity.class);
-        intent.putExtra(EXTRA_ATTRACTION, attraction);
-        return intent;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        String attraction = getIntent().getStringExtra(EXTRA_ATTRACTION);
-        if (savedInstanceState == null) {
-            getSupportFragmentManager().beginTransaction()
-                    .add(R.id.container, DetailFragment.createInstance(attraction))
-                    .commit();
-        }
-    }
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/DetailFragment.java b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/DetailFragment.java
deleted file mode 100644
index 4d21009..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/DetailFragment.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.ui;
-
-import android.app.TaskStackBuilder;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.NavUtils;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.example.android.xyztouristattractions.R;
-import com.example.android.xyztouristattractions.common.Attraction;
-import com.example.android.xyztouristattractions.common.Constants;
-import com.example.android.xyztouristattractions.common.Utils;
-import com.google.android.gms.maps.model.LatLng;
-
-import java.util.List;
-import java.util.Map;
-
-import static com.example.android.xyztouristattractions.provider.TouristAttractions.ATTRACTIONS;
-
-/**
- * The tourist attraction detail fragment which contains the details of a
- * a single attraction (contained inside
- * {@link com.example.android.xyztouristattractions.ui.DetailActivity}).
- */
-public class DetailFragment extends Fragment {
-
-    private static final String EXTRA_ATTRACTION = "attraction";
-    private Attraction mAttraction;
-
-    public static DetailFragment createInstance(String attractionName) {
-        DetailFragment detailFragment = new DetailFragment();
-        Bundle bundle = new Bundle();
-        bundle.putString(EXTRA_ATTRACTION, attractionName);
-        detailFragment.setArguments(bundle);
-        return detailFragment;
-    }
-
-    public DetailFragment() {}
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        setHasOptionsMenu(true);
-        View view = inflater.inflate(R.layout.fragment_detail, container, false);
-        String attractionName = getArguments().getString(EXTRA_ATTRACTION);
-        mAttraction = findAttraction(attractionName);
-
-        if (mAttraction == null) {
-            getActivity().finish();
-            return null;
-        }
-
-        TextView nameTextView = (TextView) view.findViewById(R.id.nameTextView);
-        TextView descTextView = (TextView) view.findViewById(R.id.descriptionTextView);
-        TextView distanceTextView = (TextView) view.findViewById(R.id.distanceTextView);
-        ImageView imageView = (ImageView) view.findViewById(R.id.imageView);
-
-        LatLng location = Utils.getLocation(getActivity());
-        String distance = Utils.formatDistanceBetween(location, mAttraction.location);
-        if (TextUtils.isEmpty(distance)) {
-            distanceTextView.setVisibility(View.GONE);
-        }
-
-        nameTextView.setText(attractionName);
-        distanceTextView.setText(distance);
-        descTextView.setText(mAttraction.longDescription);
-
-        int imageSize = getResources().getDimensionPixelSize(R.dimen.image_size)
-                * Constants.IMAGE_ANIM_MULTIPLIER;
-        Glide.with(getActivity())
-                .load(mAttraction.imageUrl)
-                .diskCacheStrategy(DiskCacheStrategy.SOURCE)
-                .placeholder(R.color.lighter_gray)
-                .override(imageSize, imageSize)
-                .into(imageView);
-        return view;
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.detail, menu);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                // Some small additions to handle "up" navigation correctly
-                Intent upIntent = NavUtils.getParentActivityIntent(getActivity());
-                upIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-
-                // Check if up activity needs to be created (usually when
-                // detail screen is opened from a notification or from the
-                // Wearable app
-                if (NavUtils.shouldUpRecreateTask(getActivity(), upIntent)
-                        || getActivity().isTaskRoot()) {
-
-                    // Synthesize parent stack
-                    TaskStackBuilder.create(getActivity())
-                            .addNextIntentWithParentStack(upIntent)
-                            .startActivities();
-                }
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    // On Lollipop+ we finish so to run the nice animation
-                    getActivity().finishAfterTransition();
-                    return true;
-                }
-
-                // Otherwise let the system handle navigating "up"
-                return false;
-            case R.id.map:
-                Intent intent = new Intent(Intent.ACTION_VIEW);
-                intent.setData(Uri.parse(Constants.MAPS_INTENT_URI +
-                        Uri.encode(mAttraction.name + ", " + mAttraction.city)));
-                startActivity(intent);
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    /**
-     * Really hacky loop for finding attraction in our static content provider.
-     * Obviously would not be used in a production app.
-     */
-    private Attraction findAttraction(String attractionName) {
-        for (Map.Entry<String, List<Attraction>> attractionsList : ATTRACTIONS.entrySet()) {
-            List<Attraction> attractions = attractionsList.getValue();
-            for (Attraction attraction : attractions) {
-                if (attractionName.equals(attraction.name)) {
-                    return attraction;
-                }
-            }
-        }
-        return null;
-    }
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-hdpi/ic_action_map.png b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-hdpi/ic_action_map.png
deleted file mode 100755
index b478e43..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-hdpi/ic_action_map.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-hdpi/ic_stat_maps_pin_drop.png b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-hdpi/ic_stat_maps_pin_drop.png
deleted file mode 100755
index 78821eb..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-hdpi/ic_stat_maps_pin_drop.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-mdpi/ic_action_map.png b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-mdpi/ic_action_map.png
deleted file mode 100755
index 0bfa259..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-mdpi/ic_action_map.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-mdpi/ic_stat_maps_pin_drop.png b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-mdpi/ic_stat_maps_pin_drop.png
deleted file mode 100755
index f7f0dce..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-mdpi/ic_stat_maps_pin_drop.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-nodpi/empty_photo.png b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-nodpi/empty_photo.png
deleted file mode 100644
index da1478a..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-nodpi/empty_photo.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-xhdpi/ic_action_map.png b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-xhdpi/ic_action_map.png
deleted file mode 100755
index 23468bb..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-xhdpi/ic_action_map.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-xhdpi/ic_stat_maps_pin_drop.png b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-xhdpi/ic_stat_maps_pin_drop.png
deleted file mode 100755
index 6abaad0..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-xhdpi/ic_stat_maps_pin_drop.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-xxhdpi/ic_action_map.png b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-xxhdpi/ic_action_map.png
deleted file mode 100755
index 9ce29d1..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-xxhdpi/ic_action_map.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-xxhdpi/ic_stat_maps_pin_drop.png b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-xxhdpi/ic_stat_maps_pin_drop.png
deleted file mode 100755
index 1e523e6..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/drawable-xxhdpi/ic_stat_maps_pin_drop.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 8661610..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".MainActivity">
-
-</LinearLayout>
\ No newline at end of file
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/layout/fragment_detail.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/layout/fragment_detail.xml
deleted file mode 100644
index dffeb4e..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/layout/fragment_detail.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:weightSum="100">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="50"
-        android:scaleType="centerCrop"
-        android:transitionName="image" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?colorPrimary"
-        android:orientation="vertical"
-        android:paddingStart="@dimen/keyline2"
-        android:paddingEnd="@dimen/keyline3"
-        android:paddingTop="@dimen/standard_margin"
-        android:paddingBottom="@dimen/standard_margin"
-        android:elevation="2dp">
-
-        <TextView
-            android:id="@+id/nameTextView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:maxLines="2"
-            android:ellipsize="end"
-            android:textIsSelectable="true"
-            style="@style/TextAppearance.AppCompat.Title.Inverse"
-            android:transitionName="title" />
-
-        <TextView
-            android:id="@+id/distanceTextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/TextAppearance.AppCompat.Subhead.Inverse" />
-
-    </LinearLayout>
-    
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="50"
-        android:paddingTop="@dimen/standard_margin"
-        android:paddingBottom="@dimen/standard_margin"
-        android:scrollbarStyle="outsideOverlay"
-        android:clipToPadding="false">
-
-        <TextView
-            android:id="@+id/descriptionTextView"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:textIsSelectable="true"
-            style="@style/TextAppearance.AppCompat.Body1"
-            android:paddingStart="@dimen/keyline2"
-            android:paddingEnd="@dimen/keyline3" />
-
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/layout/fragment_main.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/layout/fragment_main.xml
deleted file mode 100644
index 94d110a..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/layout/fragment_main.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".AttractionListFragment">
-
-    <com.example.android.xyztouristattractions.ui.AttractionsRecyclerView
-        android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbars="vertical" />
-
-    <TextView
-        android:id="@android:id/empty"
-        android:text="@string/empty_list"
-        style="?android:attr/textAppearanceMedium"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:gravity="center" />
-
-</LinearLayout>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/layout/list_row.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/layout/list_row.xml
deleted file mode 100644
index 25f55d0..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/layout/list_row.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:foreground="?attr/selectableItemBackground"
-    android:layout_height="@dimen/image_size">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <ImageView
-            android:id="@android:id/icon"
-            android:layout_width="@dimen/image_size"
-            android:layout_height="match_parent"
-            android:src="@drawable/empty_photo"
-            android:scaleType="centerCrop"
-            android:transitionName="image" />
-
-        <TextView
-            android:id="@+id/overlaytext"
-            android:layout_width="@dimen/image_size"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@android:id/icon"
-            android:gravity="center"
-            android:padding="@dimen/tiny_margin"
-            style="?android:textAppearanceSmallInverse"
-            android:background="@color/text_background"
-            tools:text="Overlay"/>
-
-        <TextView
-            android:id="@android:id/text1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@android:id/icon"
-            android:paddingTop="@dimen/small_margin"
-            android:paddingLeft="@dimen/small_margin"
-            android:paddingRight="@dimen/small_margin"
-            android:maxLines="1"
-            android:ellipsize="end"
-            style="?android:textAppearanceMedium"
-            tools:text="Title 1"
-            android:transitionName="image" />
-
-        <TextView
-            android:id="@android:id/text2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@android:id/icon"
-            android:layout_below="@android:id/text1"
-            android:padding="@dimen/small_margin"
-            android:ellipsize="end"
-            android:maxLines="4"
-            style="?android:textAppearanceSmall"
-            tools:text="Description goes here" />
-
-    </RelativeLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/menu/detail.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/menu/detail.xml
deleted file mode 100644
index aeb5c98..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/menu/detail.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".MainActivity" >
-
-    <item android:id="@+id/map"
-        android:title="@string/action_map"
-        android:orderInCategory="100"
-        android:icon="@drawable/ic_action_map"
-        app:showAsAction="ifRoom" />
-
-</menu>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/menu/main.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/menu/main.xml
deleted file mode 100644
index 1f840a7..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/menu/main.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".MainActivity" >
-
-    <item android:id="@+id/test_notification"
-        android:title="@string/action_test_notification"
-        android:orderInCategory="100"
-        app:showAsAction="never" />
-
-    <item android:id="@+id/test_microapp"
-        android:title="@string/action_test_microapp"
-        android:orderInCategory="100"
-        app:showAsAction="never" />
-
-    <item android:id="@+id/test_toggle_geofence"
-        android:title="@string/action_test_toggle_geofence"
-        android:orderInCategory="100"
-        app:showAsAction="never" />
-
-</menu>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/mipmap-hdpi/ic_launcher.png b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100755
index d159cbe..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/mipmap-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/mipmap-mdpi/ic_launcher.png b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100755
index cae9b67..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/mipmap-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/mipmap-xhdpi/ic_launcher.png b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100755
index cc42dd2..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100755
index a84fd3a..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100755
index f596c5c..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/transition-v21/explode.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/transition-v21/explode.xml
deleted file mode 100644
index 5dfa717..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/transition-v21/explode.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <explode>
-        <targets>
-            <target android:targetClass="android.widget.TextView" />
-            <target android:targetClass="android.widget.FrameLayout" />
-            <target android:targetClass="android.widget.LinearLayout" />
-            <target android:targetClass="android.widget.ImageView" />
-        </targets>
-    </explode>
-
-</transitionSet>
\ No newline at end of file
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/transition-v21/fade.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/transition-v21/fade.xml
deleted file mode 100644
index 6c70ec5..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/transition-v21/fade.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <fade>
-        <targets>
-            <target android:targetClass="android.widget.TextView" />
-            <target android:targetClass="android.widget.FrameLayout" />
-            <target android:targetClass="android.widget.LinearLayout" />
-            <target android:targetClass="android.widget.ImageView" />
-        </targets>
-    </fade>
-
-</transitionSet>
\ No newline at end of file
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-sw400dp/dimens.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-sw400dp/dimens.xml
deleted file mode 100644
index ad90eaa..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-sw400dp/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <dimen name="standard_margin">24dp</dimen>
-    <dimen name="small_margin">12dp</dimen>
-    <dimen name="tiny_margin">8dp</dimen>
-    <dimen name="image_size">140dp</dimen>
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-sw600dp/dimens.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 4e3a48e..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <dimen name="standard_margin">24dp</dimen>
-    <dimen name="small_margin">12dp</dimen>
-    <dimen name="tiny_margin">8dp</dimen>
-    <dimen name="image_size">200dp</dimen>
-    <dimen name="keyline2">80dp</dimen>
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-sw600dp/template-dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-sw600dp/template-dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <!-- Semantic definitions -->
-
-    <dimen name="horizontal_page_margin">@dimen/margin_huge</dimen>
-    <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-sw600dp/template-styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-sw600dp/template-styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <style name="Widget.SampleMessage">
-        <item name="android:textAppearance">?android:textAppearanceLarge</item>
-        <item name="android:lineSpacingMultiplier">1.2</item>
-        <item name="android:shadowDy">-6.5</item>
-    </style>
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-sw720dp/dimens.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-sw720dp/dimens.xml
deleted file mode 100644
index 73f0b8d..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-sw720dp/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <dimen name="standard_margin">24dp</dimen>
-    <dimen name="small_margin">12dp</dimen>
-    <dimen name="tiny_margin">12dp</dimen>
-    <dimen name="image_size">250dp</dimen>
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-v11/template-styles.xml
deleted file mode 100644
index 8c1ea66..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-v11/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Holo.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-v21/base-template-styles.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-v21/base-template-styles.xml
deleted file mode 100644
index c778e4f..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-v21/base-template-styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light">
-    </style>
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-v21/styles.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 319d664..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <style name="XYZAppTheme" parent="XYZAppTheme.Base">
-        <item name="android:windowContentTransitions">true</item>
-        <item name="android:windowActivityTransitions">true</item>
-        <item name="android:windowExitTransition">@transition/fade</item>
-        <item name="android:windowReenterTransition">@transition/fade</item>
-        <item name="android:windowEnterTransition">@transition/explode</item>
-        <item name="android:windowReturnTransition">@transition/explode</item>
-        <item name="android:windowAllowEnterTransitionOverlap">false</item>
-        <item name="android:windowAllowReturnTransitionOverlap">false</item>
-        <item name="android:windowSharedElementsUseOverlay">false</item>
-    </style>
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-w820dp/dimens.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-w820dp/dimens.xml
deleted file mode 100644
index 069102e..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <integer name="list_columns">2</integer>
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 90b90ef..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/base-strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
-    <string name="app_name">XYZTouristAttractions</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-
-This sample aims to be as close to a real world example of a mobile
-and Wear app combination as possible. It has a more refined design
-and also provides a practical example of how a mobile app would
-interact and communicate with its wear counterpart.
-
-The app itself is modeled after a hypothetical tourist attractions
-app that notifies the user when they are in close proximity to
-notable points of interest.
-
-The Wear component loads a full wearable app that shows images,
-summary information and provides quick actions for nearby tourist
-attractions in a GridViewPager UI component.
-
-        
-        ]]>
-    </string>
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/colors.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/colors.xml
deleted file mode 100644
index 2c16a5d..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <color name="text_background">#90000000</color>
-    <color name="transparent_actionbar_background">#22000000</color>
-    <color name="lighter_gray">#ddd</color>
-
-</resources>
\ No newline at end of file
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/dimens.xml
deleted file mode 100644
index 03acfef..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="standard_margin">16dp</dimen>
-    <dimen name="small_margin">8dp</dimen>
-    <dimen name="tiny_margin">4dp</dimen>
-    <dimen name="image_size">120dp</dimen>
-    <item type="dimen" name="keyline1">@dimen/standard_margin</item>
-    <dimen name="keyline2">72dp</dimen>
-    <item type="dimen" name="keyline3">@dimen/standard_margin</item>
-    <integer name="list_columns">1</integer>
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/strings.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/strings.xml
deleted file mode 100644
index 5f3ee14..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <string name="empty_list">No attractions found nearby!</string>
-    <string name="nearby_attraction">Nearby tourist attraction</string>
-    <string name="action_test_notification">Test Notification</string>
-    <string name="action_test_notification_dialog">
-<![CDATA[
-This will trigger a rich notification that is bridged over to the Wear device.
-\n\nNote that the first time this runs it can take 20-30 seconds to transfer
-the image data (in practice, users wouldn\'t notice this as the notification
-would be triggered automatically and only show up after the data was
-transferred).
-]]>
-    </string>
-    <string name="action_test_microapp">Test Micro App</string>
-    <string name="action_test_microapp_dialog">
-<![CDATA[
-This will trigger a notification on Wear that lets you open up the full
-wearable app. A few things to note:\n\n
-• Ensure you have the wearable APK installed on your Wear device (debug builds
-require you to install it manually)\n\n
-• The first time this runs it can take 20-30 seconds to transfer the image
-data (in practice, users wouldn\'t notice this as the notification would only
-be triggered after the data was transferred)\n\n
-• The notification priority is set to the recommended default value so it may
-appear further down your stream
-]]>
-    </string>
-    <string name="action_test_toggle_geofence">Toggle Geofence Trigger</string>
-    <string name="action_map">Show on Map</string>
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/styles.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/styles.xml
deleted file mode 100644
index 05f1e47..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="XYZAppTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="colorControlHighlight">?colorAccent</item>
-    </style>
-
-    <style name="XYZAppTheme" parent="XYZAppTheme.Base" />
-
-    <style name="XYZAppTheme.Detail">
-        <item name="windowActionBarOverlay">true</item>
-        <item name="actionBarStyle">@style/ActionBar.Detail</item>
-    </style>
-
-    <style name="ActionBar.Detail" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse">
-        <item name="background">@color/transparent_actionbar_background</item>
-        <item name="displayOptions">showHome|homeAsUp</item>
-    </style>
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/template-dimens.xml
deleted file mode 100644
index 39e710b..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/template-dimens.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <!-- Define standard dimensions to comply with Holo-style grids and rhythm. -->
-
-    <dimen name="margin_tiny">4dp</dimen>
-    <dimen name="margin_small">8dp</dimen>
-    <dimen name="margin_medium">16dp</dimen>
-    <dimen name="margin_large">32dp</dimen>
-    <dimen name="margin_huge">64dp</dimen>
-
-    <!-- Semantic definitions -->
-
-    <dimen name="horizontal_page_margin">@dimen/margin_medium</dimen>
-    <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/template-styles.xml
deleted file mode 100644
index 6e7d593..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/template-styles.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <!-- Activity themes -->
-
-    <style name="Theme.Base" parent="android:Theme.Light" />
-
-    <style name="Theme.Sample" parent="Theme.Base" />
-
-    <style name="AppTheme" parent="Theme.Sample" />
-    <!-- Widget styling -->
-
-    <style name="Widget" />
-
-    <style name="Widget.SampleMessage">
-        <item name="android:textAppearance">?android:textAppearanceMedium</item>
-        <item name="android:lineSpacingMultiplier">1.1</item>
-    </style>
-
-    <style name="Widget.SampleMessageTile">
-        <item name="android:background">@drawable/tile</item>
-        <item name="android:shadowColor">#7F000000</item>
-        <item name="android:shadowDy">-3.5</item>
-        <item name="android:shadowRadius">2</item>
-    </style>
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/wear.xml b/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/wear.xml
deleted file mode 100644
index 719ca4b..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Application/src/main/res/values/wear.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-    <string-array name="android_wear_capabilities" translatable="false">
-        <!-- declaring that phone has the capability to show details -->
-        <item>@string/show_detail_capability_name</item>
-    </string-array>
-</resources>
-
diff --git a/prebuilts/gradle/XYZTouristAttractions/CONTRIBUTING.md b/prebuilts/gradle/XYZTouristAttractions/CONTRIBUTING.md
deleted file mode 100644
index faa8b5c..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/CONTRIBUTING.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# How to become a contributor and submit your own code
-
-## Contributor License Agreements
-
-We'd love to accept your sample apps and patches! Before we can take them, we
-have to jump a couple of legal hurdles.
-
-Please fill out either the individual or corporate Contributor License Agreement (CLA).
-
-  * If you are an individual writing original source code and you're sure you
-    own the intellectual property, then you'll need to sign an [individual CLA]
-    (https://cla.developers.google.com).
-  * If you work for a company that wants to allow you to contribute your work,
-    then you'll need to sign a [corporate CLA]
-    (https://cla.developers.google.com).
-
-Follow either of the two links above to access the appropriate CLA and
-instructions for how to sign and return it. Once we receive it, we'll be able to
-accept your pull requests.
-
-## Contributing A Patch
-
-1. Submit an issue describing your proposed change to the repo in question.
-1. The repo owner will respond to your issue promptly.
-1. If your proposed change is accepted, and you haven't already done so, sign a
-   Contributor License Agreement (see details above).
-1. Fork the desired repo, develop and test your code changes.
-1. Ensure that your code adheres to the existing style in the sample to which
-   you are contributing. Refer to the
-   [Android Code Style Guide]
-   (https://source.android.com/source/code-style.html) for the
-   recommended coding standards for this organization.
-1. Ensure that your code has an appropriate set of unit tests which all pass.
-1. Submit a pull request.
-
diff --git a/prebuilts/gradle/XYZTouristAttractions/LICENSE b/prebuilts/gradle/XYZTouristAttractions/LICENSE
deleted file mode 100644
index 4f22946..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/LICENSE
+++ /dev/null
@@ -1,647 +0,0 @@
-Apache License
---------------
-
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-All image and audio files (including *.png, *.jpg, *.svg, *.mp3, *.wav 
-and *.ogg) are licensed under the CC-BY-NC license. All other files are 
-licensed under the Apache 2 license.
-
-CC-BY-NC License
-----------------
-
-Attribution-NonCommercial-ShareAlike 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
-     Considerations for licensors: Our public licenses are
-     intended for use by those authorized to give the public
-     permission to use material in ways otherwise restricted by
-     copyright and certain other rights. Our licenses are
-     irrevocable. Licensors should read and understand the terms
-     and conditions of the license they choose before applying it.
-     Licensors should also secure all rights necessary before
-     applying our licenses so that the public can reuse the
-     material as expected. Licensors should clearly mark any
-     material not subject to the license. This includes other CC-
-     licensed material, or material used under an exception or
-     limitation to copyright. More considerations for licensors:
-	wiki.creativecommons.org/Considerations_for_licensors
-
-     Considerations for the public: By using one of our public
-     licenses, a licensor grants the public permission to use the
-     licensed material under specified terms and conditions. If
-     the licensor's permission is not necessary for any reason--for
-     example, because of any applicable exception or limitation to
-     copyright--then that use is not regulated by the license. Our
-     licenses grant only permissions under copyright and certain
-     other rights that a licensor has authority to grant. Use of
-     the licensed material may still be restricted for other
-     reasons, including because others have copyright or other
-     rights in the material. A licensor may make special requests,
-     such as asking that all changes be marked or described.
-     Although not required by our licenses, you are encouraged to
-     respect those requests where reasonable. More_considerations
-     for the public: 
-	wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
-Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
-Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution-NonCommercial-ShareAlike 4.0 International Public License
-("Public License"). To the extent this Public License may be
-interpreted as a contract, You are granted the Licensed Rights in
-consideration of Your acceptance of these terms and conditions, and the
-Licensor grants You such rights in consideration of benefits the
-Licensor receives from making the Licensed Material available under
-these terms and conditions.
-
-
-Section 1 -- Definitions.
-
-  a. Adapted Material means material subject to Copyright and Similar
-     Rights that is derived from or based upon the Licensed Material
-     and in which the Licensed Material is translated, altered,
-     arranged, transformed, or otherwise modified in a manner requiring
-     permission under the Copyright and Similar Rights held by the
-     Licensor. For purposes of this Public License, where the Licensed
-     Material is a musical work, performance, or sound recording,
-     Adapted Material is always produced where the Licensed Material is
-     synched in timed relation with a moving image.
-
-  b. Adapter's License means the license You apply to Your Copyright
-     and Similar Rights in Your contributions to Adapted Material in
-     accordance with the terms and conditions of this Public License.
-
-  c. BY-NC-SA Compatible License means a license listed at
-     creativecommons.org/compatiblelicenses, approved by Creative
-     Commons as essentially the equivalent of this Public License.
-
-  d. Copyright and Similar Rights means copyright and/or similar rights
-     closely related to copyright including, without limitation,
-     performance, broadcast, sound recording, and Sui Generis Database
-     Rights, without regard to how the rights are labeled or
-     categorized. For purposes of this Public License, the rights
-     specified in Section 2(b)(1)-(2) are not Copyright and Similar
-     Rights.
-
-  e. Effective Technological Measures means those measures that, in the
-     absence of proper authority, may not be circumvented under laws
-     fulfilling obligations under Article 11 of the WIPO Copyright
-     Treaty adopted on December 20, 1996, and/or similar international
-     agreements.
-
-  f. Exceptions and Limitations means fair use, fair dealing, and/or
-     any other exception or limitation to Copyright and Similar Rights
-     that applies to Your use of the Licensed Material.
-
-  g. License Elements means the license attributes listed in the name
-     of a Creative Commons Public License. The License Elements of this
-     Public License are Attribution, NonCommercial, and ShareAlike.
-
-  h. Licensed Material means the artistic or literary work, database,
-     or other material to which the Licensor applied this Public
-     License.
-
-  i. Licensed Rights means the rights granted to You subject to the
-     terms and conditions of this Public License, which are limited to
-     all Copyright and Similar Rights that apply to Your use of the
-     Licensed Material and that the Licensor has authority to license.
-
-  j. Licensor means the individual(s) or entity(ies) granting rights
-     under this Public License.
-
-  k. NonCommercial means not primarily intended for or directed towards
-     commercial advantage or monetary compensation. For purposes of
-     this Public License, the exchange of the Licensed Material for
-     other material subject to Copyright and Similar Rights by digital
-     file-sharing or similar means is NonCommercial provided there is
-     no payment of monetary compensation in connection with the
-     exchange.
-
-  l. Share means to provide material to the public by any means or
-     process that requires permission under the Licensed Rights, such
-     as reproduction, public display, public performance, distribution,
-     dissemination, communication, or importation, and to make material
-     available to the public including in ways that members of the
-     public may access the material from a place and at a time
-     individually chosen by them.
-
-  m. Sui Generis Database Rights means rights other than copyright
-     resulting from Directive 96/9/EC of the European Parliament and of
-     the Council of 11 March 1996 on the legal protection of databases,
-     as amended and/or succeeded, as well as other essentially
-     equivalent rights anywhere in the world.
-
-  n. You means the individual or entity exercising the Licensed Rights
-     under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
-  a. License grant.
-
-       1. Subject to the terms and conditions of this Public License,
-          the Licensor hereby grants You a worldwide, royalty-free,
-          non-sublicensable, non-exclusive, irrevocable license to
-          exercise the Licensed Rights in the Licensed Material to:
-
-            a. reproduce and Share the Licensed Material, in whole or
-               in part, for NonCommercial purposes only; and
-
-            b. produce, reproduce, and Share Adapted Material for
-               NonCommercial purposes only.
-
-       2. Exceptions and Limitations. For the avoidance of doubt, where
-          Exceptions and Limitations apply to Your use, this Public
-          License does not apply, and You do not need to comply with
-          its terms and conditions.
-
-       3. Term. The term of this Public License is specified in Section
-          6(a).
-
-       4. Media and formats; technical modifications allowed. The
-          Licensor authorizes You to exercise the Licensed Rights in
-          all media and formats whether now known or hereafter created,
-          and to make technical modifications necessary to do so. The
-          Licensor waives and/or agrees not to assert any right or
-          authority to forbid You from making technical modifications
-          necessary to exercise the Licensed Rights, including
-          technical modifications necessary to circumvent Effective
-          Technological Measures. For purposes of this Public License,
-          simply making modifications authorized by this Section 2(a)
-          (4) never produces Adapted Material.
-
-       5. Downstream recipients.
-
-            a. Offer from the Licensor -- Licensed Material. Every
-               recipient of the Licensed Material automatically
-               receives an offer from the Licensor to exercise the
-               Licensed Rights under the terms and conditions of this
-               Public License.
-
-            b. Additional offer from the Licensor -- Adapted Material.
-               Every recipient of Adapted Material from You
-               automatically receives an offer from the Licensor to
-               exercise the Licensed Rights in the Adapted Material
-               under the conditions of the Adapter's License You apply.
-
-            c. No downstream restrictions. You may not offer or impose
-               any additional or different terms or conditions on, or
-               apply any Effective Technological Measures to, the
-               Licensed Material if doing so restricts exercise of the
-               Licensed Rights by any recipient of the Licensed
-               Material.
-
-       6. No endorsement. Nothing in this Public License constitutes or
-          may be construed as permission to assert or imply that You
-          are, or that Your use of the Licensed Material is, connected
-          with, or sponsored, endorsed, or granted official status by,
-          the Licensor or others designated to receive attribution as
-          provided in Section 3(a)(1)(A)(i).
-
-  b. Other rights.
-
-       1. Moral rights, such as the right of integrity, are not
-          licensed under this Public License, nor are publicity,
-          privacy, and/or other similar personality rights; however, to
-          the extent possible, the Licensor waives and/or agrees not to
-          assert any such rights held by the Licensor to the limited
-          extent necessary to allow You to exercise the Licensed
-          Rights, but not otherwise.
-
-       2. Patent and trademark rights are not licensed under this
-          Public License.
-
-       3. To the extent possible, the Licensor waives any right to
-          collect royalties from You for the exercise of the Licensed
-          Rights, whether directly or through a collecting society
-          under any voluntary or waivable statutory or compulsory
-          licensing scheme. In all other cases the Licensor expressly
-          reserves any right to collect such royalties, including when
-          the Licensed Material is used other than for NonCommercial
-          purposes.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
-  a. Attribution.
-
-       1. If You Share the Licensed Material (including in modified
-          form), You must:
-
-            a. retain the following if it is supplied by the Licensor
-               with the Licensed Material:
-
-                 i. identification of the creator(s) of the Licensed
-                    Material and any others designated to receive
-                    attribution, in any reasonable manner requested by
-                    the Licensor (including by pseudonym if
-                    designated);
-
-                ii. a copyright notice;
-
-               iii. a notice that refers to this Public License;
-
-                iv. a notice that refers to the disclaimer of
-                    warranties;
-
-                 v. a URI or hyperlink to the Licensed Material to the
-                    extent reasonably practicable;
-
-            b. indicate if You modified the Licensed Material and
-               retain an indication of any previous modifications; and
-
-            c. indicate the Licensed Material is licensed under this
-               Public License, and include the text of, or the URI or
-               hyperlink to, this Public License.
-
-       2. You may satisfy the conditions in Section 3(a)(1) in any
-          reasonable manner based on the medium, means, and context in
-          which You Share the Licensed Material. For example, it may be
-          reasonable to satisfy the conditions by providing a URI or
-          hyperlink to a resource that includes the required
-          information.
-       3. If requested by the Licensor, You must remove any of the
-          information required by Section 3(a)(1)(A) to the extent
-          reasonably practicable.
-
-  b. ShareAlike.
-
-     In addition to the conditions in Section 3(a), if You Share
-     Adapted Material You produce, the following conditions also apply.
-
-       1. The Adapter's License You apply must be a Creative Commons
-          license with the same License Elements, this version or
-          later, or a BY-NC-SA Compatible License.
-
-       2. You must include the text of, or the URI or hyperlink to, the
-          Adapter's License You apply. You may satisfy this condition
-          in any reasonable manner based on the medium, means, and
-          context in which You Share Adapted Material.
-
-       3. You may not offer or impose any additional or different terms
-          or conditions on, or apply any Effective Technological
-          Measures to, Adapted Material that restrict exercise of the
-          rights granted under the Adapter's License You apply.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
-  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
-     to extract, reuse, reproduce, and Share all or a substantial
-     portion of the contents of the database for NonCommercial purposes
-     only;
-
-  b. if You include all or a substantial portion of the database
-     contents in a database in which You have Sui Generis Database
-     Rights, then the database in which You have Sui Generis Database
-     Rights (but not its individual contents) is Adapted Material,
-     including for purposes of Section 3(b); and
-
-  c. You must comply with the conditions in Section 3(a) if You Share
-     all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
-  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
-  c. The disclaimer of warranties and limitation of liability provided
-     above shall be interpreted in a manner that, to the extent
-     possible, most closely approximates an absolute disclaimer and
-     waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
-  a. This Public License applies for the term of the Copyright and
-     Similar Rights licensed here. However, if You fail to comply with
-     this Public License, then Your rights under this Public License
-     terminate automatically.
-
-  b. Where Your right to use the Licensed Material has terminated under
-     Section 6(a), it reinstates:
-
-       1. automatically as of the date the violation is cured, provided
-          it is cured within 30 days of Your discovery of the
-          violation; or
-
-       2. upon express reinstatement by the Licensor.
-
-     For the avoidance of doubt, this Section 6(b) does not affect any
-     right the Licensor may have to seek remedies for Your violations
-     of this Public License.
-
-  c. For the avoidance of doubt, the Licensor may also offer the
-     Licensed Material under separate terms or conditions or stop
-     distributing the Licensed Material at any time; however, doing so
-     will not terminate this Public License.
-
-  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
-     License.
-
-
-Section 7 -- Other Terms and Conditions.
-
-  a. The Licensor shall not be bound by any additional or different
-     terms or conditions communicated by You unless expressly agreed.
-
-  b. Any arrangements, understandings, or agreements regarding the
-     Licensed Material not stated herein are separate from and
-     independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
-  a. For the avoidance of doubt, this Public License does not, and
-     shall not be interpreted to, reduce, limit, restrict, or impose
-     conditions on any use of the Licensed Material that could lawfully
-     be made without permission under this Public License.
-
-  b. To the extent possible, if any provision of this Public License is
-     deemed unenforceable, it shall be automatically reformed to the
-     minimum extent necessary to make it enforceable. If the provision
-     cannot be reformed, it shall be severed from this Public License
-     without affecting the enforceability of the remaining terms and
-     conditions.
-
-  c. No term or condition of this Public License will be waived and no
-     failure to comply consented to unless expressly agreed to by the
-     Licensor.
-
-  d. Nothing in this Public License constitutes or may be interpreted
-     as a limitation upon, or waiver of, any privileges and immunities
-     that apply to the Licensor or You, including from the legal
-     processes of any jurisdiction or authority.
-
-=======================================================================
-
-Creative Commons is not a party to its public licenses.
-Notwithstanding, Creative Commons may elect to apply one of its public
-licenses to material it publishes and in those instances will be
-considered the "Licensor." Except for the limited purpose of indicating
-that material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the public
-licenses.
-
-Creative Commons may be contacted at creativecommons.org.
-
diff --git a/prebuilts/gradle/XYZTouristAttractions/NOTICE b/prebuilts/gradle/XYZTouristAttractions/NOTICE
deleted file mode 100644
index 05e0e2e..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/NOTICE
+++ /dev/null
@@ -1,16 +0,0 @@
-
-This sample uses the following software:
-
-Copyright 2015 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/prebuilts/gradle/XYZTouristAttractions/README.md b/prebuilts/gradle/XYZTouristAttractions/README.md
deleted file mode 100644
index 0de5ee7..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/README.md
+++ /dev/null
@@ -1,141 +0,0 @@
-
-Android XYZTouristAttractions Sample
-===================================
-
-This sample aims to be as close to a real world example of a mobile
-and Wear app combination as possible. It has a more refined design
-and also provides a practical example of how a mobile app would
-interact and communicate with its wear counterpart.
-
-The app itself is modeled after a hypothetical tourist attractions
-app that notifies the user when they are in close proximity to
-notable points of interest.
-
-The Wear component shows tourist attraction images and summary
-information, and provides quick actions for nearby tourist
-attractions in a [GridViewPager](http://developer.android.com/reference/android/support/wearable/view/GridViewPager.html)
-UI component.
-
-Introduction
-------------
-
-Steps for trying out this sample:
-* Compile and install the mobile app onto your mobile device or emulator.
-* Compile and install the wearable app onto your Wear device or emulator.
-(**Note:** wearable apps are not automatically pushed from your mobile device
-unless you build a production release, see [here][22] for more info).
-* Start the mobile app and use the overflow menu options to test either a
-notification enhanced for Wear, or the full wearable application (unless
-you're physically in Sydney in which case the geofence should trigger
-automatically). Note that the first time you trigger either the notification
-or the wearable app it may take 20-30 seconds to show up as it needs to
-transfer the image assets to the wearable (in practice this delay won't be
-noticeable to users as they will only be notified once the data has been sent).
-
-This sample aims to demonstrate a number of different Android APIs and concepts
-relating to [Android Wear][1] and location using [Google Play Services][2]:
-* Trigger a mobile notification that uses [WearableExtender][3] to customize the
-display on the wearable
-* Transmit data from the mobile app to the wearable (including binary blobs
-such as photos) using the [Wearable DataApi][4]
-* Synchronize notification dismissal across mobile and wearable apps via the
-[Wearable MessageApi][5]
-* Trigger actions on the mobile app via the wearable app (eg. start walking
-navigation) via the [Wearable MessageApi][5]
-* Locate the user via the [Google Location APIs][6] and the
-[FusedLocationProviderApi][7]
-* Set up and trigger location [geofences][8] using the
-[Google Location APIs][6]
-
-The sample also focuses on providing a simple, yet clean design and UI for both
-mobile and wearable apps with an extra level of visual polish compared to a
-traditional code sample.
-
-Some of the UI widgets and design patterns used in the mobile app include:
-* Use of Material theme including definition of primary and accent colors
-* [AppCompat][9] usage for Material theme backward compatibility
-* Metrics and keylines based on the [Material guidelines][10]
-* Window content and activity transitions based on the
-[Material guidelines][11]
-* Use of the [RecyclerView][12] widget
-
-The wearable app uses a number of techniques and UI widgets as well:
-* Full screen app built off [GridViewPager][13] and [DotsPageIndicator][14]
-* Support for square and round screens (with and without insets) using
-[WatchViewStub][15] and [OnApplyWindowInsetsListener][16]
-* Use of a variety of other widgets from the [Wearable UI Library][17]
-([DismissOverlayView][18], [ConfirmationActivity][19],
-[CardScrollView][20], [CircledImageView][21])
-
-[1]: http://developer.android.com/wear/
-[2]: https://developer.android.com/google/play-services/
-[3]: https://developer.android.com/reference/android/support/v4/app/NotificationCompat.WearableExtender.html
-[4]: https://developer.android.com/reference/com/google/android/gms/wearable/DataApi.html
-[5]: https://developer.android.com/reference/com/google/android/gms/wearable/MessageApi.html
-[6]: https://developer.android.com/google/play-services/location.html
-[7]: https://developer.android.com/reference/com/google/android/gms/location/FusedLocationProviderApi.html
-[8]: https://developer.android.com/reference/com/google/android/gms/location/Geofence.html
-[9]: https://developer.android.com/tools/support-library/features.html#v7-appcompat
-[10]: http://www.google.com/design/spec/layout/metrics-keylines.html
-[11]: http://www.google.com/design/spec/animation/meaningful-transitions.html
-[12]: https://developer.android.com/reference/android/support/v7/widget/RecyclerView.html
-[13]: http://developer.android.com/reference/android/support/wearable/view/GridViewPager.html
-[14]: http://developer.android.com/reference/android/support/wearable/view/DotsPageIndicator.html
-[15]: http://developer.android.com/reference/android/support/wearable/view/WatchViewStub.html
-[16]: http://developer.android.com/reference/android/view/View.OnApplyWindowInsetsListener.html
-[17]: https://developer.android.com/training/wearables/apps/layouts.html#UiLibrary
-[18]: http://developer.android.com/reference/android/support/wearable/view/DismissOverlayView.html
-[19]: http://developer.android.com/reference/android/support/wearable/activity/ConfirmationActivity.html
-[20]: http://developer.android.com/reference/android/support/wearable/view/CardScrollView.html
-[21]: http://developer.android.com/reference/android/support/wearable/view/CircledImageView.html
-[22]: https://developer.android.com/training/wearables/apps/creating.html#Install
-
-Pre-requisites
---------------
-
-- Android SDK v22
-- Android Build Tools v22.0.1
-- Android Support Repository
-
-Screenshots
--------------
-
-<img src="screenshots/composite-1.png" height="400" alt="Screenshot"/> 
-
-Getting Started
----------------
-
-This sample uses the Gradle build system. To build this project, use the
-"gradlew build" command or use "Import Project" in Android Studio.
-
-Support
--------
-
-- Google+ Community: https://plus.google.com/communities/105153134372062985968
-- Stack Overflow: http://stackoverflow.com/questions/tagged/android
-
-If you've found an error in this sample, please file an issue:
-https://github.com/googlesamples/android-XYZTouristAttractions
-
-Patches are encouraged, and may be submitted by forking this project and
-submitting a pull request through GitHub. Please see CONTRIBUTING.md for more details.
-
-License
--------
-
-Copyright 2014 The Android Open Source Project, Inc.
-
-Licensed to the Apache Software Foundation (ASF) under one or more contributor
-license agreements.  See the NOTICE file distributed with this work for
-additional information regarding copyright ownership.  The ASF licenses this
-file to you under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License.  You may obtain a copy of
-the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-License for the specific language governing permissions and limitations under
-the License.
diff --git a/prebuilts/gradle/XYZTouristAttractions/Shared/build.gradle b/prebuilts/gradle/XYZTouristAttractions/Shared/build.gradle
deleted file mode 100644
index f99c3d2..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Shared/build.gradle
+++ /dev/null
@@ -1,56 +0,0 @@
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
-    }
-}
-
-apply plugin: 'android-library'
-
-repositories {
-    jcenter()
-}
-
-dependencies {
-    compile 'com.google.android.gms:play-services-wearable:7.3.0'
-    compile 'com.google.android.gms:play-services-location:7.3.0'
-    compile 'com.google.maps.android:android-maps-utils:0.3.2'
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
-    'main',     // main sample code; look here for the interesting stuff.
-    'common',   // components that are reused by multiple samples
-    'template'] // boilerplate code that is generated by the sample template process
-
-android {
-    compileSdkVersion 22
-
-    buildToolsVersion "22.0.1"
-
-    defaultConfig {
-        minSdkVersion 18
-        targetSdkVersion 22
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
-    sourceSets {
-        main {
-            dirs.each { dir ->
-                java.srcDirs "src/${dir}/java"
-                res.srcDirs "src/${dir}/res"
-            }
-        }
-
-    }
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Shared/proguard-rules.pro b/prebuilts/gradle/XYZTouristAttractions/Shared/proguard-rules.pro
deleted file mode 100644
index 0661c7b..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Shared/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${SDK_DIR}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index fe07629..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.xyztouristattractions.common">
-
-    <application android:allowBackup="true"/>
-
-</manifest>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/java/com/example/android/xyztouristattractions/common/Attraction.java b/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/java/com/example/android/xyztouristattractions/common/Attraction.java
deleted file mode 100644
index d65359c..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/java/com/example/android/xyztouristattractions/common/Attraction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.common;
-
-import android.graphics.Bitmap;
-import android.net.Uri;
-
-import com.google.android.gms.maps.model.LatLng;
-
-/**
- * A simple shared tourist attraction class to easily pass data around. Used
- * in both the mobile app and wearable app.
- */
-public class Attraction {
-    public String name;
-    public String description;
-    public String longDescription;
-    public Uri imageUrl;
-    public Uri secondaryImageUrl;
-    public LatLng location;
-    public String city;
-
-    public Bitmap image;
-    public Bitmap secondaryImage;
-    public String distance;
-
-    public Attraction() {}
-
-    public Attraction(String name, String description, String longDescription, Uri imageUrl,
-                      Uri secondaryImageUrl, LatLng location, String city) {
-        this.name = name;
-        this.description = description;
-        this.longDescription = longDescription;
-        this.imageUrl = imageUrl;
-        this.secondaryImageUrl = secondaryImageUrl;
-        this.location = location;
-        this.city = city;
-    }
-}
\ No newline at end of file
diff --git a/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/java/com/example/android/xyztouristattractions/common/Constants.java b/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/java/com/example/android/xyztouristattractions/common/Constants.java
deleted file mode 100644
index 4d96436..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/java/com/example/android/xyztouristattractions/common/Constants.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.common;
-
-public class Constants {
-
-    private Constants() {};
-
-    // Set to false to have the geofence trigger use the enhanced notifications instead
-    public static final boolean USE_MICRO_APP = true;
-
-    public static final int GOOGLE_API_CLIENT_TIMEOUT_S = 10; // 10 seconds
-    public static final String GOOGLE_API_CLIENT_ERROR_MSG =
-            "Failed to connect to GoogleApiClient (error code = %d)";
-
-    // Used to size the images in the mobile app so they can animate cleanly from list to detail
-    public static final int IMAGE_ANIM_MULTIPLIER = 2;
-
-    // Resize images sent to Wear to 400x400px
-    public static final int WEAR_IMAGE_SIZE = 400;
-
-    // Except images that can be set as a background with parallax, set width 640x instead
-    public static final int WEAR_IMAGE_SIZE_PARALLAX_WIDTH = 640;
-
-    // The minimum bottom inset percent to use on a round screen device
-    public static final float WEAR_ROUND_MIN_INSET_PERCENT = 0.08f;
-
-    // Max # of attractions to show at once
-    public static final int MAX_ATTRACTIONS = 4;
-
-    // Notification IDs
-    public static final int MOBILE_NOTIFICATION_ID = 100;
-    public static final int WEAR_NOTIFICATION_ID = 200;
-
-    // Intent and bundle extras
-    public static final String EXTRA_ATTRACTIONS = "extra_attractions";
-    public static final String EXTRA_ATTRACTIONS_URI = "extra_attractions_uri";
-    public static final String EXTRA_TITLE = "extra_title";
-    public static final String EXTRA_DESCRIPTION = "extra_description";
-    public static final String EXTRA_LOCATION_LAT = "extra_location_lat";
-    public static final String EXTRA_LOCATION_LNG = "extra_location_lng";
-    public static final String EXTRA_DISTANCE = "extra_distance";
-    public static final String EXTRA_CITY = "extra_city";
-    public static final String EXTRA_IMAGE = "extra_image";
-    public static final String EXTRA_IMAGE_SECONDARY = "extra_image_secondary";
-    public static final String EXTRA_TIMESTAMP = "extra_timestamp";
-
-    // Wear Data API paths
-    public static final String ATTRACTION_PATH = "/attraction";
-    public static final String START_PATH = "/start";
-    public static final String START_ATTRACTION_PATH = START_PATH + "/attraction";
-    public static final String START_NAVIGATION_PATH = START_PATH + "/navigation";
-    public static final String CLEAR_NOTIFICATIONS_PATH = "/clear";
-
-    // Maps values
-    public static final String MAPS_INTENT_URI = "geo:0,0?q=";
-    public static final String MAPS_NAVIGATION_INTENT_URI = "google.navigation:mode=w&q=";
-
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/java/com/example/android/xyztouristattractions/common/Utils.java b/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/java/com/example/android/xyztouristattractions/common/Utils.java
deleted file mode 100644
index 70e05bf..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/java/com/example/android/xyztouristattractions/common/Utils.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.common;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.preference.PreferenceManager;
-import android.util.Log;
-import android.view.Display;
-
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.wearable.Asset;
-import com.google.android.gms.wearable.Node;
-import com.google.android.gms.wearable.NodeApi;
-import com.google.android.gms.wearable.Wearable;
-import com.google.maps.android.SphericalUtil;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.text.NumberFormat;
-import java.util.Collection;
-import java.util.HashSet;
-
-/**
- * This class contains shared static utility methods that both the mobile and
- * wearable apps can use.
- */
-public class Utils {
-    private static final String TAG = Utils.class.getSimpleName();
-
-    private static final String PREFERENCES_LAT = "lat";
-    private static final String PREFERENCES_LNG = "lng";
-    private static final String PREFERENCES_GEOFENCE_ENABLED = "geofence";
-    private static final String DISTANCE_KM_POSTFIX = "km";
-    private static final String DISTANCE_M_POSTFIX = "m";
-
-    /**
-     * Calculate distance between two LatLng points and format it nicely for
-     * display. As this is a sample, it only statically supports metric units.
-     * A production app should check locale and support the correct units.
-     */
-    public static String formatDistanceBetween(LatLng point1, LatLng point2) {
-        if (point1 == null || point2 == null) {
-            return null;
-        }
-
-        NumberFormat numberFormat = NumberFormat.getNumberInstance();
-        double distance = Math.round(SphericalUtil.computeDistanceBetween(point1, point2));
-
-        // Adjust to KM if M goes over 1000 (see javadoc of method for note
-        // on only supporting metric)
-        if (distance >= 1000) {
-            numberFormat.setMaximumFractionDigits(1);
-            return numberFormat.format(distance / 1000) + DISTANCE_KM_POSTFIX;
-        }
-        return numberFormat.format(distance) + DISTANCE_M_POSTFIX;
-    }
-
-    /**
-     * Store the location in the app preferences.
-     */
-    public static void storeLocation(Context context, LatLng location) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        SharedPreferences.Editor editor = prefs.edit();
-        editor.putLong(PREFERENCES_LAT, Double.doubleToRawLongBits(location.latitude));
-        editor.putLong(PREFERENCES_LNG, Double.doubleToRawLongBits(location.longitude));
-        editor.apply();
-    }
-
-    /**
-     * Fetch the location from app preferences.
-     */
-    public static LatLng getLocation(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        Long lat = prefs.getLong(PREFERENCES_LAT, Long.MAX_VALUE);
-        Long lng = prefs.getLong(PREFERENCES_LNG, Long.MAX_VALUE);
-        if (lat != Long.MAX_VALUE && lng != Long.MAX_VALUE) {
-            Double latDbl = Double.longBitsToDouble(lat);
-            Double lngDbl = Double.longBitsToDouble(lng);
-            return new LatLng(latDbl, lngDbl);
-        }
-        return null;
-    }
-
-    /**
-     * Store if geofencing triggers will show a notification in app preferences.
-     */
-    public static void storeGeofenceEnabled(Context context, boolean enable) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        SharedPreferences.Editor editor = prefs.edit();
-        editor.putBoolean(PREFERENCES_GEOFENCE_ENABLED, enable);
-        editor.apply();
-    }
-
-    /**
-     * Retrieve if geofencing triggers should show a notification from app preferences.
-     */
-    public static boolean getGeofenceEnabled(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        return prefs.getBoolean(PREFERENCES_GEOFENCE_ENABLED, true);
-    }
-
-    /**
-     * Convert an asset into a bitmap object synchronously. Only call this
-     * method from a background thread (it should never be called from the
-     * main/UI thread as it blocks).
-     */
-    public static Bitmap loadBitmapFromAsset(GoogleApiClient googleApiClient, Asset asset) {
-        if (asset == null) {
-            throw new IllegalArgumentException("Asset must be non-null");
-        }
-        // convert asset into a file descriptor and block until it's ready
-        InputStream assetInputStream = Wearable.DataApi.getFdForAsset(
-                googleApiClient, asset).await().getInputStream();
-
-        if (assetInputStream == null) {
-            Log.w(TAG, "Requested an unknown Asset.");
-            return null;
-        }
-        // decode the stream into a bitmap
-        return BitmapFactory.decodeStream(assetInputStream);
-    }
-
-    /**
-     * Create a wearable asset from a bitmap.
-     */
-    public static Asset createAssetFromBitmap(Bitmap bitmap) {
-        if (bitmap != null) {
-            final ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
-            bitmap.compress(Bitmap.CompressFormat.PNG, 100, byteStream);
-            return Asset.createFromBytes(byteStream.toByteArray());
-        }
-        return null;
-    }
-
-    /**
-     * Get a list of all wearable nodes that are connected synchronously.
-     * Only call this method from a background thread (it should never be
-     * called from the main/UI thread as it blocks).
-     */
-    public static Collection<String> getNodes(GoogleApiClient client) {
-        Collection<String> results= new HashSet<String>();
-        NodeApi.GetConnectedNodesResult nodes =
-                Wearable.NodeApi.getConnectedNodes(client).await();
-        for (Node node : nodes.getNodes()) {
-            results.add(node.getId());
-        }
-        return results;
-    }
-
-    /**
-     * Calculates the square insets on a round device. If the system insets are not set
-     * (set to 0) then the inner square of the circle is applied instead.
-     *
-     * @param display device default display
-     * @param systemInsets the system insets
-     * @return adjusted square insets for use on a round device
-     */
-    public static Rect calculateBottomInsetsOnRoundDevice(Display display, Rect systemInsets) {
-        Point size = new Point();
-        display.getSize(size);
-        int width = size.x + systemInsets.left + systemInsets.right;
-        int height = size.y + systemInsets.top + systemInsets.bottom;
-
-        // Minimum inset to use on a round screen, calculated as a fixed percent of screen height
-        int minInset = (int) (height * Constants.WEAR_ROUND_MIN_INSET_PERCENT);
-
-        // Use system inset if it is larger than min inset, otherwise use min inset
-        int bottomInset = systemInsets.bottom > minInset ? systemInsets.bottom : minInset;
-
-        // Calculate left and right insets based on bottom inset
-        double radius = width / 2;
-        double apothem = radius - bottomInset;
-        double chord = Math.sqrt(Math.pow(radius, 2) - Math.pow(apothem, 2)) * 2;
-        int leftRightInset = (int) ((width - chord) / 2);
-
-        Log.d(TAG, "calculateBottomInsetsOnRoundDevice: " + bottomInset + ", " + leftRightInset);
-
-        return new Rect(leftRightInset, 0, leftRightInset, bottomInset);
-    }
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/res/values/colors.xml b/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/res/values/colors.xml
deleted file mode 100644
index 73c2b6c..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <color name="colorPrimary">#4e6cef</color>
-    <color name="colorPrimaryDark">#2a36b1</color>
-    <color name="colorAccent">#ff7043</color>
-
-</resources>
\ No newline at end of file
diff --git a/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 87ede60..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="show_detail_capability_name">show_details</string>
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/build.gradle b/prebuilts/gradle/XYZTouristAttractions/Wearable/build.gradle
deleted file mode 100644
index 1e5f1b5..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/build.gradle
+++ /dev/null
@@ -1,85 +0,0 @@
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
-    }
-}
-
-apply plugin: 'com.android.application'
-
-
-
-repositories {
-    jcenter()
-}
-
-dependencies {
-    compile 'com.google.android.gms:play-services-location:7.3.0'
-    compile 'com.google.android.gms:play-services-wearable:7.3.0'
-    compile 'com.android.support:support-v13:22.1.0'
-    compile 'com.google.android.support:wearable:1.2.0'
-    compile project(':Shared')
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
-    'main',     // main sample code; look here for the interesting stuff.
-    'common',   // components that are reused by multiple samples
-    'template'] // boilerplate code that is generated by the sample template process
-
-android {
-    compileSdkVersion 22
-
-    buildToolsVersion "22.0.1"
-
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt')
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
-    sourceSets {
-        main {
-            dirs.each { dir ->
-                java.srcDirs "src/${dir}/java"
-                res.srcDirs "src/${dir}/res"
-            }
-        }
-        androidTest.setRoot('tests')
-        androidTest.java.srcDirs = ['tests/src']
-
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/proguard-rules.pro b/prebuilts/gradle/XYZTouristAttractions/Wearable/proguard-rules.pro
deleted file mode 100644
index 0661c7b..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${SDK_DIR}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml
deleted file mode 100644
index 24328b3..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.xyztouristattractions" >
-
-    <uses-feature android:name="android.hardware.type.watch" />
-
-    <uses-sdk
-        android:minSdkVersion="21"
-        android:targetSdkVersion="21" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@android:style/Theme.DeviceDefault" >
-
-        <activity
-            android:name=".ui.AttractionsActivity"
-            android:exported="true"
-            android:allowEmbedded="true"
-            android:taskAffinity=""
-            android:label="@string/app_name" />
-
-        <activity
-            android:name="android.support.wearable.activity.ConfirmationActivity"
-            android:theme="@android:style/Theme.Translucent" />
-
-        <service android:name=".service.ListenerService">
-            <intent-filter>
-                <action android:name="com.google.android.gms.wearable.BIND_LISTENER" />
-            </intent-filter>
-        </service>
-
-        <service android:name=".service.UtilityService" />
-
-        <meta-data android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
-
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/service/ListenerService.java b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/service/ListenerService.java
deleted file mode 100644
index 3908414..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/service/ListenerService.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.service;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.util.Log;
-
-import com.example.android.xyztouristattractions.R;
-import com.example.android.xyztouristattractions.common.Constants;
-import com.example.android.xyztouristattractions.common.Utils;
-import com.example.android.xyztouristattractions.ui.AttractionsActivity;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.common.data.FreezableUtils;
-import com.google.android.gms.wearable.DataEvent;
-import com.google.android.gms.wearable.DataEventBuffer;
-import com.google.android.gms.wearable.DataMap;
-import com.google.android.gms.wearable.DataMapItem;
-import com.google.android.gms.wearable.MessageEvent;
-import com.google.android.gms.wearable.Wearable;
-import com.google.android.gms.wearable.WearableListenerService;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/**
- * A Wear listener service, used to receive inbound messages from
- * other devices.
- */
-public class ListenerService extends WearableListenerService {
-    private static final String TAG = ListenerService.class.getSimpleName();
-
-    @Override
-    public void onDataChanged(DataEventBuffer dataEvents) {
-        Log.d(TAG, "onDataChanged: " + dataEvents);
-
-        final List<DataEvent> events = FreezableUtils.freezeIterable(dataEvents);
-
-        for (DataEvent event : events) {
-            if (event.getType() == DataEvent.TYPE_CHANGED
-                    && event.getDataItem() != null
-                    && Constants.ATTRACTION_PATH.equals(event.getDataItem().getUri().getPath())) {
-
-                DataMapItem dataMapItem = DataMapItem.fromDataItem(event.getDataItem());
-                ArrayList<DataMap> attractionsData =
-                        dataMapItem.getDataMap().getDataMapArrayList(Constants.EXTRA_ATTRACTIONS);
-                showNotification(dataMapItem.getUri(), attractionsData);
-            }
-        }
-    }
-
-    @Override
-    public void onMessageReceived(MessageEvent messageEvent) {
-        Log.v(TAG, "onMessageReceived: " + messageEvent);
-
-        if (Constants.CLEAR_NOTIFICATIONS_PATH.equals(messageEvent.getPath())) {
-            // Clear the local notification
-            UtilityService.clearNotification(this);
-        }
-    }
-
-    private void showNotification(Uri attractionsUri, ArrayList<DataMap> attractions) {
-        GoogleApiClient googleApiClient = new GoogleApiClient.Builder(this)
-                .addApi(Wearable.API)
-                .build();
-
-        ConnectionResult connectionResult = googleApiClient.blockingConnect(
-                Constants.GOOGLE_API_CLIENT_TIMEOUT_S, TimeUnit.SECONDS);
-
-        if (!connectionResult.isSuccess() || !googleApiClient.isConnected()) {
-            Log.e(TAG, String.format(Constants.GOOGLE_API_CLIENT_ERROR_MSG,
-                    connectionResult.getErrorCode()));
-            return;
-        }
-
-        Intent intent = new Intent(this, AttractionsActivity.class);
-        // Pass through the data Uri as an extra
-        intent.putExtra(Constants.EXTRA_ATTRACTIONS_URI, attractionsUri);
-        PendingIntent pendingIntent =
-                PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        int count = attractions.size();
-
-        DataMap attraction = attractions.get(0);
-
-        Bitmap bitmap = Utils.loadBitmapFromAsset(
-                googleApiClient, attraction.getAsset(Constants.EXTRA_IMAGE));
-
-        PendingIntent deletePendingIntent = PendingIntent.getService(
-                this, 0, UtilityService.getClearRemoteNotificationsIntent(this), 0);
-
-        Notification notification = new Notification.Builder(this)
-                .setContentText(getResources().getQuantityString(
-                        R.plurals.attractions_found, count, count))
-                .setSmallIcon(R.mipmap.ic_launcher)
-                .setDeleteIntent(deletePendingIntent)
-                .addAction(R.drawable.ic_full_explore,
-                        getString(R.string.action_explore),
-                        pendingIntent)
-                .extend(new Notification.WearableExtender()
-                        .setBackground(bitmap)
-                )
-                .build();
-
-        NotificationManager notificationManager =
-                (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-        notificationManager.notify(Constants.WEAR_NOTIFICATION_ID, notification);
-
-        googleApiClient.disconnect();
-    }
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java
deleted file mode 100644
index 8a4fea5..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.service;
-
-import android.app.IntentService;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-
-import com.example.android.xyztouristattractions.R;
-import com.example.android.xyztouristattractions.common.Constants;
-import com.example.android.xyztouristattractions.common.Utils;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.wearable.CapabilityApi;
-import com.google.android.gms.wearable.Node;
-import com.google.android.gms.wearable.Wearable;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-/**
- * A utility IntentService, used for a variety of asynchronous background
- * operations that do not necessarily need to be tied to a UI.
- */
-public class UtilityService extends IntentService {
-
-    private static final String TAG = UtilityService.class.getSimpleName();
-
-    private static final String ACTION_CLEAR_NOTIFICATION = "clear_notification";
-    private static final String ACTION_CLEAR_REMOTE_NOTIFICATIONS = "clear_remote_notifications";
-    private static final String ACTION_START_DEVICE_ACTIVITY = "start_device_activity";
-    private static final String EXTRA_START_PATH = "start_path";
-    private static final String EXTRA_START_ACTIVITY_INFO = "start_activity_info";
-    private static final long GET_CAPABILITY_TIMEOUT_S = 10;
-
-    public static void clearNotification(Context context) {
-        Intent intent = new Intent(context, UtilityService.class);
-        intent.setAction(UtilityService.ACTION_CLEAR_NOTIFICATION);
-        context.startService(intent);
-    }
-
-    public static void clearRemoteNotifications(Context context) {
-        context.startService(getClearRemoteNotificationsIntent(context));
-    }
-
-    public static Intent getClearRemoteNotificationsIntent(Context context) {
-        Intent intent = new Intent(context, UtilityService.class);
-        intent.setAction(UtilityService.ACTION_CLEAR_REMOTE_NOTIFICATIONS);
-        return intent;
-    }
-
-    /**
-     * Trigger a message that asks the master device to start an activity.
-     *
-     * @param context the context
-     * @param path the path that will be sent via the wearable message API
-     * @param name the tourist attraction name
-     * @param city the tourist attraction city
-     */
-    public static void startDeviceActivity(Context context, String path, String name, String city) {
-        Intent intent = new Intent(context, UtilityService.class);
-        intent.setAction(UtilityService.ACTION_START_DEVICE_ACTIVITY);
-        String extraInfo;
-        if (Constants.START_ATTRACTION_PATH.equals(path)) {
-            extraInfo = name;
-        } else {
-            extraInfo = name + ", " + city;
-        }
-        intent.putExtra(EXTRA_START_ACTIVITY_INFO, extraInfo);
-        intent.putExtra(EXTRA_START_PATH, path);
-        context.startService(intent);
-    }
-
-    public UtilityService() {
-        super(TAG);
-    }
-
-    @Override
-    protected void onHandleIntent(Intent intent) {
-        String action = intent != null ? intent.getAction() : null;
-        if (ACTION_CLEAR_NOTIFICATION.equals(action)) {
-            clearNotificationInternal();
-        } else if (ACTION_CLEAR_REMOTE_NOTIFICATIONS.equals(action)) {
-            clearRemoteNotificationsInternal();
-        } else if (ACTION_START_DEVICE_ACTIVITY.equals(action)) {
-            startDeviceActivityInternal(intent.getStringExtra(EXTRA_START_PATH),
-                    intent.getStringExtra(EXTRA_START_ACTIVITY_INFO));
-        }
-    }
-
-    /**
-     * Clear the local notifications
-     */
-    private void clearNotificationInternal() {
-        NotificationManager notificationManager =
-                (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-        notificationManager.cancel(Constants.WEAR_NOTIFICATION_ID);
-    }
-
-    /**
-     * Trigger a message to ask other devices to clear their notifications
-     */
-    private void clearRemoteNotificationsInternal() {
-        GoogleApiClient googleApiClient = new GoogleApiClient.Builder(this)
-                .addApi(Wearable.API)
-                .build();
-
-        ConnectionResult connectionResult = googleApiClient.blockingConnect(
-                Constants.GOOGLE_API_CLIENT_TIMEOUT_S, TimeUnit.SECONDS);
-
-        if (connectionResult.isSuccess() && googleApiClient.isConnected()) {
-            Iterator<String> itr = Utils.getNodes(googleApiClient).iterator();
-            while (itr.hasNext()) {
-                // Loop through all connected nodes
-                Wearable.MessageApi.sendMessage(
-                        googleApiClient, itr.next(), Constants.CLEAR_NOTIFICATIONS_PATH, null);
-            }
-        }
-
-        googleApiClient.disconnect();
-    }
-
-    /**
-     * Sends the actual message to ask other devices that are capable of showing "details" to start
-     * the appropriate activity
-     *
-     * @param path the path to pass to the wearable message API
-     * @param extraInfo extra info that varies based on the path being sent
-     */
-    private void startDeviceActivityInternal(String path, String extraInfo) {
-        GoogleApiClient googleApiClient = new GoogleApiClient.Builder(this)
-                .addApi(Wearable.API)
-                .build();
-
-        ConnectionResult connectionResult = googleApiClient.blockingConnect(
-                Constants.GOOGLE_API_CLIENT_TIMEOUT_S, TimeUnit.SECONDS);
-
-        if (connectionResult.isSuccess() && googleApiClient.isConnected()) {
-            CapabilityApi.GetCapabilityResult result = Wearable.CapabilityApi.getCapability(
-                    googleApiClient,
-                    getApplicationContext().getString(R.string.show_detail_capability_name),
-                    CapabilityApi.FILTER_REACHABLE)
-                    .await(GET_CAPABILITY_TIMEOUT_S, TimeUnit.SECONDS);
-            if (result.getStatus().isSuccess()) {
-                Set<Node> nodes = result.getCapability().getNodes();
-                for (Node node : nodes) {
-                    Wearable.MessageApi.sendMessage(
-                            googleApiClient, node.getId(), path, extraInfo.getBytes());
-                }
-            } else {
-                Log.e(TAG, "startDeviceActivityInternal() Failed to get capabilities, status: "
-                        + result.getStatus().getStatusMessage());
-            }
-
-            googleApiClient.disconnect();
-        }
-    }
-
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsActivity.java b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsActivity.java
deleted file mode 100644
index 64d28bc..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsActivity.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.ui;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Rect;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.support.v4.view.GestureDetectorCompat;
-import android.support.wearable.view.DismissOverlayView;
-import android.support.wearable.view.DotsPageIndicator;
-import android.support.wearable.view.GridViewPager;
-import android.util.Log;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.WindowInsets;
-import android.widget.FrameLayout;
-import android.widget.ProgressBar;
-
-import com.example.android.xyztouristattractions.R;
-import com.example.android.xyztouristattractions.common.Attraction;
-import com.example.android.xyztouristattractions.common.Constants;
-import com.example.android.xyztouristattractions.common.Utils;
-import com.example.android.xyztouristattractions.service.UtilityService;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.wearable.DataApi;
-import com.google.android.gms.wearable.DataMap;
-import com.google.android.gms.wearable.DataMapItem;
-import com.google.android.gms.wearable.Wearable;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/**
- * The main Wear activity that displays nearby attractions in a
- * {@link android.support.wearable.view.GridViewPager}. Each row shows
- * one attraction and each column shows information or actions for that
- * particular attraction.
- */
-public class AttractionsActivity extends Activity
-        implements AttractionsGridPagerAdapter.OnChromeFadeListener {
-    private static final String TAG = AttractionsActivity.class.getSimpleName();
-
-    private GestureDetectorCompat mGestureDetector;
-    private DismissOverlayView mDismissOverlayView;
-    private GridViewPager mGridViewPager;
-    private AttractionsGridPagerAdapter mAdapter;
-    private DotsPageIndicator mDotsPageIndicator;
-    private ProgressBar mProgressBar;
-    private Rect mInsets = new Rect(0, 0, 0, 0);
-
-    private ArrayList<Attraction> mAttractions = new ArrayList<Attraction>();
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_main);
-        final FrameLayout topFrameLayout = (FrameLayout) findViewById(R.id.topFrameLayout);
-        mProgressBar = (ProgressBar) findViewById(R.id.progressBar);
-        mGridViewPager = (GridViewPager) findViewById(R.id.gridViewPager);
-        mDotsPageIndicator = (DotsPageIndicator) findViewById(R.id.dotsPageIndicator);
-        mAdapter = new AttractionsGridPagerAdapter(this, mAttractions);
-        mAdapter.setOnChromeFadeListener(this);
-        mGridViewPager.setAdapter(mAdapter);
-        mDotsPageIndicator.setPager(mGridViewPager);
-        mDotsPageIndicator.setOnPageChangeListener(mAdapter);
-
-        topFrameLayout.setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() {
-            @Override
-            public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
-                // Call through to super implementation
-                insets = topFrameLayout.onApplyWindowInsets(insets);
-
-                boolean round = insets.isRound();
-
-                // Store system window insets regardless of screen shape
-                mInsets.set(insets.getSystemWindowInsetLeft(),
-                        insets.getSystemWindowInsetTop(),
-                        insets.getSystemWindowInsetRight(),
-                        insets.getSystemWindowInsetBottom());
-
-                if (round) {
-                    // On a round screen calculate the square inset to use.
-                    // Alternatively could use BoxInsetLayout, although calculating
-                    // the inset ourselves lets us position views outside the center
-                    // box. For example, slightly lower on the round screen (by giving
-                    // up some horizontal space).
-                    mInsets = Utils.calculateBottomInsetsOnRoundDevice(
-                            getWindowManager().getDefaultDisplay(), mInsets);
-
-                    // Boost the dots indicator up by the bottom inset
-                    FrameLayout.LayoutParams params =
-                            (FrameLayout.LayoutParams) mDotsPageIndicator.getLayoutParams();
-                    params.bottomMargin = mInsets.bottom;
-                    mDotsPageIndicator.setLayoutParams(params);
-                }
-
-                mAdapter.setInsets(mInsets);
-                return insets;
-            }
-        });
-
-        // Set up the DismissOverlayView
-        mDismissOverlayView = (DismissOverlayView) findViewById(R.id.dismiss_overlay);
-        mDismissOverlayView.setIntroText(getString(R.string.exit_intro_text));
-        mDismissOverlayView.showIntroIfNecessary();
-        mGestureDetector = new GestureDetectorCompat(this, new LongPressListener());
-
-        Uri attractionsUri = getIntent().getParcelableExtra(Constants.EXTRA_ATTRACTIONS_URI);
-        if (attractionsUri != null) {
-            new FetchDataAsyncTask(this).execute(attractionsUri);
-            UtilityService.clearNotification(this);
-            UtilityService.clearRemoteNotifications(this);
-        } else {
-            finish();
-        }
-    }
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent event) {
-        return mGestureDetector.onTouchEvent(event) || super.dispatchTouchEvent(event);
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        return mGestureDetector.onTouchEvent(event) || super.onTouchEvent(event);
-    }
-
-    @Override
-    public void onChromeFadeIn() {
-        // As the custom UI chrome fades in, also fade the DotsPageIndicator in
-        mDotsPageIndicator.animate().alpha(1).setDuration(
-                AttractionsGridPagerAdapter.FADE_IN_TIME_MS).start();
-    }
-
-    @Override
-    public void onChromeFadeOut() {
-        // As the custom UI chrome fades out, also fade the DotsPageIndicator out
-        mDotsPageIndicator.animate().alpha(0).setDuration(
-                AttractionsGridPagerAdapter.FADE_OUT_TIME_MS).start();
-    }
-
-    private class LongPressListener extends GestureDetector.SimpleOnGestureListener {
-        @Override
-        public void onLongPress(MotionEvent event) {
-            mDismissOverlayView.show();
-        }
-    }
-
-    /**
-     * A background task to load the attraction data via the Wear DataApi.
-     * This can take a second or two sometimes as several images need to
-     * be loaded.
-     */
-    private class FetchDataAsyncTask extends
-            AsyncTask<Uri, Void, ArrayList<Attraction>> {
-
-        private Context mContext;
-
-        public FetchDataAsyncTask(Context context) {
-            mContext = context;
-        }
-
-        @Override
-        protected ArrayList<Attraction> doInBackground(Uri... params) {
-            mAttractions.clear();
-
-            // Connect to Play Services and the Wearable API
-            GoogleApiClient googleApiClient = new GoogleApiClient.Builder(mContext)
-                    .addApi(Wearable.API)
-                    .build();
-
-            ConnectionResult connectionResult = googleApiClient.blockingConnect(
-                    Constants.GOOGLE_API_CLIENT_TIMEOUT_S, TimeUnit.SECONDS);
-
-            if (!connectionResult.isSuccess() || !googleApiClient.isConnected()) {
-                Log.e(TAG, String.format(Constants.GOOGLE_API_CLIENT_ERROR_MSG,
-                        connectionResult.getErrorCode()));
-                return null;
-            }
-
-            Uri attractionsUri = params[0];
-            DataApi.DataItemResult dataItemResult =
-                    Wearable.DataApi.getDataItem(googleApiClient, attractionsUri).await();
-
-            if (dataItemResult.getStatus().isSuccess() && dataItemResult.getDataItem() != null) {
-                DataMapItem dataMapItem = DataMapItem.fromDataItem(dataItemResult.getDataItem());
-                List<DataMap> attractionsData =
-                        dataMapItem.getDataMap().getDataMapArrayList(Constants.EXTRA_ATTRACTIONS);
-
-                // Loop through each attraction, adding them to the list
-                Iterator<DataMap> itr = attractionsData.iterator();
-                while (itr.hasNext()) {
-                    DataMap attractionData = itr.next();
-
-                    Attraction attraction = new Attraction();
-                    attraction.name = attractionData.getString(Constants.EXTRA_TITLE);
-                    attraction.description =
-                            attractionData.getString(Constants.EXTRA_DESCRIPTION);
-                    attraction.city = attractionData.get(Constants.EXTRA_CITY);
-                    attraction.distance =
-                            attractionData.getString(Constants.EXTRA_DISTANCE);
-                    attraction.location = new LatLng(
-                            attractionData.getDouble(Constants.EXTRA_LOCATION_LAT),
-                            attractionData.getDouble(Constants.EXTRA_LOCATION_LNG));
-                    attraction.image = Utils.loadBitmapFromAsset(googleApiClient,
-                            attractionData.getAsset(Constants.EXTRA_IMAGE));
-                    attraction.secondaryImage = Utils.loadBitmapFromAsset(googleApiClient,
-                            attractionData.getAsset(Constants.EXTRA_IMAGE_SECONDARY));
-
-                    mAttractions.add(attraction);
-                }
-            }
-
-            googleApiClient.disconnect();
-
-            return mAttractions;
-        }
-
-        @Override
-        protected void onPostExecute(ArrayList<Attraction> result) {
-            if (result != null && result.size() > 0) {
-                // Update UI based on the result of the background processing
-                mAdapter.setData(result);
-                mAdapter.notifyDataSetChanged();
-                mProgressBar.setVisibility(View.GONE);
-                mDotsPageIndicator.setVisibility(View.VISIBLE);
-                mGridViewPager.setVisibility(View.VISIBLE);
-            } else {
-                finish();
-            }
-        }
-    }
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsGridPagerAdapter.java b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsGridPagerAdapter.java
deleted file mode 100644
index 97accde..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsGridPagerAdapter.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.xyztouristattractions.ui;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.support.wearable.activity.ConfirmationActivity;
-import android.support.wearable.view.ActionPage;
-import android.support.wearable.view.CardFrame;
-import android.support.wearable.view.CardScrollView;
-import android.support.wearable.view.GridPagerAdapter;
-import android.support.wearable.view.GridViewPager;
-import android.text.TextUtils;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.example.android.xyztouristattractions.R;
-import com.example.android.xyztouristattractions.common.Attraction;
-import com.example.android.xyztouristattractions.common.Constants;
-import com.example.android.xyztouristattractions.service.UtilityService;
-
-import java.util.ArrayList;
-
-/**
- * This adapter backs the main GridViewPager component found in
- * {@link com.example.android.xyztouristattractions.ui.AttractionsActivity}.
- */
-public class AttractionsGridPagerAdapter extends GridPagerAdapter
-        implements GridViewPager.OnPageChangeListener {
-
-    public static final int FADE_IN_TIME_MS = 250;
-    public static final int FADE_OUT_TIME_MS = 500;
-    private static final int GRID_COLUMN_COUNT = 5;
-    private static final int FADE_OUT_DELAY_MS = 1500;
-    private static final int PAGER_PRIMARY_IMAGE_COLUMN = 0;
-    private static final int PAGER_SECONDARY_IMAGE_COLUMN = 1;
-    private static final int PAGER_DESCRIPTION_COLUMN = 2;
-    private static final int PAGER_NAVIGATE_ACTION_COLUMN = 3;
-    private static final int PAGER_OPEN_ACTION_COLUMN = 4;
-
-    private Context mContext;
-    private LayoutInflater mLayoutInflater;
-    private ArrayList<Attraction> mAttractions;
-    private Rect mInsets = new Rect();
-    private DelayedHide mDelayedHide = new DelayedHide();
-    private OnChromeFadeListener mOnChromeFadeListener;
-
-    public AttractionsGridPagerAdapter(
-            Context context, ArrayList<Attraction> attractions) {
-        super();
-        mContext = context;
-        mLayoutInflater = LayoutInflater.from(context);
-        mAttractions = attractions;
-    }
-
-    public void setData(ArrayList<Attraction> attractions) {
-        mAttractions = attractions;
-    }
-
-    public void setInsets(Rect insets) {
-        mInsets = insets;
-    }
-
-    @Override
-    public int getRowCount() {
-        return (mAttractions != null && mAttractions.size() > 0) ? mAttractions.size() : 1;
-    }
-
-    @Override
-    public int getColumnCount(int i) {
-        return GRID_COLUMN_COUNT;
-    }
-
-    @Override
-    public Object instantiateItem(ViewGroup container, int row, final int column) {
-        if (mAttractions != null && mAttractions.size() > 0) {
-            final Attraction attraction = mAttractions.get(row);
-            switch (column) {
-                case PAGER_PRIMARY_IMAGE_COLUMN:
-                case PAGER_SECONDARY_IMAGE_COLUMN:
-                    // Two pages of full screen images, one with the attraction name
-                    // and one with the distance to the attraction
-                    final View view = mLayoutInflater.inflate(
-                            R.layout.gridpager_fullscreen_image, container, false);
-                    ImageView imageView = (ImageView) view.findViewById(R.id.imageView);
-                    TextView textView = (TextView) view.findViewById(R.id.textView);
-                    FrameLayout overlayTextLayout =
-                            (FrameLayout) view.findViewById(R.id.overlaytext);
-
-                    mDelayedHide.add(overlayTextLayout);
-                    view.setOnClickListener(mDelayedHide);
-
-                    FrameLayout.LayoutParams params =
-                            (FrameLayout.LayoutParams) textView.getLayoutParams();
-                    params.bottomMargin = params.bottomMargin + mInsets.bottom;
-                    params.leftMargin = mInsets.left;
-                    params.rightMargin = mInsets.right;
-                    textView.setLayoutParams(params);
-
-                    if (column == PAGER_PRIMARY_IMAGE_COLUMN) {
-                        imageView.setImageBitmap(attraction.image);
-                        textView.setText(attraction.name);
-                    } else {
-                        imageView.setImageBitmap(attraction.secondaryImage);
-                        if (TextUtils.isEmpty(attraction.distance)) {
-                            overlayTextLayout.setVisibility(View.GONE);
-                        } else {
-                            textView.setText(mContext.getString(
-                                    R.string.map_caption, attraction.distance));
-                        }
-                    }
-                    container.addView(view);
-                    return view;
-                case PAGER_DESCRIPTION_COLUMN:
-                    // The description card page
-                    CardScrollView cardScrollView = (CardScrollView) mLayoutInflater.inflate(
-                            R.layout.gridpager_card, container, false);
-                    TextView descTextView = (TextView) cardScrollView.findViewById(R.id.textView);
-                    descTextView.setText(attraction.description);
-                    cardScrollView.setCardGravity(Gravity.BOTTOM);
-                    cardScrollView.setExpansionEnabled(true);
-                    cardScrollView.setExpansionDirection(CardFrame.EXPAND_DOWN);
-                    cardScrollView.setExpansionFactor(10);
-                    container.addView(cardScrollView);
-                    return cardScrollView;
-                case PAGER_NAVIGATE_ACTION_COLUMN:
-                    // The navigate action
-                    final ActionPage navActionPage = (ActionPage) mLayoutInflater.inflate(
-                            R.layout.gridpager_action, container, false);
-
-                    navActionPage.setOnClickListener(getStartActionClickListener(
-                            attraction, Constants.START_NAVIGATION_PATH,
-                            ConfirmationActivity.SUCCESS_ANIMATION));
-                    navActionPage.setImageResource(R.drawable.ic_full_directions_walking);
-                    navActionPage.setText(mContext.getString(R.string.action_navigate));
-
-                    container.addView(navActionPage);
-                    return navActionPage;
-                case PAGER_OPEN_ACTION_COLUMN:
-                    // The "open on device" action
-                    final ActionPage openActionPage = (ActionPage) mLayoutInflater.inflate(
-                            R.layout.gridpager_action, container, false);
-
-                    openActionPage.setOnClickListener(getStartActionClickListener(
-                            attraction, Constants.START_ATTRACTION_PATH,
-                            ConfirmationActivity.OPEN_ON_PHONE_ANIMATION));
-                    openActionPage.setImageResource(R.drawable.ic_full_openonphone);
-                    openActionPage.setText(mContext.getString(R.string.action_open));
-
-                    container.addView(openActionPage);
-                    return openActionPage;
-            }
-        }
-        return new View(mContext);
-    }
-
-    @Override
-    public Drawable getBackgroundForPage(int row, int column) {
-        if (column == 0) {
-            return new ColorDrawable(0); // Empty black drawable
-        }
-        if (mAttractions.size() > 0 && mAttractions.get(row).image != null) {
-            return new BitmapDrawable(mContext.getResources(), mAttractions.get(row).image);
-        }
-        return super.getBackgroundForPage(row, column);
-    }
-
-    @Override
-    public void destroyItem(ViewGroup viewGroup, int row, int column, Object object) {
-        mDelayedHide.remove((View) object);
-        viewGroup.removeView((View)object);
-    }
-
-    @Override
-    public boolean isViewFromObject(View view, Object object) {
-        return view == object;
-    }
-
-    @Override
-    public void onPageScrolled(int posX, int posY, float posOffsetX, float posOffsetY,
-                               int posOffsetPixelsX, int posOffsetPixelsY) {}
-
-    @Override
-    public void onPageSelected(int row, int col) {}
-
-    @Override
-    public void onPageScrollStateChanged(int state) {
-        mDelayedHide.show();
-    }
-
-    /**
-     * Use the Wear Message API to execute an action. Clears local and remote notifications and
-     * also runs a confirmation animation before finishing the Wear activity.
-     *
-     * @param attraction The attraction to start the action on
-     * @param pathName The Wear Message API pathname
-     * @param confirmAnimationType The confirmation animation type from ConfirmationActivity
-     */
-    private void startAction(Attraction attraction, String pathName, int confirmAnimationType) {
-        Intent intent = new Intent(mContext, ConfirmationActivity.class);
-        intent.putExtra(ConfirmationActivity.EXTRA_ANIMATION_TYPE, confirmAnimationType);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
-        mContext.startActivity(intent);
-
-        UtilityService.clearNotification(mContext);
-        UtilityService.clearRemoteNotifications(mContext);
-        UtilityService.startDeviceActivity(mContext, pathName, attraction.name, attraction.city);
-
-        ((Activity)mContext).finish();
-    }
-
-    /**
-     * Helper method to generate the OnClickListener for the attraction actions.
-     */
-    private View.OnClickListener getStartActionClickListener(final Attraction attraction,
-            final String pathName, final int confirmAnimationType) {
-        View.OnClickListener clickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startAction(attraction, pathName, confirmAnimationType);
-            }
-        };
-        return clickListener;
-    }
-
-    public void setOnChromeFadeListener(OnChromeFadeListener listener) {
-        mOnChromeFadeListener = listener;
-    }
-
-    public interface OnChromeFadeListener {
-        void onChromeFadeIn();
-        void onChromeFadeOut();
-    }
-
-    /**
-     * Helper class to fade out views based on a delay and fade them back in if needed as well.
-     */
-    private class DelayedHide implements View.OnClickListener {
-
-        ArrayList<View> hideViews = new ArrayList<View>(GRID_COLUMN_COUNT);
-        Handler mHideHandler = new Handler();
-        boolean mIsHidden = false;
-
-        Runnable mHideRunnable = new Runnable() {
-            @Override
-            public void run() {
-                hide();
-            }
-        };
-
-        void add(View newView) {
-            hideViews.add(newView);
-            delayedHide();
-        }
-
-        void remove(View removeView) {
-            hideViews.remove(removeView);
-        }
-
-        void show() {
-            mIsHidden = false;
-            if (mOnChromeFadeListener != null) {
-                mOnChromeFadeListener.onChromeFadeIn();
-            }
-            for (View view : hideViews) {
-                if (view != null) {
-                    view.animate().alpha(1).setDuration(FADE_IN_TIME_MS).start();
-                }
-            }
-            delayedHide();
-        }
-
-        void hide() {
-            mIsHidden = true;
-            mHideHandler.removeCallbacks(mHideRunnable);
-            if (mOnChromeFadeListener != null) {
-                mOnChromeFadeListener.onChromeFadeOut();
-            }
-            for (int i=0; i<hideViews.size(); i++) {
-                if (hideViews.get(i) != null) {
-                    hideViews.get(i).animate().alpha(0).setDuration(FADE_OUT_TIME_MS).start();
-                }
-            }
-        }
-
-        void delayedHide() {
-            mHideHandler.removeCallbacks(mHideRunnable);
-            mHideHandler.postDelayed(mHideRunnable, FADE_OUT_DELAY_MS);
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (mIsHidden) {
-                show();
-            } else {
-                hide();
-            }
-        }
-    }
-}
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-hdpi/ic_full_directions_walking.png b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-hdpi/ic_full_directions_walking.png
deleted file mode 100644
index fdf7888..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-hdpi/ic_full_directions_walking.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-hdpi/ic_full_explore.png b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-hdpi/ic_full_explore.png
deleted file mode 100644
index 30353ef..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-hdpi/ic_full_explore.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-hdpi/ic_full_openonphone.png b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-hdpi/ic_full_openonphone.png
deleted file mode 100644
index 8952486..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-hdpi/ic_full_openonphone.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-xhdpi/ic_full_directions_walking.png b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-xhdpi/ic_full_directions_walking.png
deleted file mode 100644
index d61f241..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-xhdpi/ic_full_directions_walking.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-xhdpi/ic_full_explore.png b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-xhdpi/ic_full_explore.png
deleted file mode 100644
index 57b85ae..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-xhdpi/ic_full_explore.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-xhdpi/ic_full_openonphone.png b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-xhdpi/ic_full_openonphone.png
deleted file mode 100644
index d10a19c..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/drawable-xhdpi/ic_full_openonphone.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/layout/activity_main.xml b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 27fce1f..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/topFrameLayout">
-
-    <ProgressBar
-        android:id="@+id/progressBar"
-        android:layout_gravity="center"
-        android:indeterminate="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <android.support.wearable.view.GridViewPager
-        android:id="@+id/gridViewPager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone" />
-
-    <android.support.wearable.view.DotsPageIndicator
-        android:id="@+id/dotsPageIndicator"
-        android:layout_gravity="center_horizontal|bottom"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        app:dotFadeWhenIdle="false"
-        android:visibility="gone" />
-
-    <android.support.wearable.view.DismissOverlayView
-        android:id="@+id/dismiss_overlay"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</FrameLayout>
-
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_action.xml b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_action.xml
deleted file mode 100644
index ac01509..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_action.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<android.support.wearable.view.ActionPage
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/actionpage"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:src="@drawable/ic_full_openonphone"
-    android:text="@string/action_open"
-    android:maxLines="1"
-    android:color="@color/colorPrimary"
-    app:rippleColor="@color/colorAccent" />
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_card.xml b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_card.xml
deleted file mode 100644
index 4b5f463..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_card.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<android.support.wearable.view.CardScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipToPadding="false"
-    android:paddingBottom="@dimen/indicator_margin">
-
-    <android.support.wearable.view.CardFrame
-        android:id="@+id/cardFrame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <TextView
-            android:id="@+id/textView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/CardFontStyle"
-            tools:text="Sample Text" />
-
-    </android.support.wearable.view.CardFrame>
-
-</android.support.wearable.view.CardScrollView>
\ No newline at end of file
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_fullscreen_image.xml b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_fullscreen_image.xml
deleted file mode 100644
index e70bcc8..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_fullscreen_image.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
-
-    <FrameLayout
-        android:id="@+id/overlaytext"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:background="#66000000">
-
-        <TextView
-            android:id="@+id/textView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            style="@style/PagerTitleStyle"
-            android:maxLines="2"
-            android:layout_marginBottom="@dimen/indicator_margin"
-            tools:text="Sample Text" />
-
-    </FrameLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/mipmap-hdpi/ic_launcher.png b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100755
index d159cbe..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/mipmap-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/mipmap-xhdpi/ic_launcher.png b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100755
index cc42dd2..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/values/dimens.xml b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/values/dimens.xml
deleted file mode 100644
index b07a27e..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <dimen name="standard_margin">4dp</dimen>
-    <dimen name="card_margin">8dp</dimen>
-    <dimen name="indicator_margin">12dp</dimen>
-
-    <dimen name="page_row_margin">50dp</dimen>
-    <dimen name="page_column_margin">50dp</dimen>
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/values/strings.xml b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/values/strings.xml
deleted file mode 100644
index 2b265a3..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <string name="app_name">XYZ Tourist Attractions</string>
-    <string name="action_explore">Explore</string>
-    <string name="action_navigate">Start walking navigation</string>
-    <string name="action_open">Open on phone</string>
-    <string name="exit_intro_text">Long-press anywhere to exit</string>
-    <string name="map_caption">%s away</string>
-
-    <plurals name="attractions_found">
-        <item quantity="one">One tourist attraction nearby!</item>
-        <item quantity="other">%d tourist attractions nearby!</item>
-    </plurals>
-
-</resources>
diff --git a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/values/styles.xml b/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/values/styles.xml
deleted file mode 100644
index 11b2d3d..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/Wearable/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-  Copyright 2015 Google Inc. All rights reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <style name="CardFontStyle" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">#434343</item>
-        <item name="android:fontFamily">sans-serif-condensed-light</item>
-        <item name="android:textSize">18sp</item>
-        <item name="android:padding">@dimen/card_margin</item>
-    </style>
-
-    <style name="PagerTitleStyle" parent="@android:style/TextAppearance.Large">
-        <item name="android:fontFamily">sans-serif-condensed-light</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textSize">22sp</item>
-        <item name="android:maxLines">2</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/prebuilts/gradle/XYZTouristAttractions/build.gradle b/prebuilts/gradle/XYZTouristAttractions/build.gradle
deleted file mode 100644
index 1dac6de..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/build.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/XYZTouristAttractions/gradle/wrapper/gradle-wrapper.jar b/prebuilts/gradle/XYZTouristAttractions/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/XYZTouristAttractions/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 7d3b483..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Dec 22 11:24:44 EST 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/prebuilts/gradle/XYZTouristAttractions/gradlew b/prebuilts/gradle/XYZTouristAttractions/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/gradlew
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/prebuilts/gradle/XYZTouristAttractions/gradlew.bat b/prebuilts/gradle/XYZTouristAttractions/gradlew.bat
deleted file mode 100644
index aec9973..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off

-@rem ##########################################################################

-@rem

-@rem  Gradle startup script for Windows

-@rem

-@rem ##########################################################################

-

-@rem Set local scope for the variables with windows NT shell

-if "%OS%"=="Windows_NT" setlocal

-

-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

-set DEFAULT_JVM_OPTS=

-

-set DIRNAME=%~dp0

-if "%DIRNAME%" == "" set DIRNAME=.

-set APP_BASE_NAME=%~n0

-set APP_HOME=%DIRNAME%

-

-@rem Find java.exe

-if defined JAVA_HOME goto findJavaFromJavaHome

-

-set JAVA_EXE=java.exe

-%JAVA_EXE% -version >NUL 2>&1

-if "%ERRORLEVEL%" == "0" goto init

-

-echo.

-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

-echo.

-echo Please set the JAVA_HOME variable in your environment to match the

-echo location of your Java installation.

-

-goto fail

-

-:findJavaFromJavaHome

-set JAVA_HOME=%JAVA_HOME:"=%

-set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-

-if exist "%JAVA_EXE%" goto init

-

-echo.

-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%

-echo.

-echo Please set the JAVA_HOME variable in your environment to match the

-echo location of your Java installation.

-

-goto fail

-

-:init

-@rem Get command-line arguments, handling Windowz variants

-

-if not "%OS%" == "Windows_NT" goto win9xME_args

-if "%@eval[2+2]" == "4" goto 4NT_args

-

-:win9xME_args

-@rem Slurp the command line arguments.

-set CMD_LINE_ARGS=

-set _SKIP=2

-

-:win9xME_args_slurp

-if "x%~1" == "x" goto execute

-

-set CMD_LINE_ARGS=%*

-goto execute

-

-:4NT_args

-@rem Get arguments from the 4NT Shell from JP Software

-set CMD_LINE_ARGS=%$

-

-:execute

-@rem Setup the command line

-

-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

-

-@rem Execute Gradle

-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

-

-:end

-@rem End local scope for the variables with windows NT shell

-if "%ERRORLEVEL%"=="0" goto mainEnd

-

-:fail

-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of

-rem the _cmd.exe /c_ return code!

-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1

-exit /b 1

-

-:mainEnd

-if "%OS%"=="Windows_NT" endlocal

-

-:omega

diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/composite-1-hires.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/composite-1-hires.png
deleted file mode 100644
index 6facbfe..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/composite-1-hires.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/composite-1.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/composite-1.png
deleted file mode 100644
index c66df32..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/composite-1.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/icon-web.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/icon-web.png
deleted file mode 100755
index 122bea1..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/icon-web.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/mobile-1-list-unframed.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/mobile-1-list-unframed.png
deleted file mode 100644
index db88dc3..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/mobile-1-list-unframed.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/mobile-1-list.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/mobile-1-list.png
deleted file mode 100644
index 6a2f777..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/mobile-1-list.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/mobile-2-detail-unframed.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/mobile-2-detail-unframed.png
deleted file mode 100644
index 088c756..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/mobile-2-detail-unframed.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/mobile-2-detail.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/mobile-2-detail.png
deleted file mode 100644
index dc70ee6..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/mobile-2-detail.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-1-unframed.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-1-unframed.png
deleted file mode 100644
index 4dede5c..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-1-unframed.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-1.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-1.png
deleted file mode 100644
index 49bd581..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-1.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-2-unframed.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-2-unframed.png
deleted file mode 100644
index 85e8492..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-2-unframed.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-2.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-2.png
deleted file mode 100644
index 7c166e7..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-2.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-3-unframed.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-3-unframed.png
deleted file mode 100644
index 4542f1f..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-3-unframed.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-3.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-3.png
deleted file mode 100644
index b294efe..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-3.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-4-unframed.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-4-unframed.png
deleted file mode 100644
index b866186..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-4-unframed.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-4.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-4.png
deleted file mode 100644
index bcc3ff3..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-4.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-5-unframed.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-5-unframed.png
deleted file mode 100644
index df82ae0..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-5-unframed.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-5.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-5.png
deleted file mode 100644
index d3cd76d..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-5.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-6-unframed.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-6-unframed.png
deleted file mode 100644
index 31f271c..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-6-unframed.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-6.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-6.png
deleted file mode 100644
index ecbaf57..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-round-6.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-1-unframed.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-1-unframed.png
deleted file mode 100644
index c816f77..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-1-unframed.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-1.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-1.png
deleted file mode 100644
index 24e5534..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-1.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-2-unframed.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-2-unframed.png
deleted file mode 100644
index d549151..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-2-unframed.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-2.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-2.png
deleted file mode 100644
index a7d72c5..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-2.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-3-unframed.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-3-unframed.png
deleted file mode 100644
index 2c252e6..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-3-unframed.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-3.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-3.png
deleted file mode 100644
index b0ead30..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-3.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-4-unframed.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-4-unframed.png
deleted file mode 100644
index c4ed121..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-4-unframed.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-4.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-4.png
deleted file mode 100644
index d3a35aa..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-4.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-5-unframed.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-5-unframed.png
deleted file mode 100644
index 1bfcd1d..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-5-unframed.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-5.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-5.png
deleted file mode 100644
index 56acaa4..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-5.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-6-unframed.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-6-unframed.png
deleted file mode 100644
index aa5127f..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-6-unframed.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-6.png b/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-6.png
deleted file mode 100644
index 3bda193..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/screenshots/wear-square-6.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/XYZTouristAttractions/settings.gradle b/prebuilts/gradle/XYZTouristAttractions/settings.gradle
deleted file mode 100644
index 8c3a205..0000000
--- a/prebuilts/gradle/XYZTouristAttractions/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-
-include ':Application', ':Wearable', ':Shared'