Merge tag 'android-7.1.1_r4' into cm-14.1cm-14.1_prerebase

Android 7.1.1 release 4

# gpg: Signature made Thu Dec  1 13:06:51 2016 CST
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key

268 files changed, 10847 insertions, 630 deletions

diff --git a/apps/Development/res/layout/development_settings.xml b/apps/Development/res/layout/development_settings.xml
deleted file mode 100644
index e9b1dad5d..000000000
--- a/apps/Development/res/layout/development_settings.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/assets/res/any/layout/keyboard_version.xml
-**
-** Copyright 2006, 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.
-*/
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout 
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <TextView android:id="@+id/debug_app_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_debug_app_label_text" />
-
-        <Button android:id="@+id/debug_app"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/debug_app_label"
-            android:layout_alignParentLeft="true"
-            android:layout_toRightOf="@id/debug_app_label" />
-
-        <!-- android:visibility="gone" -->
-                
-        <CheckBox android:id="@+id/wait_for_debugger"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/debug_app"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_wait_for_debugger_text" />
-
-        <View android:id="@+id/separator"
-            android:layout_width="8dip"
-            android:layout_height="8dip"
-            android:layout_below="@id/wait_for_debugger"
-            android:layout_alignParentLeft="true" />
-
-        <Spinner android:id="@+id/pointer_location"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/separator"
-            android:layout_alignParentLeft="true" />
-
-        <CheckBox android:id="@+id/show_load"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/pointer_location"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_show_load_text" />
-
-        <CheckBox android:id="@+id/show_updates"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/show_load"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_show_updates_text" />
-
-        <Spinner android:id="@+id/strictmode_visual"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/show_updates"
-            android:layout_alignParentLeft="true" />
-
-        <CheckBox android:id="@+id/compatibility_mode"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/strictmode_visual"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_compatibility_mode_text" />
-
-        <Spinner android:id="@+id/max_procs"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/compatibility_mode"
-            android:layout_alignParentLeft="true" />
-
-        <View android:id="@+id/separator2"
-            android:layout_width="8dip"
-            android:layout_height="8dip"
-            android:layout_below="@id/max_procs"
-            android:layout_alignParentLeft="true" />
-
-        <CheckBox android:id="@+id/always_finish"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/separator2"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_always_finish_text" />
-
-        <CheckBox android:id="@+id/show_cpu"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/always_finish"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_show_cpu_text" />
-
-        <CheckBox android:id="@+id/enable_gl"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/show_cpu"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_enable_gl_text" />
-
-        <CheckBox android:id="@+id/show_background"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/enable_gl"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_show_background_text" />
-
-        <CheckBox android:id="@+id/show_sleep"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/show_background"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_show_sleep_text" />
-            
-        <Spinner android:id="@+id/window_animation_scale"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/show_sleep"
-            android:layout_alignParentLeft="true">
-        </Spinner>
-
-        <Spinner android:id="@+id/transition_animation_scale"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/window_animation_scale"
-            android:layout_alignParentLeft="true">
-        </Spinner>
-
-        <Spinner android:id="@+id/font_hinting"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/transition_animation_scale"
-            android:layout_alignParentLeft="true">
-        </Spinner>
-
-        <CheckBox android:id="@+id/show_xmpp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/font_hinting"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_show_xmpp_text" />
-
-        <CheckBox android:id="@+id/window_orientation_listener_log"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/show_xmpp"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_window_orientation_listener_log" />
-
-    </RelativeLayout>
-
-</ScrollView>
-
diff --git a/apps/Development/res/values/strings.xml b/apps/Development/res/values/strings.xml
index 5f96d24e7..1ee1c18be 100644
--- a/apps/Development/res/values/strings.xml
+++ b/apps/Development/res/values/strings.xml
@@ -108,23 +108,6 @@
     <string name="launch_singleInstance">Single Instance</string>
     <string name="launch_unknown">"(Unknown)"</string>
 
-    <string name="development_settings_show_cpu_text">Show CPU usage</string>
-    <string name="development_settings_always_finish_text">Immediately destroy activities</string>
-    <string name="development_settings_show_load_text">Show running processes</string>
-    <string name="development_settings_show_updates_text">Show screen updates</string>
-    <string name="development_settings_compatibility_mode_text">Disable compatibility mode</string>
-    <string name="development_settings_compatibility_mode_toast">Reboot required for
-            change to take effect.</string>
-    <string name="development_settings_enable_gl_text">Enable OpenGL ES (reboot needed)</string>
-    <string name="development_settings_allow_mock_location_text">Allow mock locations for testing</string>
-    <string name="development_settings_wait_for_debugger_text">Wait for debugger</string>
-    <string name="development_settings_show_background_text">Show background</string>
-    <string name="development_settings_show_xmpp_text">Show GTalk service connection status</string>
-    <string name="development_settings_debug_app_label_text">Debug App:</string>
-    <string name="development_settings_show_sleep_text">Show sleep state on LED</string>
-    <string name="development_settings_keep_screen_on_text">Keep screen on while plugged in</string>
-    <string name="development_settings_window_orientation_listener_log">Enable window orientation listener log</string>
-
     <string name="monkey_screen_initialActivity_text"></string>
     <string name="monkey_screen_number_of_events_label">Number of Events: </string>
     <string name="monkey_screen_start_text">Start</string>
diff --git a/apps/Development/src/com/android/development/SyncAdapterDriver.java b/apps/Development/src/com/android/development/SyncAdapterDriver.java
index 1bf27ae34..a860aef6e 100644
--- a/apps/Development/src/com/android/development/SyncAdapterDriver.java
+++ b/apps/Development/src/com/android/development/SyncAdapterDriver.java
@@ -371,7 +371,7 @@ public class SyncAdapterDriver extends Activity
                         sa.getString(com.android.internal.R.styleable
                                 .SyncAdapter_settingsActivity);
                 return new SyncAdapterType(authority, accountType, userVisible, supportsUploading,
-                        isAlwaysSyncable, allowParallelSyncs, settingsActivity);
+                        isAlwaysSyncable, allowParallelSyncs, settingsActivity, packageName);
             } finally {
                 sa.recycle();
             }
diff --git a/build/Android.mk b/build/Android.mk
index 8fbab3b45..0954581b9 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -121,12 +121,21 @@ $(eval _psm_packaging_target :=)
 endef
 
 ANDROID_SUPPORT_LIBRARIES := \
+    android-support-animatedvectordrawable \
     android-support-annotations \
     android-support-compat \
-    android-support-media-compat \
     android-support-core-ui \
-    android-support-fragment \
     android-support-core-utils \
+    android-support-customtabs \
+    android-support-design \
+    android-support-documents-archive \
+    android-support-fragment \
+    android-support-media-compat \
+    android-support-multidex \
+    android-support-multidex-instrumentation \
+    android-support-percent \
+    android-support-recommendation \
+    android-support-transition \
     android-support-v4 \
     android-support-v7-appcompat \
     android-support-v7-cardview \
@@ -139,15 +148,7 @@ ANDROID_SUPPORT_LIBRARIES := \
     android-support-v14-preference \
     android-support-v17-leanback \
     android-support-v17-preference-leanback \
-    android-support-multidex \
-    android-support-multidex-instrumentation \
-    android-support-design \
-    android-support-percent \
-    android-support-recommendation \
-    android-support-customtabs \
-    android-support-documents-archive \
-    android-support-vectordrawable \
-    android-support-animatedvectordrawable
+    android-support-vectordrawable
 
 $(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library,$(lib))))
 
diff --git a/build/sdk.atree b/build/sdk.atree
index a9c215870..093bd3a38 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -57,11 +57,11 @@ development/sdk/generated-api-versions.xml    platform-tools/api/api-versions.xm
 prebuilts/sdk/sdk-annotations/annotations.zip   platform-tools/api/annotations.zip
 
 # systrace
-external/chromium-trace/catapult/systrace/systrace/                       platform-tools/systrace/catapult/systrace/systrace/
-external/chromium-trace/catapult/systrace/systrace/__init__.py            platform-tools/systrace/catapult/systrace/systrace/__init__.py
-external/chromium-trace/catapult/systrace/systrace/agents/__init__.py     platform-tools/systrace/catapult/systrace/systrace/agents/__init__.py
+external/chromium-trace/catapult/common/                                  platform-tools/systrace/catapult/common/
+external/chromium-trace/catapult/dependency_manager/                      platform-tools/systrace/catapult/dependency_manager/
+external/chromium-trace/catapult/devil/                                   platform-tools/systrace/catapult/devil/
+external/chromium-trace/catapult/systrace/                                platform-tools/systrace/catapult/systrace/
 external/chromium-trace/systrace.py                                       platform-tools/systrace/systrace.py
-external/chromium-trace/systrace_trace_viewer.html                        platform-tools/systrace/systrace_trace_viewer.html
 external/chromium-trace/NOTICE                                            platform-tools/systrace/NOTICE
 external/chromium-trace/UPSTREAM_REVISION                                 platform-tools/systrace/UPSTREAM_REVISION
 
@@ -351,6 +351,9 @@ developers/build/prebuilts/gradle/DirectShare                                sam
 developers/build/prebuilts/gradle/MidiScope                                  samples/${PLATFORM_NAME}/media/MidiScope
 developers/build/prebuilts/gradle/MidiSynth                                  samples/${PLATFORM_NAME}/media/MidiSynth
 developers/build/prebuilts/gradle/AsymmetricFingerprintDialog                samples/${PLATFORM_NAME}/security/AsymmetricFingerprintDialog
+developers/build/prebuilts/gradle/AppShortcuts                               samples/${PLATFORM_NAME}/system/AppShortcuts
+developers/build/prebuilts/gradle/CommitContentSampleApp                     samples/${PLATFORM_NAME}/input/keyboard/CommitContentSampleApp
+developers/build/prebuilts/gradle/CommitContentSampleIME                     samples/${PLATFORM_NAME}/input/keyboard/CommitContentSampleIME
 
 developers/build/prebuilts/androidtv                                         samples/${PLATFORM_NAME}/androidtv
 
@@ -374,6 +377,7 @@ developers/build/prebuilts/gradle/SynchronizedNotifications     samples/${PLATFO
 developers/build/prebuilts/gradle/Timer                         samples/${PLATFORM_NAME}/wearable/Timer
 developers/build/prebuilts/gradle/WatchFace                     samples/${PLATFORM_NAME}/wearable/WatchFace
 developers/build/prebuilts/gradle/WatchViewStub                 samples/${PLATFORM_NAME}/wearable/WatchViewStub
+developers/build/prebuilts/gradle/WearNotifications             samples/${PLATFORM_NAME}/wearable/WearNotifications
 developers/build/prebuilts/gradle/WearSpeakerSample             samples/${PLATFORM_NAME}/wearable/WearSpeakerSample
 developers/build/prebuilts/gradle/XYZTouristAttractions         samples/${PLATFORM_NAME}/wearable/XYZTouristAttractions
 
@@ -571,6 +575,13 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android-support-vectordrawable_intermedia
 
 ${OUT_DIR}/target/common/obj/PACKAGING/android-support-animatedvectordrawable_intermediates/android-support-animatedvectordrawable.jar    extras/android/support/graphics/drawable/libs/android-support-animatedvectordrawable.jar
 
+frameworks/support/transition/AndroidManifest.xml                                     extras/android/support/transition/AndroidManifest.xml
+frameworks/support/transition/res                                                     extras/android/support/transition/res
+${OUT_DIR}/target/common/obj/PACKAGING/android-support-transition_intermediates/android-support-transition.jar    extras/android/support/transition/libs/android-support-transition.jar
+
+frameworks/support/documents-archive/AndroidManifest.xml                                     extras/android/support/documents-archive/AndroidManifest.xml
+${OUT_DIR}/target/common/obj/PACKAGING/android-support-documents-archive_intermediates/android-support-documents-archive.jar    extras/android/support/documents-archive/libs/android-support-documents-archive.jar
+
 ##############################################################################
 # Tests Component
 ##############################################################################
diff --git a/build/sdk.exclude.atree b/build/sdk.exclude.atree
index 5a93b1b6e..479d79c39 100644
--- a/build/sdk.exclude.atree
+++ b/build/sdk.exclude.atree
@@ -20,7 +20,8 @@
 -.*.swp
 -.DS_Store
 -*~
--_*
+-_[!_]*
+-*.pyc
 -.*
 -OWNERS
 -MODULE_LICENSE_*
diff --git a/build/tools/mk_sources_zip.py b/build/tools/mk_sources_zip.py
index 3220e3a7d..09cfed187 100755
--- a/build/tools/mk_sources_zip.py
+++ b/build/tools/mk_sources_zip.py
@@ -39,7 +39,7 @@ class Params(object):
         self.CNT_NOPKG = 0
         # DIR is the list of directories to scan in TOPDIR.
         self.DIR = "frameworks libcore"
-        self.IGNORE_DIR = [ "hosttests", "tools", "tests" ]
+        self.IGNORE_DIR = [ "hosttests", "tools", "tests", "samples" ]
         # IGNORE is a list of namespaces to ignore. Must be java
         # package definitions (e.g. "com.blah.foo.")
         self.IGNORE = [ "sun.", "libcore.", "dalvik.",
diff --git a/samples/ShortcutSample/AndroidManifest.xml b/samples/ShortcutSample/AndroidManifest.xml
index 88b05447b..4fb99b827 100644
--- a/samples/ShortcutSample/AndroidManifest.xml
+++ b/samples/ShortcutSample/AndroidManifest.xml
@@ -19,6 +19,8 @@
 
     <uses-sdk android:minSdkVersion="25" />
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:label="@string/app_name"
         android:icon="@drawable/app"
diff --git a/samples/ShortcutSample/src/com/example/android/shortcutsample/Main.java b/samples/ShortcutSample/src/com/example/android/shortcutsample/Main.java
index 41f0b2bc2..3e7f89351 100644
--- a/samples/ShortcutSample/src/com/example/android/shortcutsample/Main.java
+++ b/samples/ShortcutSample/src/com/example/android/shortcutsample/Main.java
@@ -19,6 +19,7 @@ import android.app.AlertDialog;
 import android.app.ListActivity;
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -98,13 +99,27 @@ public class Main extends ListActivity implements OnClickListener {
                 .setPositiveButton("Add", (dialog, whichButton) -> {
                     final String url = editUri.getText().toString().trim();
                     if (url.length() > 0) {
-                        mHelper.addWebSiteShortcut(url);
-                        refreshList();
+                        addUriAsync(url);
                     }
                 })
                 .show();
     }
 
+    private void addUriAsync(String uri) {
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                mHelper.addWebSiteShortcut(uri);
+                return null;
+            }
+
+            @Override
+            protected void onPostExecute(Void aVoid) {
+                refreshList();
+            }
+        }.execute();
+    }
+
     private void refreshList() {
         mAdapter.setShortcuts(mHelper.getShortcuts());
     }
diff --git a/samples/ShortcutSample/src/com/example/android/shortcutsample/ShortcutHelper.java b/samples/ShortcutSample/src/com/example/android/shortcutsample/ShortcutHelper.java
index 61c4f29be..6649f9dfc 100644
--- a/samples/ShortcutSample/src/com/example/android/shortcutsample/ShortcutHelper.java
+++ b/samples/ShortcutSample/src/com/example/android/shortcutsample/ShortcutHelper.java
@@ -19,12 +19,19 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.drawable.Icon;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.PersistableBundle;
 import android.util.Log;
 
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -169,8 +176,12 @@ public class ShortcutHelper {
         b.setShortLabel(uri.getHost());
         b.setLongLabel(uri.toString());
 
-        // TODO Fetch the favicon from the URI and sets to the icon.
-        b.setIcon(Icon.createWithResource(mContext, R.drawable.link));
+        Bitmap bmp = fetchFavicon(uri);
+        if (bmp != null) {
+            b.setIcon(Icon.createWithBitmap(bmp));
+        } else {
+            b.setIcon(Icon.createWithResource(mContext, R.drawable.link));
+        }
 
         return b;
     }
@@ -209,4 +220,23 @@ public class ShortcutHelper {
     public void enableShortcut(ShortcutInfo shortcut) {
         mShortcutManager.enableShortcuts(Arrays.asList(shortcut.getId()));
     }
+
+    private Bitmap fetchFavicon(Uri uri) {
+        final Uri iconUri = uri.buildUpon().path("favicon.ico").build();
+        Log.i(TAG, "Fetching favicon from: " + iconUri);
+
+        InputStream is = null;
+        BufferedInputStream bis = null;
+        try
+        {
+            URLConnection conn = new URL(iconUri.toString()).openConnection();
+            conn.connect();
+            is = conn.getInputStream();
+            bis = new BufferedInputStream(is, 8192);
+            return BitmapFactory.decodeStream(bis);
+        } catch (IOException e) {
+            Log.w(TAG, "Failed to fetch favicon from " + iconUri, e);
+            return null;
+        }
+    }
 }
diff --git a/samples/ShortcutSample/src/com/example/android/shortcutsample/Utils.java b/samples/ShortcutSample/src/com/example/android/shortcutsample/Utils.java
index 523f4dcf8..7f03b57d9 100644
--- a/samples/ShortcutSample/src/com/example/android/shortcutsample/Utils.java
+++ b/samples/ShortcutSample/src/com/example/android/shortcutsample/Utils.java
@@ -16,20 +16,17 @@
 package com.example.android.shortcutsample;
 
 import android.content.Context;
-import android.content.pm.ShortcutInfo;
-import android.os.AsyncTask;
-import android.os.PersistableBundle;
-import android.util.Log;
+import android.os.Handler;
+import android.os.Looper;
 import android.widget.Toast;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class Utils {
     private Utils() {
     }
 
     public static void showToast(Context context, String message) {
-        Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
+        new Handler(Looper.getMainLooper()).post(() -> {
+            Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
+        });
     }
 }
diff --git a/samples/browseable/AppRestrictionEnforcer/res/layout/fragment_app_restriction_enforcer.xml b/samples/browseable/AppRestrictionEnforcer/res/layout/fragment_app_restriction_enforcer.xml
index b68398974..95d605ce5 100644
--- a/samples/browseable/AppRestrictionEnforcer/res/layout/fragment_app_restriction_enforcer.xml
+++ b/samples/browseable/AppRestrictionEnforcer/res/layout/fragment_app_restriction_enforcer.xml
@@ -119,34 +119,6 @@
 
         </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/bundle_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/profile"/>
-
-            <EditText
-                android:id="@+id/profile_name"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.75"
-                android:hint="@string/name"/>
-
-            <EditText
-                android:id="@+id/profile_age"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.25"
-                android:hint="@string/age"
-                android:inputType="number"/>
-
-        </LinearLayout>
-
         <RelativeLayout
             android:id="@+id/bundle_array_layout"
             android:layout_width="match_parent"
diff --git a/samples/browseable/AppRestrictionEnforcer/res/values/strings.xml b/samples/browseable/AppRestrictionEnforcer/res/values/strings.xml
index ead415275..07e1c85c7 100644
--- a/samples/browseable/AppRestrictionEnforcer/res/values/strings.xml
+++ b/samples/browseable/AppRestrictionEnforcer/res/values/strings.xml
@@ -29,9 +29,6 @@
     <string name="number">Number: </string>
     <string name="rank">Rank: </string>
     <string name="approvals">Approvals: </string>
-    <string name="profile">Profile: </string>
-    <string name="name">Name</string>
-    <string name="age">Age</string>
     <string name="items">Items: </string>
     <string name="add">Add</string>
     <string name="key">Key</string>
diff --git a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/AppRestrictionEnforcerFragment.java b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/AppRestrictionEnforcerFragment.java
index 361c4ac33..908f9046b 100644
--- a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/AppRestrictionEnforcerFragment.java
+++ b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/AppRestrictionEnforcerFragment.java
@@ -90,13 +90,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements
     private static final String RESTRICTION_KEY_APPROVALS = "approvals";
 
     /**
-     * Key for the bundle restriction in AppRestrictionSchema.
-     */
-    private static final String RESTRICTION_KEY_PROFILE = "profile";
-    private static final String RESTRICTION_KEY_PROFILE_NAME = "name";
-    private static final String RESTRICTION_KEY_PROFILE_AGE = "age";
-
-    /**
      * Key for the bundle array restriction in AppRestrictionSchema.
      */
     private static final String RESTRICTION_KEY_ITEMS = "items";
@@ -119,8 +112,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements
     private EditText mEditNumber;
     private Spinner mSpinnerRank;
     private LinearLayout mLayoutApprovals;
-    private EditText mEditProfileName;
-    private EditText mEditProfileAge;
     private LinearLayout mLayoutItems;
 
     @Override
@@ -137,17 +128,12 @@ public class AppRestrictionEnforcerFragment extends Fragment implements
         mEditNumber = (EditText) view.findViewById(R.id.number);
         mSpinnerRank = (Spinner) view.findViewById(R.id.rank);
         mLayoutApprovals = (LinearLayout) view.findViewById(R.id.approvals);
-        mEditProfileName = (EditText) view.findViewById(R.id.profile_name);
-        mEditProfileAge = (EditText) view.findViewById(R.id.profile_age);
         mLayoutItems = (LinearLayout) view.findViewById(R.id.items);
         view.findViewById(R.id.item_add).setOnClickListener(this);
-        View bundleLayout = view.findViewById(R.id.bundle_layout);
         View bundleArrayLayout = view.findViewById(R.id.bundle_array_layout);
         if (BUNDLE_SUPPORTED) {
-            bundleLayout.setVisibility(View.VISIBLE);
             bundleArrayLayout.setVisibility(View.VISIBLE);
         } else {
-            bundleLayout.setVisibility(View.GONE);
             bundleArrayLayout.setVisibility(View.GONE);
         }
     }
@@ -197,21 +183,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements
         }
     };
 
-    private TextWatcher mWatcherProfile = new EasyTextWatcher() {
-        @Override
-        public void afterTextChanged(Editable s) {
-            try {
-                String name = mEditProfileName.getText().toString();
-                String ageString = mEditProfileAge.getText().toString();
-                if (!TextUtils.isEmpty(ageString)) {
-                    saveProfile(getActivity(), name, Integer.parseInt(ageString));
-                }
-            } catch (NumberFormatException e) {
-                Toast.makeText(getActivity(), "Not an integer!", Toast.LENGTH_SHORT).show();
-            }
-        }
-    };
-
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
         switch (parent.getId()) {
@@ -292,20 +263,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements
                                         TextUtils.join(DELIMETER,
                                                 restriction.getAllSelectedStrings())),
                                 DELIMETER));
-            } else if (BUNDLE_SUPPORTED && RESTRICTION_KEY_PROFILE.equals(key)) {
-                String name = null;
-                int age = 0;
-                for (RestrictionEntry entry : restriction.getRestrictions()) {
-                    String profileKey = entry.getKey();
-                    if (RESTRICTION_KEY_PROFILE_NAME.equals(profileKey)) {
-                        name = entry.getSelectedString();
-                    } else if (RESTRICTION_KEY_PROFILE_AGE.equals(profileKey)) {
-                        age = entry.getIntValue();
-                    }
-                }
-                name = prefs.getString(RESTRICTION_KEY_PROFILE_NAME, name);
-                age = prefs.getInt(RESTRICTION_KEY_PROFILE_AGE, age);
-                updateProfile(name, age);
             } else if (BUNDLE_SUPPORTED && RESTRICTION_KEY_ITEMS.equals(key)) {
                 String itemsString = prefs.getString(RESTRICTION_KEY_ITEMS, "");
                 HashMap<String, String> items = new HashMap<>();
@@ -362,22 +319,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements
         }
     }
 
-    private void updateProfile(String name, int age) {
-        if (!BUNDLE_SUPPORTED) {
-            return;
-        }
-        Bundle profile = new Bundle();
-        profile.putString(RESTRICTION_KEY_PROFILE_NAME, name);
-        profile.putInt(RESTRICTION_KEY_PROFILE_AGE, age);
-        mCurrentRestrictions.putBundle(RESTRICTION_KEY_PROFILE, profile);
-        mEditProfileName.removeTextChangedListener(mWatcherProfile);
-        mEditProfileName.setText(name);
-        mEditProfileName.addTextChangedListener(mWatcherProfile);
-        mEditProfileAge.removeTextChangedListener(mWatcherProfile);
-        mEditProfileAge.setText(String.valueOf(age));
-        mEditProfileAge.addTextChangedListener((mWatcherProfile));
-    }
-
     private void updateItems(Context context, Map<String, String> items) {
         if (!BUNDLE_SUPPORTED) {
             return;
@@ -511,25 +452,6 @@ public class AppRestrictionEnforcerFragment extends Fragment implements
     }
 
     /**
-     * Saves the value for the "profile" restriction of AppRestrictionSchema.
-     *
-     * @param activity The activity
-     * @param name     The value to be set for the "name" field.
-     * @param age      The value to be set for the "age" field.
-     */
-    private void saveProfile(Activity activity, String name, int age) {
-        if (!BUNDLE_SUPPORTED) {
-            return;
-        }
-        Bundle profile = new Bundle();
-        profile.putString(RESTRICTION_KEY_PROFILE_NAME, name);
-        profile.putInt(RESTRICTION_KEY_PROFILE_AGE, age);
-        mCurrentRestrictions.putBundle(RESTRICTION_KEY_PROFILE, profile);
-        saveRestrictions(activity);
-        editPreferences(activity).putString(RESTRICTION_KEY_PROFILE_NAME, name).apply();
-    }
-
-    /**
      * Saves the value for the "items" restriction of AppRestrictionSchema.
      *
      * @param activity The activity.
diff --git a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/ItemAddFragment.java b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/ItemAddFragment.java
index cda2726bd..091a0a889 100644
--- a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/ItemAddFragment.java
+++ b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/ItemAddFragment.java
@@ -17,6 +17,7 @@
 package com.example.android.apprestrictionenforcer;
 
 import android.app.Activity;
+import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
@@ -42,10 +43,10 @@ public class ItemAddFragment extends DialogFragment implements View.OnClickListe
     private EditText mEditValue;
 
     @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
+    public void onAttach(Context context) {
+        super.onAttach(context);
         Fragment parentFragment = getParentFragment();
-        mListener = (OnItemAddedListener) (parentFragment == null ? activity : parentFragment);
+        mListener = (OnItemAddedListener) (parentFragment == null ? context : parentFragment);
     }
 
     @Override
diff --git a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/MainActivity.java b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/MainActivity.java
index c6b012be8..85eace96b 100644
--- a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/MainActivity.java
+++ b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/MainActivity.java
@@ -62,7 +62,7 @@ public class MainActivity extends FragmentActivity implements StatusFragment.Sta
 
     private void showSetupProfile() {
         getSupportFragmentManager().beginTransaction()
-                .replace(R.id.container, new SetupProfileFragment())
+                .replace(R.id.container, SetupProfileFragment.newInstance())
                 .commit();
     }
 
diff --git a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/SetupProfileFragment.java b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/SetupProfileFragment.java
index 4dbd93055..29c36d410 100644
--- a/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/SetupProfileFragment.java
+++ b/samples/browseable/AppRestrictionEnforcer/src/com.example.android.apprestrictionenforcer/SetupProfileFragment.java
@@ -18,6 +18,7 @@ package com.example.android.apprestrictionenforcer;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
@@ -28,6 +29,7 @@ import android.widget.Toast;
 import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE;
 import static android.app.admin.DevicePolicyManager.EXTRA_DEVICE_ADMIN;
 import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME;
 
 /**
  * This {@link Fragment} handles initiation of managed profile provisioning.
@@ -74,9 +76,14 @@ public class SetupProfileFragment extends Fragment implements View.OnClickListen
             return;
         }
         Intent intent = new Intent(ACTION_PROVISION_MANAGED_PROFILE);
-        intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME,
-                activity.getApplicationContext().getPackageName());
-        intent.putExtra(EXTRA_DEVICE_ADMIN, EnforcerDeviceAdminReceiver.getComponentName(activity));
+        if (Build.VERSION.SDK_INT >= 24) {
+            intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME,
+                    EnforcerDeviceAdminReceiver.getComponentName(activity));
+        } else {
+            intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME,
+                    activity.getApplicationContext().getPackageName());
+            intent.putExtra(EXTRA_DEVICE_ADMIN, EnforcerDeviceAdminReceiver.getComponentName(activity));
+        }
         if (intent.resolveActivity(activity.getPackageManager()) != null) {
             startActivityForResult(intent, REQUEST_PROVISION_MANAGED_PROFILE);
             activity.finish();
diff --git a/samples/browseable/AppRestrictionSchema/res/layout/fragment_app_restriction_schema.xml b/samples/browseable/AppRestrictionSchema/res/layout/fragment_app_restriction_schema.xml
index 02d83e615..01bda925d 100644
--- a/samples/browseable/AppRestrictionSchema/res/layout/fragment_app_restriction_schema.xml
+++ b/samples/browseable/AppRestrictionSchema/res/layout/fragment_app_restriction_schema.xml
@@ -68,15 +68,6 @@ limitations under the License.
             android:textAppearance="?android:attr/textAppearanceMedium"
             tools:text="@string/approvals_you_have"/>
 
-        <include layout="@layout/separator"/>
-
-        <TextView
-            android:id="@+id/your_profile"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            tools:text="@string/your_profile"/>
-
         <include layout="@layout/separator" android:id="@+id/bundle_array_separator" />
 
         <TextView
diff --git a/samples/browseable/AppRestrictionSchema/res/values/restriction_values.xml b/samples/browseable/AppRestrictionSchema/res/values/restriction_values.xml
index 53be74669..5870d9ceb 100644
--- a/samples/browseable/AppRestrictionSchema/res/values/restriction_values.xml
+++ b/samples/browseable/AppRestrictionSchema/res/values/restriction_values.xml
@@ -34,36 +34,36 @@ limitations under the License.
     <!-- Choice restriction -->
     <string name="title_rank">Rank</string>
     <string name="description_rank">Rank of the user</string>
+    <string name="entry_rank_apprentice">Apprentice</string>
+    <string name="entry_rank_intermediate">Intermediate</string>
+    <string name="entry_rank_master">Master</string>
     <string-array name="entries_rank">
-        <item>Apprentice</item>
-        <item>Intermediate</item>
-        <item>Master</item>
+        <item>@string/entry_rank_apprentice</item>
+        <item>@string/entry_rank_intermediate</item>
+        <item>@string/entry_rank_master</item>
     </string-array>
-    <string name="entry_value_rank_apprentice">apprentice</string>
-    <string name="entry_value_rank_intermediate">intermediate</string>
-    <string name="entry_value_rank_master">master</string>
     <string-array name="entry_values_rank">
-        <item>@string/entry_value_rank_apprentice</item>
-        <item>@string/entry_value_rank_intermediate</item>
-        <item>@string/entry_value_rank_master</item>
+        <item>apprentice</item>
+        <item>intermediate</item>
+        <item>master</item>
     </string-array>
-    <string name="default_rank">@string/entry_value_rank_apprentice</string>
+    <string name="default_rank">apprentice</string>
 
     <!-- Multi-select restriction -->
     <string name="title_approvals">Approvals</string>
     <string name="description_approvals">Approvals</string>
+    <string name="entry_approvals_read">Read</string>
+    <string name="entry_approvals_write">Write</string>
+    <string name="entry_approvals_execute">Execute</string>
     <string-array name="entries_approvals">
-        <item>Read</item>
-        <item>Write</item>
-        <item>Execute</item>
+        <item>@string/entry_approvals_read</item>
+        <item>@string/entry_approvals_write</item>
+        <item>@string/entry_approvals_execute</item>
     </string-array>
-    <string name="entry_value_approvals_read">read</string>
-    <string name="entry_value_approvals_write">write</string>
-    <string name="entry_value_approvals_execute">execute</string>
     <string-array name="entry_values_approvals">
-        <item>@string/entry_value_approvals_read</item>
-        <item>@string/entry_value_approvals_write</item>
-        <item>@string/entry_value_approvals_execute</item>
+        <item>read</item>
+        <item>write</item>
+        <item>execute</item>
     </string-array>
     <string-array name="default_approvals">
         <!-- Empty -->
diff --git a/samples/browseable/AppRestrictionSchema/res/values/strings.xml b/samples/browseable/AppRestrictionSchema/res/values/strings.xml
index 1ec68d54c..2fe686970 100644
--- a/samples/browseable/AppRestrictionSchema/res/values/strings.xml
+++ b/samples/browseable/AppRestrictionSchema/res/values/strings.xml
@@ -25,7 +25,6 @@ limitations under the License.
     <string name="your_rank">Your rank: %s</string>
     <string name="approvals_you_have">Approvals you have: %s</string>
     <string name="none">none</string>
-    <string name="your_profile">Your profile: %1$s (%2$d)</string>
     <string name="your_items">Your items: %s</string>
 
 </resources>
diff --git a/samples/browseable/AppRestrictionSchema/res/xml/app_restrictions.xml b/samples/browseable/AppRestrictionSchema/res/xml/app_restrictions.xml
index 1e2ea457a..32ec8deaf 100644
--- a/samples/browseable/AppRestrictionSchema/res/xml/app_restrictions.xml
+++ b/samples/browseable/AppRestrictionSchema/res/xml/app_restrictions.xml
@@ -72,26 +72,6 @@ limitations under the License.
         android:restrictionType="hidden"
         android:title="@string/title_secret_code"/>
 
-    <!-- Bundle restriction; useful for grouping restrictions -->
-    <restriction
-        android:description="@string/description_profile"
-        android:key="profile"
-        android:restrictionType="bundle"
-        android:title="@string/title_profile">
-        <restriction
-            android:defaultValue="@string/default_profile_name"
-            android:description="@string/description_profile_name"
-            android:key="name"
-            android:restrictionType="string"
-            android:title="@string/title_profile_name"/>
-        <restriction
-            android:defaultValue="@integer/default_profile_age"
-            android:description="@string/description_profile_age"
-            android:key="age"
-            android:restrictionType="integer"
-            android:title="@string/title_profile_age"/>
-    </restriction>
-
     <!-- Bundle array restriction -->
     <restriction
         android:description="@string/description_items"
diff --git a/samples/browseable/AppRestrictionSchema/src/com.example.android.apprestrictionschema/AppRestrictionSchemaFragment.java b/samples/browseable/AppRestrictionSchema/src/com.example.android.apprestrictionschema/AppRestrictionSchemaFragment.java
index bbb1ef86e..f15bd9d41 100644
--- a/samples/browseable/AppRestrictionSchema/src/com.example.android.apprestrictionschema/AppRestrictionSchemaFragment.java
+++ b/samples/browseable/AppRestrictionSchema/src/com.example.android.apprestrictionschema/AppRestrictionSchemaFragment.java
@@ -51,9 +51,6 @@ public class AppRestrictionSchemaFragment extends Fragment implements View.OnCli
     private static final String KEY_NUMBER = "number";
     private static final String KEY_RANK = "rank";
     private static final String KEY_APPROVALS = "approvals";
-    private static final String KEY_PROFILE = "profile";
-    private static final String KEY_PROFILE_NAME = "name";
-    private static final String KEY_PROFILE_AGE = "age";
     private static final String KEY_ITEMS = "items";
     private static final String KEY_ITEM_KEY = "key";
     private static final String KEY_ITEM_VALUE = "value";
@@ -69,7 +66,6 @@ public class AppRestrictionSchemaFragment extends Fragment implements View.OnCli
     private TextView mTextNumber;
     private TextView mTextRank;
     private TextView mTextApprovals;
-    private TextView mTextProfile;
     private TextView mTextItems;
 
     @Override
@@ -86,18 +82,15 @@ public class AppRestrictionSchemaFragment extends Fragment implements View.OnCli
         mTextRank = (TextView) view.findViewById(R.id.your_rank);
         mTextApprovals = (TextView) view.findViewById(R.id.approvals_you_have);
         View bundleSeparator = view.findViewById(R.id.bundle_separator);
-        mTextProfile = (TextView) view.findViewById(R.id.your_profile);
         View bundleArraySeparator = view.findViewById(R.id.bundle_array_separator);
         mTextItems = (TextView) view.findViewById(R.id.your_items);
         mButtonSayHello.setOnClickListener(this);
         if (BUNDLE_SUPPORTED) {
             bundleSeparator.setVisibility(View.VISIBLE);
-            mTextProfile.setVisibility(View.VISIBLE);
             bundleArraySeparator.setVisibility(View.VISIBLE);
             mTextItems.setVisibility(View.VISIBLE);
         } else {
             bundleSeparator.setVisibility(View.GONE);
-            mTextProfile.setVisibility(View.GONE);
             bundleArraySeparator.setVisibility(View.GONE);
             mTextItems.setVisibility(View.GONE);
         }
@@ -128,10 +121,8 @@ public class AppRestrictionSchemaFragment extends Fragment implements View.OnCli
                 updateRank(entry, restrictions);
             } else if (key.equals(KEY_APPROVALS)) {
                 updateApprovals(entry, restrictions);
-            } else if (key.equals(KEY_PROFILE)) {
-                updateProfile(entry, restrictions);
             } else if (key.equals(KEY_ITEMS)) {
-                updateItems(entry, restrictions);
+                updateItems(restrictions);
             }
         }
     }
@@ -193,33 +184,7 @@ public class AppRestrictionSchemaFragment extends Fragment implements View.OnCli
         mTextApprovals.setText(getString(R.string.approvals_you_have, text));
     }
 
-    private void updateProfile(RestrictionEntry entry, Bundle restrictions) {
-        if (!BUNDLE_SUPPORTED) {
-            return;
-        }
-        String name = null;
-        int age = 0;
-        if (restrictions == null || !restrictions.containsKey(KEY_PROFILE)) {
-            RestrictionEntry[] entries = entry.getRestrictions();
-            for (RestrictionEntry profileEntry : entries) {
-                String key = profileEntry.getKey();
-                if (key.equals(KEY_PROFILE_NAME)) {
-                    name = profileEntry.getSelectedString();
-                } else if (key.equals(KEY_PROFILE_AGE)) {
-                    age = profileEntry.getIntValue();
-                }
-            }
-        } else {
-            Bundle profile = restrictions.getBundle(KEY_PROFILE);
-            if (profile != null) {
-                name = profile.getString(KEY_PROFILE_NAME);
-                age = profile.getInt(KEY_PROFILE_AGE);
-            }
-        }
-        mTextProfile.setText(getString(R.string.your_profile, name, age));
-    }
-
-    private void updateItems(RestrictionEntry entry, Bundle restrictions) {
+    private void updateItems(Bundle restrictions) {
         if (!BUNDLE_SUPPORTED) {
             return;
         }
diff --git a/samples/browseable/AppShortcuts/AndroidManifest.xml b/samples/browseable/AppShortcuts/AndroidManifest.xml
new file mode 100644
index 000000000..9dfc7a3a8
--- /dev/null
+++ b/samples/browseable/AppShortcuts/AndroidManifest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.android.appshortcuts">
+
+    <uses-sdk android:minSdkVersion="25" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+        android:label="@string/app_name"
+        android:icon="@drawable/app"
+        android:resizeableActivity="true">
+
+        <activity android:name="com.example.android.appshortcuts.Main">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts"/>
+        </activity>
+        <receiver android:name="com.example.android.appshortcuts.MyReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.LOCALE_CHANGED" />
+            </intent-filter>
+        </receiver>
+    </application>
+</manifest>
diff --git a/samples/browseable/AppShortcuts/_index.jd b/samples/browseable/AppShortcuts/_index.jd
new file mode 100644
index 000000000..2d3ed6202
--- /dev/null
+++ b/samples/browseable/AppShortcuts/_index.jd
@@ -0,0 +1,13 @@
+
+page.tags="AppShortcuts"
+sample.group=System
+@jd:body
+
+<p>
+            
+            This sample demonstrates how to use the Launcher Shortcuts API introduced in API 25.
+            This API allows an application to define a set of Intents which are displayed as
+            when a user long-presses on the app's launcher icon. Examples are given for
+            registering both links both statically in XML, as well as dynamically at runtime.
+            
+        </p>
diff --git a/samples/browseable/AppShortcuts/res/drawable-nodpi/add.png b/samples/browseable/AppShortcuts/res/drawable-nodpi/add.png
new file mode 100644
index 000000000..86a2ebd9e
--- /dev/null
+++ b/samples/browseable/AppShortcuts/res/drawable-nodpi/add.png
diff --git a/samples/browseable/AppShortcuts/res/drawable-nodpi/app.png b/samples/browseable/AppShortcuts/res/drawable-nodpi/app.png
new file mode 100644
index 000000000..39ca2f973
--- /dev/null
+++ b/samples/browseable/AppShortcuts/res/drawable-nodpi/app.png
diff --git a/samples/browseable/AppShortcuts/res/drawable-nodpi/link.png b/samples/browseable/AppShortcuts/res/drawable-nodpi/link.png
new file mode 100644
index 000000000..c4297c48b
--- /dev/null
+++ b/samples/browseable/AppShortcuts/res/drawable-nodpi/link.png
diff --git a/samples/browseable/AppShortcuts/res/layout/list_item.xml b/samples/browseable/AppShortcuts/res/layout/list_item.xml
new file mode 100644
index 000000000..f7129a892
--- /dev/null
+++ b/samples/browseable/AppShortcuts/res/layout/list_item.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+>
+    <LinearLayout
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical"
+        android:paddingLeft="8dip"
+        >
+        <TextView
+            android:id="@+id/line1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="#000000"
+            android:textSize="16sp"
+            />
+        <TextView
+            android:id="@+id/line2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="#444444"
+        />
+    </LinearLayout>
+    <Button
+        android:id="@+id/remove"
+        android:text="@string/remove_shortcut"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:visibility="visible"
+        style="@android:style/Widget.Material.Button.Borderless"/>
+    <Button
+        android:id="@+id/disable"
+        android:text="@string/disable_shortcut"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:visibility="visible"
+        style="@android:style/Widget.Material.Button.Borderless"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/samples/browseable/AppShortcuts/res/layout/main.xml b/samples/browseable/AppShortcuts/res/layout/main.xml
new file mode 100644
index 000000000..2d87c0760
--- /dev/null
+++ b/samples/browseable/AppShortcuts/res/layout/main.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+    <Button
+        android:id="@+id/add"
+        android:text="@string/add_new_website"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:onClick="onAddPressed"/>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="#444444"
+        android:text="@string/existing_shortcuts"
+    />
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:enabled="true"
+    />
+</LinearLayout>
+
+
diff --git a/samples/browseable/AppShortcuts/res/values-ja/strings.xml b/samples/browseable/AppShortcuts/res/values-ja/strings.xml
new file mode 100644
index 000000000..d35d3343d
--- /dev/null
+++ b/samples/browseable/AppShortcuts/res/values-ja/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">アプリのショートカットサンプル</string>
+    <string name="add_new_website">ウェブサイト追加</string>
+    <string name="add_new_website_short">追加</string>
+    <string name="existing_shortcuts">既存のショートカット:</string>
+    <string name="remove_shortcut">削除</string>
+    <string name="disable_shortcut">無効</string>
+    <string name="enable_shortcut">有効</string>
+</resources>
diff --git a/samples/browseable/AppShortcuts/res/values/strings.xml b/samples/browseable/AppShortcuts/res/values/strings.xml
new file mode 100644
index 000000000..269bd933a
--- /dev/null
+++ b/samples/browseable/AppShortcuts/res/values/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">App Shortcuts Sample</string>
+    <string name="add_new_website">Add New Website</string>
+    <string name="add_new_website_short">Add Website</string>
+    <string name="existing_shortcuts">Existing shortcuts:</string>
+    <string name="remove_shortcut">Remove</string>
+    <string name="disable_shortcut">Disable</string>
+    <string name="enable_shortcut">Enable</string>
+</resources>
diff --git a/samples/browseable/AppShortcuts/res/xml/shortcuts.xml b/samples/browseable/AppShortcuts/res/xml/shortcuts.xml
new file mode 100644
index 000000000..1430f431c
--- /dev/null
+++ b/samples/browseable/AppShortcuts/res/xml/shortcuts.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android" >
+    <shortcut
+        android:shortcutId="add_website"
+        android:icon="@drawable/add"
+        android:shortcutShortLabel="@string/add_new_website_short"
+        android:shortcutLongLabel="@string/add_new_website"
+        >
+        <intent
+            android:action="com.example.android.appshortcuts.ADD_WEBSITE"
+            android:targetPackage="com.example.android.appshortcuts"
+            android:targetClass="com.example.android.appshortcuts.Main"
+            />
+    </shortcut>
+</shortcuts>
diff --git a/samples/browseable/AppShortcuts/src/com.example.android.appshortcuts/Main.java b/samples/browseable/AppShortcuts/src/com.example.android.appshortcuts/Main.java
new file mode 100644
index 000000000..22b29b57a
--- /dev/null
+++ b/samples/browseable/AppShortcuts/src/com.example.android.appshortcuts/Main.java
@@ -0,0 +1,249 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+package com.example.android.appshortcuts;
+
+import android.app.AlertDialog;
+import android.app.ListActivity;
+import android.content.Context;
+import android.content.pm.ShortcutInfo;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Main extends ListActivity implements OnClickListener {
+    static final String TAG = "ShortcutSample";
+
+    private static final String ID_ADD_WEBSITE = "add_website";
+
+    private static final String ACTION_ADD_WEBSITE =
+            "com.example.android.shortcutsample.ADD_WEBSITE";
+
+    private MyAdapter mAdapter;
+
+    private ShortcutHelper mHelper;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.main);
+
+        mHelper = new ShortcutHelper(this);
+
+        mHelper.maybeRestoreAllDynamicShortcuts();
+
+        mHelper.refreshShortcuts(/*force=*/ false);
+
+        if (ACTION_ADD_WEBSITE.equals(getIntent().getAction())) {
+            // Invoked via the manifest shortcut.
+            addWebSite();
+        }
+
+        mAdapter = new MyAdapter(this.getApplicationContext());
+        setListAdapter(mAdapter);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        refreshList();
+    }
+
+    /**
+     * Handle the add button.
+     */
+    public void onAddPressed(View v) {
+        addWebSite();
+    }
+
+    private void addWebSite() {
+        Log.i(TAG, "addWebSite");
+
+        // This is important.  This allows the launcher to build a prediction model.
+        mHelper.reportShortcutUsed(ID_ADD_WEBSITE);
+
+        final EditText editUri = new EditText(this);
+
+        editUri.setHint("http://www.android.com/");
+        editUri.setInputType(EditorInfo.TYPE_TEXT_VARIATION_URI);
+
+        new AlertDialog.Builder(this)
+                .setTitle("Add new website")
+                .setMessage("Type URL of a website")
+                .setView(editUri)
+                .setPositiveButton("Add", (dialog, whichButton) -> {
+                    final String url = editUri.getText().toString().trim();
+                    if (url.length() > 0) {
+                        addUriAsync(url);
+                    }
+                })
+                .show();
+    }
+
+    private void addUriAsync(String uri) {
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                mHelper.addWebSiteShortcut(uri);
+                return null;
+            }
+
+            @Override
+            protected void onPostExecute(Void aVoid) {
+                refreshList();
+            }
+        }.execute();
+    }
+
+    private void refreshList() {
+        mAdapter.setShortcuts(mHelper.getShortcuts());
+    }
+
+    @Override
+    public void onClick(View v) {
+        final ShortcutInfo shortcut = (ShortcutInfo) ((View) v.getParent()).getTag();
+
+        switch (v.getId()) {
+            case R.id.disable:
+                if (shortcut.isEnabled()) {
+                    mHelper.disableShortcut(shortcut);
+                } else {
+                    mHelper.enableShortcut(shortcut);
+                }
+                refreshList();
+                break;
+            case R.id.remove:
+                mHelper.removeShortcut(shortcut);
+                refreshList();
+                break;
+        }
+    }
+
+    private static final List<ShortcutInfo> EMPTY_LIST = new ArrayList<>();
+
+    private String getType(ShortcutInfo shortcut) {
+        final StringBuilder sb = new StringBuilder();
+        String sep = "";
+        if (shortcut.isDynamic()) {
+            sb.append(sep);
+            sb.append("Dynamic");
+            sep = ", ";
+        }
+        if (shortcut.isPinned()) {
+            sb.append(sep);
+            sb.append("Pinned");
+            sep = ", ";
+        }
+        if (!shortcut.isEnabled()) {
+            sb.append(sep);
+            sb.append("Disabled");
+            sep = ", ";
+        }
+        return sb.toString();
+    }
+
+    private class MyAdapter extends BaseAdapter {
+        private final Context mContext;
+        private final LayoutInflater mInflater;
+        private List<ShortcutInfo> mList = EMPTY_LIST;
+
+        public MyAdapter(Context context) {
+            mContext = context;
+            mInflater = mContext.getSystemService(LayoutInflater.class);
+        }
+
+        @Override
+        public int getCount() {
+            return mList.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mList.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public boolean hasStableIds() {
+            return false;
+        }
+
+        @Override
+        public boolean areAllItemsEnabled() {
+            return true;
+        }
+
+        @Override
+        public boolean isEnabled(int position) {
+            return true;
+        }
+
+        public void setShortcuts(List<ShortcutInfo> list) {
+            mList = list;
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            final View view;
+            if (convertView != null) {
+                view = convertView;
+            } else {
+                view = mInflater.inflate(R.layout.list_item, null);
+            }
+
+            bindView(view, position, mList.get(position));
+
+            return view;
+        }
+
+        public void bindView(View view, int position, ShortcutInfo shortcut) {
+            view.setTag(shortcut);
+
+            final TextView line1 = (TextView) view.findViewById(R.id.line1);
+            final TextView line2 = (TextView) view.findViewById(R.id.line2);
+
+            line1.setText(shortcut.getLongLabel());
+
+            line2.setText(getType(shortcut));
+
+            final Button remove = (Button) view.findViewById(R.id.remove);
+            final Button disable = (Button) view.findViewById(R.id.disable);
+
+            disable.setText(
+                    shortcut.isEnabled() ? R.string.disable_shortcut : R.string.enable_shortcut);
+
+            remove.setOnClickListener(Main.this);
+            disable.setOnClickListener(Main.this);
+        }
+    }
+}
diff --git a/samples/browseable/AppShortcuts/src/com.example.android.appshortcuts/MyReceiver.java b/samples/browseable/AppShortcuts/src/com.example.android.appshortcuts/MyReceiver.java
new file mode 100644
index 000000000..adb95326c
--- /dev/null
+++ b/samples/browseable/AppShortcuts/src/com.example.android.appshortcuts/MyReceiver.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+package com.example.android.appshortcuts;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+public class MyReceiver extends BroadcastReceiver {
+    private static final String TAG = Main.TAG;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Log.i(TAG, "onReceive: " + intent);
+        if (Intent.ACTION_LOCALE_CHANGED.equals(intent.getAction())) {
+            // Refresh all shortcut to update the labels.
+            // (Right now shortcut labels don't contain localized strings though.)
+            new ShortcutHelper(context).refreshShortcuts(/*force=*/ true);
+        }
+    }
+}
diff --git a/samples/browseable/AppShortcuts/src/com.example.android.appshortcuts/ShortcutHelper.java b/samples/browseable/AppShortcuts/src/com.example.android.appshortcuts/ShortcutHelper.java
new file mode 100644
index 000000000..31f61961b
--- /dev/null
+++ b/samples/browseable/AppShortcuts/src/com.example.android.appshortcuts/ShortcutHelper.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+package com.example.android.appshortcuts;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.Icon;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.PersistableBundle;
+import android.util.Log;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.function.BooleanSupplier;
+
+public class ShortcutHelper {
+    private static final String TAG = Main.TAG;
+
+    private static final String EXTRA_LAST_REFRESH =
+            "com.example.android.shortcutsample.EXTRA_LAST_REFRESH";
+
+    private static final long REFRESH_INTERVAL_MS = 60 * 60 * 1000;
+
+    private final Context mContext;
+
+    private final ShortcutManager mShortcutManager;
+
+    public ShortcutHelper(Context context) {
+        mContext = context;
+        mShortcutManager = mContext.getSystemService(ShortcutManager.class);
+    }
+
+    public void maybeRestoreAllDynamicShortcuts() {
+        if (mShortcutManager.getDynamicShortcuts().size() == 0) {
+            // NOTE: If this application is always supposed to have dynamic shortcuts, then publish
+            // them here.
+            // Note when an application is "restored" on a new device, all dynamic shortcuts
+            // will *not* be restored but the pinned shortcuts *will*.
+        }
+    }
+
+    public void reportShortcutUsed(String id) {
+        mShortcutManager.reportShortcutUsed(id);
+    }
+
+    /**
+     * Use this when interacting with ShortcutManager to show consistent error messages.
+     */
+    private void callShortcutManager(BooleanSupplier r) {
+        try {
+            if (!r.getAsBoolean()) {
+                Utils.showToast(mContext, "Call to ShortcutManager is rate-limited");
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Caught Exception", e);
+            Utils.showToast(mContext, "Error while calling ShortcutManager: " + e.toString());
+        }
+    }
+
+    /**
+     * Return all mutable shortcuts from this app self.
+     */
+    public List<ShortcutInfo> getShortcuts() {
+        // Load mutable dynamic shortcuts and pinned shortcuts and put them into a single list
+        // removing duplicates.
+
+        final List<ShortcutInfo> ret = new ArrayList<>();
+        final HashSet<String> seenKeys = new HashSet<>();
+
+        // Check existing shortcuts shortcuts
+        for (ShortcutInfo shortcut : mShortcutManager.getDynamicShortcuts()) {
+            if (!shortcut.isImmutable()) {
+                ret.add(shortcut);
+                seenKeys.add(shortcut.getId());
+            }
+        }
+        for (ShortcutInfo shortcut : mShortcutManager.getPinnedShortcuts()) {
+            if (!shortcut.isImmutable() && !seenKeys.contains(shortcut.getId())) {
+                ret.add(shortcut);
+                seenKeys.add(shortcut.getId());
+            }
+        }
+        return ret;
+    }
+
+    /**
+     * Called when the activity starts.  Looks for shortcuts that have been pushed and refreshes
+     * them (but the refresh part isn't implemented yet...).
+     */
+    public void refreshShortcuts(boolean force) {
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                Log.i(TAG, "refreshingShortcuts...");
+
+                final long now = System.currentTimeMillis();
+                final long staleThreshold = force ? now : now - REFRESH_INTERVAL_MS;
+
+                // Check all existing dynamic and pinned shortcut, and if their last refresh
+                // time is older than a certain threshold, update them.
+
+                final List<ShortcutInfo> updateList = new ArrayList<>();
+
+                for (ShortcutInfo shortcut : getShortcuts()) {
+                    if (shortcut.isImmutable()) {
+                        continue;
+                    }
+
+                    final PersistableBundle extras = shortcut.getExtras();
+                    if (extras != null && extras.getLong(EXTRA_LAST_REFRESH) >= staleThreshold) {
+                        // Shortcut still fresh.
+                        continue;
+                    }
+                    Log.i(TAG, "Refreshing shortcut: " + shortcut.getId());
+
+                    final ShortcutInfo.Builder b = new ShortcutInfo.Builder(
+                            mContext, shortcut.getId());
+
+                    setSiteInformation(b, shortcut.getIntent().getData());
+                    setExtras(b);
+
+                    updateList.add(b.build());
+                }
+                // Call update.
+                if (updateList.size() > 0) {
+                    callShortcutManager(() -> mShortcutManager.updateShortcuts(updateList));
+                }
+
+                return null;
+            }
+        }.execute();
+    }
+
+    private ShortcutInfo createShortcutForUrl(String urlAsString) {
+        Log.i(TAG, "createShortcutForUrl: " + urlAsString);
+
+        final ShortcutInfo.Builder b = new ShortcutInfo.Builder(mContext, urlAsString);
+
+        final Uri uri = Uri.parse(urlAsString);
+        b.setIntent(new Intent(Intent.ACTION_VIEW, uri));
+
+        setSiteInformation(b, uri);
+        setExtras(b);
+
+        return b.build();
+    }
+
+    private ShortcutInfo.Builder setSiteInformation(ShortcutInfo.Builder b, Uri uri) {
+        // TODO Get the actual site <title> and use it.
+        // TODO Set the current locale to accept-language to get localized title.
+        b.setShortLabel(uri.getHost());
+        b.setLongLabel(uri.toString());
+
+        Bitmap bmp = fetchFavicon(uri);
+        if (bmp != null) {
+            b.setIcon(Icon.createWithBitmap(bmp));
+        } else {
+            b.setIcon(Icon.createWithResource(mContext, R.drawable.link));
+        }
+
+        return b;
+    }
+
+    private ShortcutInfo.Builder setExtras(ShortcutInfo.Builder b) {
+        final PersistableBundle extras = new PersistableBundle();
+        extras.putLong(EXTRA_LAST_REFRESH, System.currentTimeMillis());
+        b.setExtras(extras);
+        return b;
+    }
+
+    private String normalizeUrl(String urlAsString) {
+        if (urlAsString.startsWith("http://") || urlAsString.startsWith("https://")) {
+            return urlAsString;
+        } else {
+            return "http://" + urlAsString;
+        }
+    }
+
+    public void addWebSiteShortcut(String urlAsString) {
+        final String uriFinal = urlAsString;
+        callShortcutManager(() -> {
+            final ShortcutInfo shortcut = createShortcutForUrl(normalizeUrl(uriFinal));
+            return mShortcutManager.addDynamicShortcuts(Arrays.asList(shortcut));
+        });
+    }
+
+    public void removeShortcut(ShortcutInfo shortcut) {
+        mShortcutManager.removeDynamicShortcuts(Arrays.asList(shortcut.getId()));
+    }
+
+    public void disableShortcut(ShortcutInfo shortcut) {
+        mShortcutManager.disableShortcuts(Arrays.asList(shortcut.getId()));
+    }
+
+    public void enableShortcut(ShortcutInfo shortcut) {
+        mShortcutManager.enableShortcuts(Arrays.asList(shortcut.getId()));
+    }
+
+    private Bitmap fetchFavicon(Uri uri) {
+        final Uri iconUri = uri.buildUpon().path("favicon.ico").build();
+        Log.i(TAG, "Fetching favicon from: " + iconUri);
+
+        InputStream is = null;
+        BufferedInputStream bis = null;
+        try
+        {
+            URLConnection conn = new URL(iconUri.toString()).openConnection();
+            conn.connect();
+            is = conn.getInputStream();
+            bis = new BufferedInputStream(is, 8192);
+            return BitmapFactory.decodeStream(bis);
+        } catch (IOException e) {
+            Log.w(TAG, "Failed to fetch favicon from " + iconUri, e);
+            return null;
+        }
+    }
+}
diff --git a/samples/browseable/AppShortcuts/src/com.example.android.appshortcuts/Utils.java b/samples/browseable/AppShortcuts/src/com.example.android.appshortcuts/Utils.java
new file mode 100644
index 000000000..585273479
--- /dev/null
+++ b/samples/browseable/AppShortcuts/src/com.example.android.appshortcuts/Utils.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+package com.example.android.appshortcuts;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.widget.Toast;
+
+public class Utils {
+    private Utils() {
+    }
+
+    public static void showToast(Context context, String message) {
+        new Handler(Looper.getMainLooper()).post(() -> {
+            Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
+        });
+    }
+}
diff --git a/samples/browseable/BasicRenderScript/res/values/attrs.xml b/samples/browseable/BasicRenderScript/res/values/attrs.xml
deleted file mode 100644
index e67df0a37..000000000
--- a/samples/browseable/BasicRenderScript/res/values/attrs.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resources>
-
-    <!--
-         Declare custom theme attributes that allow changing which styles are
-         used for button bars depending on the API level.
-         ?android:attr/buttonBarStyle is new as of API 11 so this is
-         necessary to support previous API levels.
-    -->
-    <declare-styleable name="ButtonBarContainerTheme">
-        <attr name="buttonBarStyle" format="reference" />
-        <attr name="buttonBarButtonStyle" format="reference" />
-    </declare-styleable>
-
-</resources>
diff --git a/samples/browseable/BasicSyncAdapter/res/values/attrs.xml b/samples/browseable/BasicSyncAdapter/res/values/attrs.xml
deleted file mode 100644
index 6c1550469..000000000
--- a/samples/browseable/BasicSyncAdapter/res/values/attrs.xml
+++ /dev/null
@@ -1,21 +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>
-    <!-- Specifies a style resource to use for an indeterminate progress spinner. -->
-    <attr name="indeterminateProgressStyle" format="reference"/>
-</resources>
\ No newline at end of file
diff --git a/samples/browseable/CommitContentSampleApp/AndroidManifest.xml b/samples/browseable/CommitContentSampleApp/AndroidManifest.xml
new file mode 100644
index 000000000..16c93b117
--- /dev/null
+++ b/samples/browseable/CommitContentSampleApp/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.android.commitcontent.app">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/samples/browseable/CommitContentSampleApp/_index.jd b/samples/browseable/CommitContentSampleApp/_index.jd
new file mode 100644
index 000000000..9b1785cc4
--- /dev/null
+++ b/samples/browseable/CommitContentSampleApp/_index.jd
@@ -0,0 +1,11 @@
+
+page.tags="CommitContentSampleApp"
+sample.group=Input
+@jd:body
+
+<p>
+            
+                This sample demonstrates how to write an application which accepts rich content
+                (such as images) sent from a keyboard using the Commit Content API.
+            
+        </p>
diff --git a/samples/browseable/CommitContentSampleApp/res/layout/commit_content.xml b/samples/browseable/CommitContentSampleApp/res/layout/commit_content.xml
new file mode 100644
index 000000000..414df184f
--- /dev/null
+++ b/samples/browseable/CommitContentSampleApp/res/layout/commit_content.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:background="@android:color/black">
+
+    <WebView
+        android:id="@+id/commit_content_webview"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#77000000"
+        android:orientation="vertical">
+
+        <HorizontalScrollView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fadeScrollbars="false"
+            android:scrollbars="horizontal">
+
+            <TableLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TableRow>
+
+                    <TextView
+                        android:layout_column="1"
+                        android:gravity="end"
+                        android:padding="3dip"
+                        android:text="MIME"
+                        android:textColor="@android:color/white"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/text_commit_content_mime_types"
+                        android:padding="3dip"
+                        android:textColor="@android:color/white" />
+                </TableRow>
+
+                <TableRow>
+
+                    <TextView
+                        android:layout_column="1"
+                        android:gravity="end"
+                        android:padding="3dip"
+                        android:text="Label"
+                        android:textColor="@android:color/white"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/text_commit_content_label"
+                        android:padding="3dip"
+                        android:textColor="@android:color/white" />
+                </TableRow>
+
+                <TableRow>
+
+                    <TextView
+                        android:layout_column="1"
+                        android:gravity="end"
+                        android:padding="3dip"
+                        android:text="URI"
+                        android:textColor="@android:color/white"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/text_commit_content_content_uri"
+                        android:padding="3dip"
+                        android:textColor="@android:color/white" />
+                </TableRow>
+
+                <TableRow>
+
+                    <TextView
+                        android:layout_column="1"
+                        android:gravity="end"
+                        android:padding="3dip"
+                        android:text="Link"
+                        android:textColor="@android:color/white"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/text_commit_content_link_uri"
+                        android:padding="3dip"
+                        android:textColor="@android:color/white" />
+                </TableRow>
+
+                <TableRow>
+
+                    <TextView
+                        android:layout_column="1"
+                        android:gravity="end"
+                        android:padding="3dip"
+                        android:text="Flags"
+                        android:textColor="@android:color/white"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/text_commit_content_link_flags"
+                        android:padding="3dip"
+                        android:textColor="@android:color/white" />
+                </TableRow>
+            </TableLayout>
+        </HorizontalScrollView>
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:fadeScrollbars="false"
+            android:scrollbars="vertical">
+
+            <LinearLayout
+                android:id="@+id/commit_content_sample_edit_boxes"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical" />
+        </ScrollView>
+
+    </LinearLayout>
+
+</FrameLayout>
diff --git a/samples/browseable/CommitContentSampleApp/res/mipmap-hdpi/ic_launcher.png b/samples/browseable/CommitContentSampleApp/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..cde69bccc
--- /dev/null
+++ b/samples/browseable/CommitContentSampleApp/res/mipmap-hdpi/ic_launcher.png
diff --git a/samples/browseable/CommitContentSampleApp/res/mipmap-mdpi/ic_launcher.png b/samples/browseable/CommitContentSampleApp/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..c133a0cbd
--- /dev/null
+++ b/samples/browseable/CommitContentSampleApp/res/mipmap-mdpi/ic_launcher.png
diff --git a/samples/browseable/CommitContentSampleApp/res/mipmap-xhdpi/ic_launcher.png b/samples/browseable/CommitContentSampleApp/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..bfa42f0e7
--- /dev/null
+++ b/samples/browseable/CommitContentSampleApp/res/mipmap-xhdpi/ic_launcher.png
diff --git a/samples/browseable/CommitContentSampleApp/res/mipmap-xxhdpi/ic_launcher.png b/samples/browseable/CommitContentSampleApp/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..324e72cdd
--- /dev/null
+++ b/samples/browseable/CommitContentSampleApp/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/samples/browseable/CommitContentSampleApp/res/mipmap-xxxhdpi/ic_launcher.png b/samples/browseable/CommitContentSampleApp/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..aee44e138
--- /dev/null
+++ b/samples/browseable/CommitContentSampleApp/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/samples/browseable/CommitContentSampleApp/res/values/colors.xml b/samples/browseable/CommitContentSampleApp/res/values/colors.xml
new file mode 100644
index 000000000..3ab3e9cbc
--- /dev/null
+++ b/samples/browseable/CommitContentSampleApp/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/samples/browseable/CommitContentSampleApp/res/values/strings.xml b/samples/browseable/CommitContentSampleApp/res/values/strings.xml
new file mode 100644
index 000000000..5bcf8eab3
--- /dev/null
+++ b/samples/browseable/CommitContentSampleApp/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">CommitContentSampleApp</string>
+</resources>
diff --git a/samples/browseable/CommitContentSampleApp/res/values/styles.xml b/samples/browseable/CommitContentSampleApp/res/values/styles.xml
new file mode 100644
index 000000000..5885930df
--- /dev/null
+++ b/samples/browseable/CommitContentSampleApp/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/samples/browseable/CommitContentSampleApp/src/com.example.android.commitcontent.app/MainActivity.java b/samples/browseable/CommitContentSampleApp/src/com.example.android.commitcontent.app/MainActivity.java
new file mode 100644
index 000000000..72a5378f4
--- /dev/null
+++ b/samples/browseable/CommitContentSampleApp/src/com.example.android.commitcontent.app/MainActivity.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright (C) 2016 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
+ */
+
+package com.example.android.commitcontent.app;
+
+import android.support.v13.view.inputmethod.EditorInfoCompat;
+import android.support.v13.view.inputmethod.InputConnectionCompat;
+import android.support.v13.view.inputmethod.InputContentInfoCompat;
+
+import android.app.Activity;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.webkit.WebView;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class MainActivity extends Activity {
+    private static final String INPUT_CONTENT_INFO_KEY = "COMMIT_CONTENT_INPUT_CONTENT_INFO";
+    private static final String COMMIT_CONTENT_FLAGS_KEY = "COMMIT_CONTENT_FLAGS";
+
+    private static String TAG = "CommitContentSupport";
+
+    private WebView mWebView;
+    private TextView mLabel;
+    private TextView mContentUri;
+    private TextView mLinkUri;
+    private TextView mMimeTypes;
+    private TextView mFlags;
+
+    private InputContentInfoCompat mCurrentInputContentInfo;
+    private int mCurrentFlags;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.commit_content);
+
+        final LinearLayout layout =
+                (LinearLayout) findViewById(R.id.commit_content_sample_edit_boxes);
+
+        // This declares that the IME cannot commit any content with
+        // InputConnectionCompat#commitContent().
+        layout.addView(createEditTextWithContentMimeTypes(null));
+
+        // This declares that the IME can commit contents with
+        // InputConnectionCompat#commitContent() if they match "image/gif".
+        layout.addView(createEditTextWithContentMimeTypes(new String[]{"image/gif"}));
+
+        // This declares that the IME can commit contents with
+        // InputConnectionCompat#commitContent() if they match "image/png".
+        layout.addView(createEditTextWithContentMimeTypes(new String[]{"image/png"}));
+
+        // This declares that the IME can commit contents with
+        // InputConnectionCompat#commitContent() if they match "image/jpeg".
+        layout.addView(createEditTextWithContentMimeTypes(new String[]{"image/jpeg"}));
+
+        // This declares that the IME can commit contents with
+        // InputConnectionCompat#commitContent() if they match "image/webp".
+        layout.addView(createEditTextWithContentMimeTypes(new String[]{"image/webp"}));
+
+        // This declares that the IME can commit contents with
+        // InputConnectionCompat#commitContent() if they match "image/png", "image/gif",
+        // "image/jpeg", or "image/webp".
+        layout.addView(createEditTextWithContentMimeTypes(
+                new String[]{"image/png", "image/gif", "image/jpeg", "image/webp"}));
+
+        mWebView = (WebView) findViewById(R.id.commit_content_webview);
+        mMimeTypes = (TextView) findViewById(R.id.text_commit_content_mime_types);
+        mLabel = (TextView) findViewById(R.id.text_commit_content_label);
+        mContentUri = (TextView) findViewById(R.id.text_commit_content_content_uri);
+        mLinkUri = (TextView) findViewById(R.id.text_commit_content_link_uri);
+        mFlags = (TextView) findViewById(R.id.text_commit_content_link_flags);
+
+        if (savedInstanceState != null) {
+            final InputContentInfoCompat previousInputContentInfo = InputContentInfoCompat.wrap(
+                    savedInstanceState.getParcelable(INPUT_CONTENT_INFO_KEY));
+            final int previousFlags = savedInstanceState.getInt(COMMIT_CONTENT_FLAGS_KEY);
+            if (previousInputContentInfo != null) {
+                onCommitContentInternal(previousInputContentInfo, previousFlags);
+            }
+        }
+    }
+
+    private boolean onCommitContent(InputContentInfoCompat inputContentInfo, int flags,
+            Bundle opts, String[] contentMimeTypes) {
+        // Clear the temporary permission (if any).  See below about why we do this here.
+        try {
+            if (mCurrentInputContentInfo != null) {
+                mCurrentInputContentInfo.releasePermission();
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "InputContentInfoCompat#releasePermission() failed.", e);
+        } finally {
+            mCurrentInputContentInfo = null;
+        }
+
+        mWebView.loadUrl("about:blank");
+        mMimeTypes.setText("");
+        mContentUri.setText("");
+        mLabel.setText("");
+        mLinkUri.setText("");
+        mFlags.setText("");
+
+        boolean supported = false;
+        for (final String mimeType : contentMimeTypes) {
+            if (inputContentInfo.getDescription().hasMimeType(mimeType)) {
+                supported = true;
+                break;
+            }
+        }
+        if (!supported) {
+            return false;
+        }
+
+        return onCommitContentInternal(inputContentInfo, flags);
+    }
+
+    private boolean onCommitContentInternal(InputContentInfoCompat inputContentInfo, int flags) {
+        if ((flags & InputConnectionCompat.INPUT_CONTENT_GRANT_READ_URI_PERMISSION) != 0) {
+            try {
+                inputContentInfo.requestPermission();
+            } catch (Exception e) {
+                Log.e(TAG, "InputContentInfoCompat#requestPermission() failed.", e);
+                return false;
+            }
+        }
+
+        mMimeTypes.setText(
+                Arrays.toString(inputContentInfo.getDescription().filterMimeTypes("*/*")));
+        mContentUri.setText(inputContentInfo.getContentUri().toString());
+        mLabel.setText(inputContentInfo.getDescription().getLabel());
+        Uri linkUri = inputContentInfo.getLinkUri();
+        mLinkUri.setText(linkUri != null ? linkUri.toString() : "null");
+        mFlags.setText(flagsToString(flags));
+        mWebView.loadUrl(inputContentInfo.getContentUri().toString());
+        mWebView.setBackgroundColor(Color.TRANSPARENT);
+
+        // Due to the asynchronous nature of WebView, it is a bit too early to call
+        // inputContentInfo.releasePermission() here. Hence we call IC#releasePermission() when this
+        // method is called next time.  Note that calling IC#releasePermission() is just to be a
+        // good citizen. Even if we failed to call that method, the system would eventually revoke
+        // the permission sometime after inputContentInfo object gets garbage-collected.
+        mCurrentInputContentInfo = inputContentInfo;
+        mCurrentFlags = flags;
+
+        return true;
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle savedInstanceState) {
+        if (mCurrentInputContentInfo != null) {
+            savedInstanceState.putParcelable(INPUT_CONTENT_INFO_KEY,
+                    (Parcelable) mCurrentInputContentInfo.unwrap());
+            savedInstanceState.putInt(COMMIT_CONTENT_FLAGS_KEY, mCurrentFlags);
+        }
+        mCurrentInputContentInfo = null;
+        mCurrentFlags = 0;
+        super.onSaveInstanceState(savedInstanceState);
+    }
+
+    /**
+     * Creates a new instance of {@link EditText} that is configured to specify the given content
+     * MIME types to EditorInfo#contentMimeTypes so that developers can locally test how the current
+     * input method behaves for such content MIME types.
+     *
+     * @param contentMimeTypes A {@link String} array that indicates the supported content MIME
+     *                         types
+     * @return a new instance of {@link EditText}, which specifies EditorInfo#contentMimeTypes with
+     * the given content MIME types
+     */
+    private EditText createEditTextWithContentMimeTypes(String[] contentMimeTypes) {
+        final CharSequence hintText;
+        final String[] mimeTypes;  // our own copy of contentMimeTypes.
+        if (contentMimeTypes == null || contentMimeTypes.length == 0) {
+            hintText = "MIME: []";
+            mimeTypes = new String[0];
+        } else {
+            hintText = "MIME: " + Arrays.toString(contentMimeTypes);
+            mimeTypes = Arrays.copyOf(contentMimeTypes, contentMimeTypes.length);
+        }
+        EditText exitText = new EditText(this) {
+            @Override
+            public InputConnection onCreateInputConnection(EditorInfo editorInfo) {
+                final InputConnection ic = super.onCreateInputConnection(editorInfo);
+                EditorInfoCompat.setContentMimeTypes(editorInfo, mimeTypes);
+                final InputConnectionCompat.OnCommitContentListener callback =
+                        new InputConnectionCompat.OnCommitContentListener() {
+                            @Override
+                            public boolean onCommitContent(InputContentInfoCompat inputContentInfo,
+                                    int flags, Bundle opts) {
+                                return MainActivity.this.onCommitContent(
+                                        inputContentInfo, flags, opts, mimeTypes);
+                            }
+                        };
+                return InputConnectionCompat.createWrapper(ic, editorInfo, callback);
+            }
+        };
+        exitText.setHint(hintText);
+        exitText.setTextColor(Color.WHITE);
+        exitText.setHintTextColor(Color.WHITE);
+        return exitText;
+    }
+
+    /**
+     * Converts {@code flags} specified in {@link InputConnectionCompat#commitContent(
+     * InputConnection, EditorInfo, InputContentInfoCompat, int, Bundle)} to a human readable
+     * string.
+     *
+     * @param flags the 2nd parameter of
+     *              {@link InputConnectionCompat#commitContent(InputConnection, EditorInfo,
+     *              InputContentInfoCompat, int, Bundle)}
+     * @return a human readable string that corresponds to the given {@code flags}
+     */
+    private static String flagsToString(int flags) {
+        final ArrayList<String> tokens = new ArrayList<>();
+        if ((flags & InputConnectionCompat.INPUT_CONTENT_GRANT_READ_URI_PERMISSION) != 0) {
+            tokens.add("INPUT_CONTENT_GRANT_READ_URI_PERMISSION");
+            flags &= ~InputConnectionCompat.INPUT_CONTENT_GRANT_READ_URI_PERMISSION;
+        }
+        if (flags != 0) {
+            tokens.add("0x" + Integer.toHexString(flags));
+        }
+        return TextUtils.join(" | ", tokens);
+    }
+
+}
diff --git a/samples/browseable/CommitContentSampleIME/AndroidManifest.xml b/samples/browseable/CommitContentSampleIME/AndroidManifest.xml
new file mode 100644
index 000000000..f9891ffcb
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.android.commitcontent.ime">
+
+    <application
+        android:allowBackup="false"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+
+        <service
+            android:name="com.example.android.commitcontent.ime.ImageKeyboard"
+            android:permission="android.permission.BIND_INPUT_METHOD">
+            <intent-filter>
+                <action android:name="android.view.InputMethod" />
+            </intent-filter>
+            <meta-data android:name="android.view.im" android:resource="@xml/method" />
+        </service>
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="com.example.android.commitcontent.ime.inputcontent"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/samples/browseable/CommitContentSampleIME/_index.jd b/samples/browseable/CommitContentSampleIME/_index.jd
new file mode 100644
index 000000000..2885fc1ea
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/_index.jd
@@ -0,0 +1,11 @@
+
+page.tags="CommitContentSampleIME"
+sample.group=Input
+@jd:body
+
+<p>
+            
+                This sample demonstrates how to write an keyboard which sends rich content
+                (such as images) to text fields using the Commit Content API.
+            
+        </p>
diff --git a/samples/browseable/CommitContentSampleIME/res/mipmap-hdpi/ic_launcher.png b/samples/browseable/CommitContentSampleIME/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..cde69bccc
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/res/mipmap-hdpi/ic_launcher.png
diff --git a/samples/browseable/CommitContentSampleIME/res/mipmap-mdpi/ic_launcher.png b/samples/browseable/CommitContentSampleIME/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..c133a0cbd
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/res/mipmap-mdpi/ic_launcher.png
diff --git a/samples/browseable/CommitContentSampleIME/res/mipmap-xhdpi/ic_launcher.png b/samples/browseable/CommitContentSampleIME/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..bfa42f0e7
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/res/mipmap-xhdpi/ic_launcher.png
diff --git a/samples/browseable/CommitContentSampleIME/res/mipmap-xxhdpi/ic_launcher.png b/samples/browseable/CommitContentSampleIME/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..324e72cdd
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/samples/browseable/CommitContentSampleIME/res/mipmap-xxxhdpi/ic_launcher.png b/samples/browseable/CommitContentSampleIME/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..aee44e138
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/samples/browseable/CommitContentSampleIME/res/raw/animated_gif.gif b/samples/browseable/CommitContentSampleIME/res/raw/animated_gif.gif
new file mode 100644
index 000000000..51baf1586
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/res/raw/animated_gif.gif
diff --git a/samples/browseable/CommitContentSampleIME/res/raw/animated_webp.webp b/samples/browseable/CommitContentSampleIME/res/raw/animated_webp.webp
new file mode 100644
index 000000000..d753a1b02
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/res/raw/animated_webp.webp
diff --git a/samples/browseable/CommitContentSampleIME/res/raw/dessert_android.png b/samples/browseable/CommitContentSampleIME/res/raw/dessert_android.png
new file mode 100644
index 000000000..2b47c1900
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/res/raw/dessert_android.png
diff --git a/samples/browseable/CommitContentSampleIME/res/values/colors.xml b/samples/browseable/CommitContentSampleIME/res/values/colors.xml
new file mode 100644
index 000000000..576656b91
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/res/values/colors.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2016, 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>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/samples/browseable/CommitContentSampleIME/res/values/strings.xml b/samples/browseable/CommitContentSampleIME/res/values/strings.xml
new file mode 100644
index 000000000..952f8731d
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/res/values/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2016, 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">CommitContentSampleIme</string>
+</resources>
diff --git a/samples/browseable/CommitContentSampleIME/res/values/styles.xml b/samples/browseable/CommitContentSampleIME/res/values/styles.xml
new file mode 100644
index 000000000..4655b40de
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/res/values/styles.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2016, 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>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/samples/browseable/CommitContentSampleIME/res/xml/file_paths.xml b/samples/browseable/CommitContentSampleIME/res/xml/file_paths.xml
new file mode 100644
index 000000000..63ac52afd
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/res/xml/file_paths.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2016, 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.
+ */
+-->
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <files-path name="my_images" path="images/"/>
+</paths>
diff --git a/samples/browseable/CommitContentSampleIME/res/xml/method.xml b/samples/browseable/CommitContentSampleIME/res/xml/method.xml
new file mode 100644
index 000000000..defe3e31a
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/res/xml/method.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2016, 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.
+ */
+-->
+<input-method xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/samples/browseable/CommitContentSampleIME/src/com.example.android.commitcontent.ime/ImageKeyboard.java b/samples/browseable/CommitContentSampleIME/src/com.example.android.commitcontent.ime/ImageKeyboard.java
new file mode 100644
index 000000000..eb5dae7af
--- /dev/null
+++ b/samples/browseable/CommitContentSampleIME/src/com.example.android.commitcontent.ime/ImageKeyboard.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+package com.example.android.commitcontent.ime;
+
+import android.app.AppOpsManager;
+import android.content.ClipDescription;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.inputmethodservice.InputMethodService;
+import android.net.Uri;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.RawRes;
+import android.support.v13.view.inputmethod.EditorInfoCompat;
+import android.support.v13.view.inputmethod.InputConnectionCompat;
+import android.support.v13.view.inputmethod.InputContentInfoCompat;
+import android.support.v4.content.FileProvider;
+import android.util.Log;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputBinding;
+import android.view.inputmethod.InputConnection;
+import android.widget.Button;
+import android.widget.LinearLayout;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+
+public class ImageKeyboard extends InputMethodService {
+
+    private static final String TAG = "ImageKeyboard";
+    private static final String AUTHORITY = "com.example.android.supportv13.sampleime.inputcontent";
+    private static final String MIME_TYPE_GIF = "image/gif";
+    private static final String MIME_TYPE_PNG = "image/png";
+    private static final String MIME_TYPE_WEBP = "image/webp";
+
+    private File mPngFile;
+    private File mGifFile;
+    private File mWebpFile;
+    private Button mGifButton;
+    private Button mPngButton;
+    private Button mWebpButton;
+
+    private boolean isCommitContentSupported(
+            @Nullable EditorInfo editorInfo, @NonNull String mimeType) {
+        if (editorInfo == null) {
+            return false;
+        }
+
+        final InputConnection ic = getCurrentInputConnection();
+        if (ic == null) {
+            return false;
+        }
+
+        if (!validatePackageName(editorInfo)) {
+            return false;
+        }
+
+        final String[] supportedMimeTypes = EditorInfoCompat.getContentMimeTypes(editorInfo);
+        for (String supportedMimeType : supportedMimeTypes) {
+            if (ClipDescription.compareMimeTypes(mimeType, supportedMimeType)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void doCommitContent(@NonNull String description, @NonNull String mimeType,
+            @NonNull File file) {
+        final EditorInfo editorInfo = getCurrentInputEditorInfo();
+
+        // Validate packageName again just in case.
+        if (!validatePackageName(editorInfo)) {
+            return;
+        }
+
+        final Uri contentUri = FileProvider.getUriForFile(this, AUTHORITY, file);
+
+        // As you as an IME author are most likely to have to implement your own content provider
+        // to support CommitContent API, it is important to have a clear spec about what
+        // applications are going to be allowed to access the content that your are going to share.
+        final int flag;
+        if (Build.VERSION.SDK_INT >= 25) {
+            // On API 25 and later devices, as an analogy of Intent.FLAG_GRANT_READ_URI_PERMISSION,
+            // you can specify InputConnectionCompat.INPUT_CONTENT_GRANT_READ_URI_PERMISSION to give
+            // a temporary read access to the recipient application without exporting your content
+            // provider.
+            flag = InputConnectionCompat.INPUT_CONTENT_GRANT_READ_URI_PERMISSION;
+        } else {
+            // On API 24 and prior devices, we cannot rely on
+            // InputConnectionCompat.INPUT_CONTENT_GRANT_READ_URI_PERMISSION. You as an IME author
+            // need to decide what access control is needed (or not needed) for content URIs that
+            // you are going to expose. This sample uses Context.grantUriPermission(), but you can
+            // implement your own mechanism that satisfies your own requirements.
+            flag = 0;
+            try {
+                // TODO: Use revokeUriPermission to revoke as needed.
+                grantUriPermission(
+                        editorInfo.packageName, contentUri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            } catch (Exception e){
+                Log.e(TAG, "grantUriPermission failed packageName=" + editorInfo.packageName
+                        + " contentUri=" + contentUri, e);
+            }
+        }
+
+        final InputContentInfoCompat inputContentInfoCompat = new InputContentInfoCompat(
+                contentUri,
+                new ClipDescription(description, new String[]{mimeType}),
+                null /* linkUrl */);
+        InputConnectionCompat.commitContent(
+                getCurrentInputConnection(), getCurrentInputEditorInfo(), inputContentInfoCompat,
+                flag, null);
+    }
+
+    private boolean validatePackageName(@Nullable EditorInfo editorInfo) {
+        if (editorInfo == null) {
+            return false;
+        }
+        final String packageName = editorInfo.packageName;
+        if (packageName == null) {
+            return false;
+        }
+
+        // In Android L MR-1 and prior devices, EditorInfo.packageName is not a reliable identifier
+        // of the target application because:
+        //   1. the system does not verify it [1]
+        //   2. InputMethodManager.startInputInner() had filled EditorInfo.packageName with
+        //      view.getContext().getPackageName() [2]
+        // [1]: https://android.googlesource.com/platform/frameworks/base/+/a0f3ad1b5aabe04d9eb1df8bad34124b826ab641
+        // [2]: https://android.googlesource.com/platform/frameworks/base/+/02df328f0cd12f2af87ca96ecf5819c8a3470dc8
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            return true;
+        }
+
+        final InputBinding inputBinding = getCurrentInputBinding();
+        if (inputBinding == null) {
+            // Due to b.android.com/225029, it is possible that getCurrentInputBinding() returns
+            // null even after onStartInputView() is called.
+            // TODO: Come up with a way to work around this bug....
+            Log.e(TAG, "inputBinding should not be null here. "
+                    + "You are likely to be hitting b.android.com/225029");
+            return false;
+        }
+        final int packageUid = inputBinding.getUid();
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            final AppOpsManager appOpsManager =
+                    (AppOpsManager) getSystemService(Context.APP_OPS_SERVICE);
+            try {
+                appOpsManager.checkPackage(packageUid, packageName);
+            } catch (Exception e) {
+                return false;
+            }
+            return true;
+        }
+
+        final PackageManager packageManager = getPackageManager();
+        final String possiblePackageNames[] = packageManager.getPackagesForUid(packageUid);
+        for (final String possiblePackageName : possiblePackageNames) {
+            if (packageName.equals(possiblePackageName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        // TODO: Avoid file I/O in the main thread.
+        final File imagesDir = new File(getFilesDir(), "images");
+        imagesDir.mkdirs();
+        mGifFile = getFileForResource(this, R.raw.animated_gif, imagesDir, "image.gif");
+        mPngFile = getFileForResource(this, R.raw.dessert_android, imagesDir, "image.png");
+        mWebpFile = getFileForResource(this, R.raw.animated_webp, imagesDir, "image.webp");
+    }
+
+    @Override
+    public View onCreateInputView() {
+        mGifButton = new Button(this);
+        mGifButton.setText("Insert GIF");
+        mGifButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ImageKeyboard.this.doCommitContent("A waving flag", MIME_TYPE_GIF, mGifFile);
+            }
+        });
+
+        mPngButton = new Button(this);
+        mPngButton.setText("Insert PNG");
+        mPngButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ImageKeyboard.this.doCommitContent("A droid logo", MIME_TYPE_PNG, mPngFile);
+            }
+        });
+
+        mWebpButton = new Button(this);
+        mWebpButton.setText("Insert WebP");
+        mWebpButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ImageKeyboard.this.doCommitContent(
+                        "Android N recovery animation", MIME_TYPE_WEBP, mWebpFile);
+            }
+        });
+
+        final LinearLayout layout = new LinearLayout(this);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        layout.addView(mGifButton);
+        layout.addView(mPngButton);
+        layout.addView(mWebpButton);
+        return layout;
+    }
+
+    @Override
+    public boolean onEvaluateFullscreenMode() {
+        // In full-screen mode the inserted content is likely to be hidden by the IME. Hence in this
+        // sample we simply disable full-screen mode.
+        return false;
+    }
+
+    @Override
+    public void onStartInputView(EditorInfo info, boolean restarting) {
+        mGifButton.setEnabled(mGifFile != null && isCommitContentSupported(info, MIME_TYPE_GIF));
+        mPngButton.setEnabled(mPngFile != null && isCommitContentSupported(info, MIME_TYPE_PNG));
+        mWebpButton.setEnabled(mWebpFile != null && isCommitContentSupported(info, MIME_TYPE_WEBP));
+    }
+
+    private static File getFileForResource(
+            @NonNull Context context, @RawRes int res, @NonNull File outputDir,
+            @NonNull String filename) {
+        final File outputFile = new File(outputDir, filename);
+        final byte[] buffer = new byte[4096];
+        InputStream resourceReader = null;
+        try {
+            try {
+                resourceReader = context.getResources().openRawResource(res);
+                OutputStream dataWriter = null;
+                try {
+                    dataWriter = new FileOutputStream(outputFile);
+                    while (true) {
+                        final int numRead = resourceReader.read(buffer);
+                        if (numRead <= 0) {
+                            break;
+                        }
+                        dataWriter.write(buffer, 0, numRead);
+                    }
+                    return outputFile;
+                } finally {
+                    if (dataWriter != null) {
+                        dataWriter.flush();
+                        dataWriter.close();
+                    }
+                }
+            } finally {
+                if (resourceReader != null) {
+                    resourceReader.close();
+                }
+            }
+        } catch (IOException e) {
+            return null;
+        }
+    }
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/AndroidManifest.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/AndroidManifest.xml
new file mode 100644
index 000000000..453cd6c5f
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/AndroidManifest.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+     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.
+-->
+
+<manifest package="com.example.android.dragsource"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <application
+        android:icon="@mipmap/ic_launcher"
+        android:label="DragSource Sample">
+        <activity android:name="com.example.android.dragsource.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <!--
+        A content provider that serves selected files. Images are copied and added to this provider
+        in DragSourceFragment where they are displayed and made available for drag and drop. -->
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="com.example.android.dragsource.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
+    </application>
+</manifest>
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable-hdpi/tile.9.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable-hdpi/tile.9.png
new file mode 100644
index 000000000..135862883
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable-hdpi/tile.9.png
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable/image1.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable/image1.png
new file mode 100644
index 000000000..c460737c0
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable/image1.png
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable/image2.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable/image2.png
new file mode 100644
index 000000000..9d07a1b75
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/drawable/image2.png
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout-w720dp/activity_main.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout-w720dp/activity_main.xml
new file mode 100755
index 000000000..efc54b70b
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout-w720dp/activity_main.xml
@@ -0,0 +1,72 @@
+<!--
+  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.
+  -->
+<LinearLayout android:id="@+id/sample_main_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+
+    <LinearLayout
+        android:id="@+id/sample_output"
+        android:layout_width="0px"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <FrameLayout
+            style="@style/Widget.SampleMessageTile"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                style="@style/Widget.SampleMessage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingBottom="@dimen/margin_large"
+                android:paddingLeft="@dimen/margin_medium"
+                android:paddingRight="@dimen/margin_medium"
+                android:paddingTop="@dimen/margin_large"
+                android:text="@string/intro_message" />
+        </FrameLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@android:color/darker_gray" />
+
+        <fragment
+            android:id="@+id/log_fragment"
+            android:name="com.example.android.common.logger.LogFragment"
+            android:layout_width="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:background="@android:color/darker_gray" />
+
+    <FrameLayout
+        android:id="@+id/sample_content_fragment"
+        android:layout_width="0px"
+        android:layout_height="match_parent"
+        android:layout_weight="2" />
+
+</LinearLayout>
+
+
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout/activity_main.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout/activity_main.xml
new file mode 100755
index 000000000..17bc911a8
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout/activity_main.xml
@@ -0,0 +1,64 @@
+<!--
+  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.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/sample_main_layout">
+
+    <ViewAnimator
+        android:id="@+id/sample_output"
+        android:layout_width="match_parent"
+        android:layout_height="0px"
+        android:layout_weight="1">
+
+        <ScrollView
+            style="@style/Widget.SampleMessageTile"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                style="@style/Widget.SampleMessage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/horizontal_page_margin"
+                android:paddingRight="@dimen/horizontal_page_margin"
+                android:paddingTop="@dimen/vertical_page_margin"
+                android:paddingBottom="@dimen/vertical_page_margin"
+                android:text="@string/intro_message" />
+        </ScrollView>
+
+        <fragment
+            android:name="com.example.android.common.logger.LogFragment"
+            android:id="@+id/log_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </ViewAnimator>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@android:color/darker_gray" />
+
+    <FrameLayout
+        android:id="@+id/sample_content_fragment"
+        android:layout_weight="2"
+        android:layout_width="match_parent"
+        android:layout_height="0px" />
+
+</LinearLayout>
+
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout/fragment_dragsource.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout/fragment_dragsource.xml
new file mode 100644
index 000000000..a46ba0abb
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/layout/fragment_dragsource.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+     Copyright 2016 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.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/section_marginBottom"
+            android:layout_marginLeft="@dimen/section_marginLeft"
+            android:layout_marginRight="@dimen/section_marginRight"
+            android:layout_marginTop="@dimen/section_marginTop"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/image_one"
+                android:layout_width="@dimen/image_size"
+                android:layout_height="@dimen/image_size"
+                android:layout_margin="@dimen/image_margin"
+                android:background="@color/drag_inactive"
+                android:scaleType="centerCrop"
+                />
+
+            <ImageView
+                android:id="@+id/image_two"
+                android:layout_width="@dimen/image_size"
+                android:layout_height="@dimen/image_size"
+                android:layout_margin="@dimen/image_margin"
+                android:background="@color/drag_inactive"
+                android:scaleType="centerCrop"
+                 />
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/text_margin"
+            android:layout_marginBottom="@dimen/section_marginBottom"
+            android:text="@string/drag_instruction" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/section_marginBottom"
+            android:layout_marginLeft="@dimen/section_marginLeft"
+            android:layout_marginRight="@dimen/section_marginRight"
+            android:layout_marginTop="@dimen/section_marginTop"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/local_target"
+                android:layout_width="@dimen/image_size"
+                android:layout_height="@dimen/image_size"
+                android:layout_margin="@dimen/image_margin"
+                android:background="@color/drag_inactive"
+                android:pointerIcon="crosshair"
+                android:scaleType="centerCrop" />
+
+            <TextView
+                android:layout_width="@dimen/text_size"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/text_margin"
+                android:layout_weight="1"
+                android:text="Drop your image here." />
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+</ScrollView>
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/menu/main.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/menu/main.xml
new file mode 100644
index 000000000..480cafef6
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/menu/main.xml
@@ -0,0 +1,22 @@
+<!--
+  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.
+  -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_toggle_log"
+        android:showAsAction="always"
+        android:title="@string/sample_show_log" />
+</menu>
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-hdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..125edc6c0
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-hdpi/ic_launcher.png
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-mdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..00e2d797b
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-mdpi/ic_launcher.png
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xhdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..0d0d8ee6a
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xhdpi/ic_launcher.png
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xxhdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..a387e3c02
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xxxhdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..f33d5bb0c
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-sw600dp/template-dimens.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-sw600dp/template-dimens.xml
new file mode 100644
index 000000000..22074a2bd
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-sw600dp/template-dimens.xml
@@ -0,0 +1,24 @@
+<!--
+  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/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-sw600dp/template-styles.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-sw600dp/template-styles.xml
new file mode 100644
index 000000000..03d197418
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-sw600dp/template-styles.xml
@@ -0,0 +1,25 @@
+<!--
+  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/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-v11/template-styles.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-v11/template-styles.xml
new file mode 100644
index 000000000..8c1ea66f2
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-v11/template-styles.xml
@@ -0,0 +1,22 @@
+<!--
+  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/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-v21/base-colors.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-v21/base-colors.xml
new file mode 100644
index 000000000..b662ae2cb
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-v21/base-colors.xml
@@ -0,0 +1,20 @@
+<?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>
+
+
+</resources>
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-v21/base-template-styles.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-v21/base-template-styles.xml
new file mode 100644
index 000000000..d95b9b724
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values-v21/base-template-styles.xml
@@ -0,0 +1,22 @@
+<?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/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/colors.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/colors.xml
new file mode 100644
index 000000000..801e292dd
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/colors.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+     Copyright 2016 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>
+    <color name="drag_inactive">#ff888888</color>
+</resources>
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/dimen.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/dimen.xml
new file mode 100644
index 000000000..220d1b82b
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/dimen.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+     Copyright 2016 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>
+    <dimen name="section_marginTop">16dp</dimen>
+    <dimen name="section_marginBottom">0dp</dimen>
+    <dimen name="section_marginLeft">16dp</dimen>
+    <dimen name="section_marginRight">16dp</dimen>
+
+    <dimen name="image_size">80dp</dimen>
+    <dimen name="image_margin">16dp</dimen>
+
+    <dimen name="text_size">0dp</dimen>
+    <dimen name="text_margin">10dp</dimen>
+    <dimen name="checkbox_margin">6dp</dimen>
+</resources>
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/fragmentview_strings.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/fragmentview_strings.xml
new file mode 100755
index 000000000..7b9d9ec4f
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/fragmentview_strings.xml
@@ -0,0 +1,19 @@
+<!--
+  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="sample_show_log">Show Log</string>
+    <string name="sample_hide_log">Hide Log</string>
+</resources>
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/strings.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/strings.xml
new file mode 100644
index 000000000..f2ab0925b
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+     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.
+-->
+
+<resources>
+    <string name="drag_instruction">These images can be dragged to any app.\nTry dragging it to the area below.</string>
+    <string name="intro_message">This sample demonstrates drag and drop functionality and is the \'source\' app for this sample. It shows how data can be moved between views within an app or between different apps.\nTry dragging one of the images to the highlighted target in this app.\nOpen the \'DropTarget\' sample app next to this app and try dragging an image between the two apps.\nImages are served through a content provider. The target app must request permission to access the dropped content.</string>
+</resources>
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/template-dimens.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/template-dimens.xml
new file mode 100644
index 000000000..39e710b5c
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/template-dimens.xml
@@ -0,0 +1,32 @@
+<!--
+  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/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/template-styles.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/template-styles.xml
new file mode 100644
index 000000000..6e7d593dd
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/values/template-styles.xml
@@ -0,0 +1,42 @@
+<!--
+  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/samples/browseable/DragAndDropAcrossApps/DragSource/res/xml/file_paths.xml b/samples/browseable/DragAndDropAcrossApps/DragSource/res/xml/file_paths.xml
new file mode 100644
index 000000000..53c088759
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/res/xml/file_paths.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+     Copyright 2016 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.
+-->
+
+<paths>
+    <files-path name="my_images" path="images" />
+</paths>
\ No newline at end of file
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/activities/SampleActivityBase.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/activities/SampleActivityBase.java
new file mode 100644
index 000000000..db8962ef2
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/activities/SampleActivityBase.java
@@ -0,0 +1,52 @@
+/*
+* 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.
+*/
+
+package com.example.android.common.activities;
+
+import com.example.android.common.logger.Log;
+import com.example.android.common.logger.LogWrapper;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
+
+/**
+ * Base launcher activity, to handle most of the common plumbing for samples.
+ */
+public class SampleActivityBase extends FragmentActivity {
+
+    public static final String TAG = "SampleActivityBase";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        initializeLogging();
+    }
+
+    /** Set up targets to receive log data */
+    public void initializeLogging() {
+        // Using Log, front-end to the logging chain, emulates android.util.log method signatures.
+        // Wraps Android's native log framework
+        LogWrapper logWrapper = new LogWrapper();
+        Log.setLogNode(logWrapper);
+
+        Log.i(TAG, "Ready");
+    }
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/Log.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/Log.java
new file mode 100644
index 000000000..56dc2a956
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/Log.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright (C) 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.
+ */
+package com.example.android.common.logger;
+
+/**
+ * Helper class for a list (or tree) of LoggerNodes.
+ *
+ * <p>When this is set as the head of the list,
+ * an instance of it can function as a drop-in replacement for {@link android.util.Log}.
+ * Most of the methods in this class server only to map a method call in Log to its equivalent
+ * in LogNode.</p>
+ */
+public class Log {
+
+    // Grabbing the native values from Android's native logging facilities,
+    // to make for easy migration and interop.
+    public static final int NONE = -1;
+
+    public static final int VERBOSE = android.util.Log.VERBOSE;
+
+    public static final int DEBUG = android.util.Log.DEBUG;
+
+    public static final int INFO = android.util.Log.INFO;
+
+    public static final int WARN = android.util.Log.WARN;
+
+    public static final int ERROR = android.util.Log.ERROR;
+
+    public static final int ASSERT = android.util.Log.ASSERT;
+
+    // Stores the beginning of the LogNode topology.
+    private static LogNode mLogNode;
+
+    /**
+     * Returns the next LogNode in the linked list.
+     */
+    public static LogNode getLogNode() {
+        return mLogNode;
+    }
+
+    /**
+     * Sets the LogNode data will be sent to.
+     */
+    public static void setLogNode(LogNode node) {
+        mLogNode = node;
+    }
+
+    /**
+     * Instructs the LogNode to print the log data provided. Other LogNodes can
+     * be chained to the end of the LogNode as desired.
+     *
+     * @param priority Log level of the data being logged. Verbose, Error, etc.
+     * @param tag      Tag for for the log data. Can be used to organize log statements.
+     * @param msg      The actual message to be logged.
+     * @param tr       If an exception was thrown, this can be sent along for the logging
+     *                 facilities
+     *                 to extract and print useful information.
+     */
+    public static void println(int priority, String tag, String msg, Throwable tr) {
+        if (mLogNode != null) {
+            mLogNode.println(priority, tag, msg, tr);
+        }
+    }
+
+    /**
+     * Instructs the LogNode to print the log data provided. Other LogNodes can
+     * be chained to the end of the LogNode as desired.
+     *
+     * @param priority Log level of the data being logged. Verbose, Error, etc.
+     * @param tag      Tag for for the log data. Can be used to organize log statements.
+     * @param msg      The actual message to be logged. The actual message to be logged.
+     */
+    public static void println(int priority, String tag, String msg) {
+        println(priority, tag, msg, null);
+    }
+
+    /**
+     * Prints a message at VERBOSE priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     * @param tr  If an exception was thrown, this can be sent along for the logging facilities
+     *            to extract and print useful information.
+     */
+    public static void v(String tag, String msg, Throwable tr) {
+        println(VERBOSE, tag, msg, tr);
+    }
+
+    /**
+     * Prints a message at VERBOSE priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     */
+    public static void v(String tag, String msg) {
+        v(tag, msg, null);
+    }
+
+
+    /**
+     * Prints a message at DEBUG priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     * @param tr  If an exception was thrown, this can be sent along for the logging facilities
+     *            to extract and print useful information.
+     */
+    public static void d(String tag, String msg, Throwable tr) {
+        println(DEBUG, tag, msg, tr);
+    }
+
+    /**
+     * Prints a message at DEBUG priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     */
+    public static void d(String tag, String msg) {
+        d(tag, msg, null);
+    }
+
+    /**
+     * Prints a message at INFO priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     * @param tr  If an exception was thrown, this can be sent along for the logging facilities
+     *            to extract and print useful information.
+     */
+    public static void i(String tag, String msg, Throwable tr) {
+        println(INFO, tag, msg, tr);
+    }
+
+    /**
+     * Prints a message at INFO priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     */
+    public static void i(String tag, String msg) {
+        i(tag, msg, null);
+    }
+
+    /**
+     * Prints a message at WARN priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     * @param tr  If an exception was thrown, this can be sent along for the logging facilities
+     *            to extract and print useful information.
+     */
+    public static void w(String tag, String msg, Throwable tr) {
+        println(WARN, tag, msg, tr);
+    }
+
+    /**
+     * Prints a message at WARN priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     */
+    public static void w(String tag, String msg) {
+        w(tag, msg, null);
+    }
+
+    /**
+     * Prints a message at WARN priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param tr  If an exception was thrown, this can be sent along for the logging facilities
+     *            to extract and print useful information.
+     */
+    public static void w(String tag, Throwable tr) {
+        w(tag, null, tr);
+    }
+
+    /**
+     * Prints a message at ERROR priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     * @param tr  If an exception was thrown, this can be sent along for the logging facilities
+     *            to extract and print useful information.
+     */
+    public static void e(String tag, String msg, Throwable tr) {
+        println(ERROR, tag, msg, tr);
+    }
+
+    /**
+     * Prints a message at ERROR priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     */
+    public static void e(String tag, String msg) {
+        e(tag, msg, null);
+    }
+
+    /**
+     * Prints a message at ASSERT priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     * @param tr  If an exception was thrown, this can be sent along for the logging facilities
+     *            to extract and print useful information.
+     */
+    public static void wtf(String tag, String msg, Throwable tr) {
+        println(ASSERT, tag, msg, tr);
+    }
+
+    /**
+     * Prints a message at ASSERT priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     */
+    public static void wtf(String tag, String msg) {
+        wtf(tag, msg, null);
+    }
+
+    /**
+     * Prints a message at ASSERT priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param tr  If an exception was thrown, this can be sent along for the logging facilities
+     *            to extract and print useful information.
+     */
+    public static void wtf(String tag, Throwable tr) {
+        wtf(tag, null, tr);
+    }
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogFragment.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogFragment.java
new file mode 100644
index 000000000..2b9250694
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogFragment.java
@@ -0,0 +1,98 @@
+/*
+* 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.
+*/
+
+package com.example.android.common.logger;
+
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ScrollView;
+
+/**
+ * Simple fragment which contains a LogView and uses is to output log data it receives
+ * through the LogNode interface.
+ */
+public class LogFragment extends Fragment {
+
+    private LogView mLogView;
+
+    private ScrollView mScrollView;
+
+    public LogFragment() {
+    }
+
+    public View inflateViews() {
+        mScrollView = new ScrollView(getActivity());
+        ViewGroup.LayoutParams scrollParams = new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT);
+        mScrollView.setLayoutParams(scrollParams);
+
+        mLogView = new LogView(getActivity());
+        ViewGroup.LayoutParams logParams = new ViewGroup.LayoutParams(scrollParams);
+        logParams.height = ViewGroup.LayoutParams.WRAP_CONTENT;
+        mLogView.setLayoutParams(logParams);
+        mLogView.setClickable(true);
+        mLogView.setFocusable(true);
+        mLogView.setTypeface(Typeface.MONOSPACE);
+
+        // Want to set padding as 16 dips, setPadding takes pixels.  Hooray math!
+        int paddingDips = 16;
+        double scale = getResources().getDisplayMetrics().density;
+        int paddingPixels = (int) ((paddingDips * (scale)) + .5);
+        mLogView.setPadding(paddingPixels, paddingPixels, paddingPixels, paddingPixels);
+        mLogView.setCompoundDrawablePadding(paddingPixels);
+
+        mLogView.setGravity(Gravity.BOTTOM);
+        mLogView.setTextAppearance(getActivity(), android.R.style.TextAppearance_Holo_Medium);
+
+        mScrollView.addView(mLogView);
+        return mScrollView;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+
+        View result = inflateViews();
+
+        mLogView.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                mScrollView.fullScroll(ScrollView.FOCUS_DOWN);
+            }
+        });
+        return result;
+    }
+
+    public LogView getLogView() {
+        return mLogView;
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogNode.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogNode.java
new file mode 100644
index 000000000..0c922e0a1
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogNode.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+package com.example.android.common.logger;
+
+/**
+ * Basic interface for a logging system that can output to one or more targets.
+ * Note that in addition to classes that will output these logs in some format,
+ * one can also implement this interface over a filter and insert that in the chain,
+ * such that no targets further down see certain data, or see manipulated forms of the data.
+ * You could, for instance, write a "ToHtmlLoggerNode" that just converted all the log data
+ * it received to HTML and sent it along to the next node in the chain, without printing it
+ * anywhere.
+ */
+public interface LogNode {
+
+    /**
+     * Instructs first LogNode in the list to print the log data provided.
+     *
+     * @param priority Log level of the data being logged.  Verbose, Error, etc.
+     * @param tag      Tag for for the log data.  Can be used to organize log statements.
+     * @param msg      The actual message to be logged. The actual message to be logged.
+     * @param tr       If an exception was thrown, this can be sent along for the logging
+     *                 facilities
+     *                 to extract and print useful information.
+     */
+    public void println(int priority, String tag, String msg, Throwable tr);
+
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogView.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogView.java
new file mode 100644
index 000000000..f752f339d
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogView.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 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.
+ */
+package com.example.android.common.logger;
+
+import android.app.Activity;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+/**
+ * Simple TextView which is used to output log data received through the LogNode interface.
+ */
+public class LogView extends TextView implements LogNode {
+
+    public LogView(Context context) {
+        super(context);
+    }
+
+    public LogView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public LogView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    /**
+     * Formats the log data and prints it out to the LogView.
+     *
+     * @param priority Log level of the data being logged.  Verbose, Error, etc.
+     * @param tag      Tag for for the log data.  Can be used to organize log statements.
+     * @param msg      The actual message to be logged. The actual message to be logged.
+     * @param tr       If an exception was thrown, this can be sent along for the logging
+     *                 facilities
+     *                 to extract and print useful information.
+     */
+    @Override
+    public void println(int priority, String tag, String msg, Throwable tr) {
+
+        String priorityStr = null;
+
+        // For the purposes of this View, we want to print the priority as readable text.
+        switch (priority) {
+            case android.util.Log.VERBOSE:
+                priorityStr = "VERBOSE";
+                break;
+            case android.util.Log.DEBUG:
+                priorityStr = "DEBUG";
+                break;
+            case android.util.Log.INFO:
+                priorityStr = "INFO";
+                break;
+            case android.util.Log.WARN:
+                priorityStr = "WARN";
+                break;
+            case android.util.Log.ERROR:
+                priorityStr = "ERROR";
+                break;
+            case android.util.Log.ASSERT:
+                priorityStr = "ASSERT";
+                break;
+            default:
+                break;
+        }
+
+        // Handily, the Log class has a facility for converting a stack trace into a usable string.
+        String exceptionStr = null;
+        if (tr != null) {
+            exceptionStr = android.util.Log.getStackTraceString(tr);
+        }
+
+        // Take the priority, tag, message, and exception, and concatenate as necessary
+        // into one usable line of text.
+        final StringBuilder outputBuilder = new StringBuilder();
+
+        String delimiter = "\t";
+        appendIfNotNull(outputBuilder, priorityStr, delimiter);
+        appendIfNotNull(outputBuilder, tag, delimiter);
+        appendIfNotNull(outputBuilder, msg, delimiter);
+        appendIfNotNull(outputBuilder, exceptionStr, delimiter);
+
+        // In case this was originally called from an AsyncTask or some other off-UI thread,
+        // make sure the update occurs within the UI thread.
+        ((Activity) getContext()).runOnUiThread((new Thread(new Runnable() {
+            @Override
+            public void run() {
+                // Display the text we just generated within the LogView.
+                appendToLog(outputBuilder.toString());
+            }
+        })));
+
+        if (mNext != null) {
+            mNext.println(priority, tag, msg, tr);
+        }
+    }
+
+    public LogNode getNext() {
+        return mNext;
+    }
+
+    public void setNext(LogNode node) {
+        mNext = node;
+    }
+
+    /**
+     * Takes a string and adds to it, with a separator, if the bit to be added isn't null. Since
+     * the logger takes so many arguments that might be null, this method helps cut out some of the
+     * agonizing tedium of writing the same 3 lines over and over.
+     *
+     * @param source    StringBuilder containing the text to append to.
+     * @param addStr    The String to append
+     * @param delimiter The String to separate the source and appended strings. A tab or comma,
+     *                  for instance.
+     * @return The fully concatenated String as a StringBuilder
+     */
+    private StringBuilder appendIfNotNull(StringBuilder source, String addStr, String delimiter) {
+        if (addStr != null) {
+            if (addStr.length() == 0) {
+                delimiter = "";
+            }
+
+            return source.append(addStr).append(delimiter);
+        }
+        return source;
+    }
+
+    // The next LogNode in the chain.
+    LogNode mNext;
+
+    /** Outputs the string as a new line of log data in the LogView. */
+    public void appendToLog(String s) {
+        append("\n" + s);
+    }
+
+
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogWrapper.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogWrapper.java
new file mode 100644
index 000000000..cacf16217
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/LogWrapper.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+package com.example.android.common.logger;
+
+import android.util.Log;
+
+/**
+ * Helper class which wraps Android's native Log utility in the Logger interface.  This way
+ * normal DDMS output can be one of the many targets receiving and outputting logs simultaneously.
+ */
+public class LogWrapper implements LogNode {
+
+    // For piping:  The next node to receive Log data after this one has done its work.
+    private LogNode mNext;
+
+    /**
+     * Returns the next LogNode in the linked list.
+     */
+    public LogNode getNext() {
+        return mNext;
+    }
+
+    /**
+     * Sets the LogNode data will be sent to..
+     */
+    public void setNext(LogNode node) {
+        mNext = node;
+    }
+
+    /**
+     * Prints data out to the console using Android's native log mechanism.
+     *
+     * @param priority Log level of the data being logged.  Verbose, Error, etc.
+     * @param tag      Tag for for the log data.  Can be used to organize log statements.
+     * @param msg      The actual message to be logged. The actual message to be logged.
+     * @param tr       If an exception was thrown, this can be sent along for the logging
+     *                 facilities
+     *                 to extract and print useful information.
+     */
+    @Override
+    public void println(int priority, String tag, String msg, Throwable tr) {
+        // There actually are log methods that don't take a msg parameter.  For now,
+        // if that's the case, just convert null to the empty string and move on.
+        String useMsg = msg;
+        if (useMsg == null) {
+            useMsg = "";
+        }
+
+        // If an exeption was provided, convert that exception to a usable string and attach
+        // it to the end of the msg method.
+        if (tr != null) {
+            msg += "\n" + Log.getStackTraceString(tr);
+        }
+
+        // This is functionally identical to Log.x(tag, useMsg);
+        // For instance, if priority were Log.VERBOSE, this would be the same as Log.v(tag, useMsg)
+        Log.println(priority, tag, useMsg);
+
+        // If this isn't the last node in the chain, move things along.
+        if (mNext != null) {
+            mNext.println(priority, tag, msg, tr);
+        }
+    }
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/MessageOnlyLogFilter.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/MessageOnlyLogFilter.java
new file mode 100644
index 000000000..bc3817425
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/common/logger/MessageOnlyLogFilter.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 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.
+ */
+package com.example.android.common.logger;
+
+/**
+ * Simple {@link LogNode} filter, removes everything except the message.
+ * Useful for situations like on-screen log output where you don't want a lot of metadata
+ * displayed,
+ * just easy-to-read message updates as they're happening.
+ */
+public class MessageOnlyLogFilter implements LogNode {
+
+    LogNode mNext;
+
+    /**
+     * Takes the "next" LogNode as a parameter, to simplify chaining.
+     *
+     * @param next The next LogNode in the pipeline.
+     */
+    public MessageOnlyLogFilter(LogNode next) {
+        mNext = next;
+    }
+
+    public MessageOnlyLogFilter() {
+    }
+
+    @Override
+    public void println(int priority, String tag, String msg, Throwable tr) {
+        if (mNext != null) {
+            getNext().println(Log.NONE, null, msg, null);
+        }
+    }
+
+    /**
+     * Returns the next LogNode in the chain.
+     */
+    public LogNode getNext() {
+        return mNext;
+    }
+
+    /**
+     * Sets the LogNode data will be sent to..
+     */
+    public void setNext(LogNode node) {
+        mNext = node;
+    }
+
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/DragSourceFragment.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/DragSourceFragment.java
new file mode 100644
index 000000000..5b92fc997
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/DragSourceFragment.java
@@ -0,0 +1,237 @@
+/*
+ * 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.
+*/
+
+package com.example.android.dragsource;
+
+import com.example.android.common.logger.Log;
+
+import android.content.ClipData;
+import android.content.ClipDescription;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Point;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.support.annotation.Nullable;
+import android.support.v13.view.DragStartHelper;
+import android.support.v4.app.Fragment;
+import android.support.v4.content.FileProvider;
+import android.view.DragEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Date;
+
+
+/**
+ * This sample demonstrates data can be moved between views within the app or between different
+ * apps via drag and drop.
+ * <p>This is the source app for the drag and drop sample. This app contains several
+ * {@link android.widget.ImageView} widgets which can be a drag source. Images can be dropped
+ * to a drop target area within the same app or in the DropTarget app (a separate app in this
+ * sample).
+ * <p>
+ * There is also one {@link android.widget.EditText} widget that can be a drag source (no extra
+ * setup is necessary).
+ * <p/>
+ * To enable cross application drag and drop, the {@link android.view.View#DRAG_FLAG_GLOBAL}
+ * permission needs to be passed to the {@link android.view.View#startDragAndDrop(ClipData,
+ * View.DragShadowBuilder, Object, int)} method. If a Uri
+ * requiring permission grants is being sent, then the
+ * {@link android.view.View#DRAG_FLAG_GLOBAL_URI_READ} and/or the
+ * {@link android.view.View#DRAG_FLAG_GLOBAL_URI_WRITE} flags must be used also.
+ */
+public class DragSourceFragment extends Fragment {
+
+    /**
+     * Name of saved data that stores the dropped image URI on the local ImageView when set.
+     */
+    private static final String IMAGE_URI = "IMAGE_URI";
+
+    /**
+     * Name of the parameter for a {@link ClipData} extra that stores a text describing the dragged
+     * image.
+     */
+    public static final String EXTRA_IMAGE_INFO = "IMAGE_INFO";
+
+    /**
+     * Uri of the ImageView source when set.
+     */
+    private Uri mLocalImageUri;
+
+    private static final String TAG = "DragSourceFragment";
+
+    private static final String CONTENT_AUTHORITY = "com.example.android.dragsource.fileprovider";
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+            @Nullable Bundle savedInstanceState) {
+
+        View view = inflater.inflate(R.layout.fragment_dragsource, null);
+
+        // Set up two image views for global drag and drop with a permission grant.
+        Uri imageUri = getFileUri(R.drawable.image1, "image1.png");
+        ImageView imageView = (ImageView) view.findViewById(R.id.image_one);
+        setUpDraggableImage(imageView, imageUri);
+        imageView.setImageURI(imageUri);
+
+        imageUri = getFileUri(R.drawable.image2, "image2.png");
+        imageView = (ImageView) view.findViewById(R.id.image_two);
+        setUpDraggableImage(imageView, imageUri);
+        imageView.setImageURI(imageUri);
+
+        // Set up the local drop target area.
+        final ImageView localImageTarget = (ImageView) view.findViewById(R.id.local_target);
+        localImageTarget.setOnDragListener(new ImageDragListener() {
+            @Override
+            protected boolean setImageUri(View view, DragEvent event, Uri uri) {
+                mLocalImageUri = uri;
+                Log.d(TAG, "Setting local image to: " + uri);
+                return super.setImageUri(view, event, uri);
+            }
+        });
+
+        if (savedInstanceState != null) {
+            final String uriString = savedInstanceState.getString(IMAGE_URI);
+            if (uriString != null) {
+                mLocalImageUri = Uri.parse(uriString);
+                Log.d(TAG, "Restoring local image to: " + mLocalImageUri);
+                localImageTarget.setImageURI(mLocalImageUri);
+            }
+        }
+        return view;
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle savedInstanceState) {
+        if (mLocalImageUri != null) {
+            savedInstanceState.putString(IMAGE_URI, mLocalImageUri.toString());
+        }
+        super.onSaveInstanceState(savedInstanceState);
+    }
+
+    private void setUpDraggableImage(ImageView imageView, final Uri imageUri) {
+
+        // Set up a listener that starts the drag and drop event with flags and extra data.
+        DragStartHelper.OnDragStartListener listener = new DragStartHelper.OnDragStartListener() {
+            @Override
+            public boolean onDragStart(View view, final DragStartHelper helper) {
+                Log.d(TAG, "Drag start event received from helper.");
+
+                // Use a DragShadowBuilder
+                View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(view) {
+                    @Override
+                    public void onProvideShadowMetrics(Point shadowSize, Point shadowTouchPoint) {
+                        super.onProvideShadowMetrics(shadowSize, shadowTouchPoint);
+                        // Notify the DragStartHelper of point where the view was touched.
+                        helper.getTouchPosition(shadowTouchPoint);
+                        Log.d(TAG, "View was touched at: " + shadowTouchPoint);
+                    }
+                };
+
+                // Set up the flags for the drag event.
+                // Enable drag and drop across apps (global)
+                // and require read permissions for this URI.
+                int flags = View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_GLOBAL_URI_READ;
+
+                // Add an optional clip description that that contains an extra String that is
+                // read out by the target app.
+                final ClipDescription clipDescription = new ClipDescription("", new String[]{
+                        getContext().getContentResolver().getType(imageUri)});
+                // Extras are stored within a PersistableBundle.
+                PersistableBundle extras = new PersistableBundle(1);
+                // Add a String that the target app will display.
+                extras.putString(EXTRA_IMAGE_INFO,
+                        "Drag Started at " + new Date());
+                clipDescription.setExtras(extras);
+
+                // The ClipData object describes the object that is being dragged and dropped.
+                final ClipData clipData =
+                        new ClipData(clipDescription, new ClipData.Item(imageUri));
+
+                Log.d(TAG, "Created ClipDescription. Starting drag and drop.");
+                // Start the drag and drop event.
+                return view.startDragAndDrop(clipData, shadowBuilder, null, flags);
+
+            }
+
+        };
+
+        // Use the DragStartHelper to detect drag and drop events and use the OnDragStartListener
+        // defined above to start the event when it has been detected.
+        DragStartHelper helper = new DragStartHelper(imageView, listener);
+        helper.attach();
+        Log.d(TAG, "DragStartHelper attached to view.");
+    }
+
+    /**
+     * Copy a drawable resource into local storage and makes it available via the
+     * {@link FileProvider}.
+     *
+     * @see Context#getFilesDir()
+     * @see FileProvider
+     * @see FileProvider#getUriForFile(Context, String, File)
+     */
+    private Uri getFileUri(int sourceResourceId, String targetName) {
+        // Create the images/ sub directory if it does not exist yet.
+        File filePath = new File(getContext().getFilesDir(), "images");
+        if (!filePath.exists() && !filePath.mkdir()) {
+            return null;
+        }
+
+        // Copy a drawable from resources to the internal directory.
+        File newFile = new File(filePath, targetName);
+        if (!newFile.exists()) {
+            copyImageResourceToFile(sourceResourceId, newFile);
+        }
+
+        // Make the file accessible via the FileProvider and retrieve its URI.
+        return FileProvider.getUriForFile(getContext(), CONTENT_AUTHORITY, newFile);
+    }
+
+
+    /**
+     * Copy a PNG resource drawable to a {@File}.
+     */
+    private void copyImageResourceToFile(int resourceId, File filePath) {
+        Bitmap image = BitmapFactory.decodeResource(getResources(), resourceId);
+
+        FileOutputStream out = null;
+        try {
+            out = new FileOutputStream(filePath);
+            image.compress(Bitmap.CompressFormat.PNG, 100, out);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (out != null) {
+                    out.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/ImageDragListener.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/ImageDragListener.java
new file mode 100644
index 000000000..8ad2864fe
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/ImageDragListener.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2016, 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.
+ */
+
+package com.example.android.dragsource;
+
+import android.content.ClipData;
+import android.net.Uri;
+import android.view.DragEvent;
+import android.view.View;
+import android.widget.ImageView;
+
+/**
+ * OnDragListener for ImageViews.
+ * Sets colors of the target when DragEvents fire. When a drop is received, the {@link Uri} backing
+ * the first {@link android.content.ClipData.Item} in the {@link DragEvent} is set as the image
+ * resource of the ImageView.
+ */
+public class ImageDragListener implements View.OnDragListener {
+
+    private static final int COLOR_INACTIVE = 0xFF888888;
+
+    private static final int COLOR_ACTIVE = 0xFFCCCCCC;
+
+    private static final int COLOR_HOVER = 0xFFEEEEEE;
+
+    @Override
+    public boolean onDrag(View view, DragEvent event) {
+        // Change the color of the target for all events.
+        // For the drop action, set the view to the dropped image.
+        switch (event.getAction()) {
+            case DragEvent.ACTION_DRAG_STARTED:
+                setTargetColor(view, COLOR_ACTIVE);
+                return true;
+
+            case DragEvent.ACTION_DRAG_ENTERED:
+                setTargetColor(view, COLOR_HOVER);
+                return true;
+
+            case DragEvent.ACTION_DRAG_LOCATION:
+                processLocation(event.getX(), event.getY());
+                return true;
+
+            case DragEvent.ACTION_DRAG_EXITED:
+                setTargetColor(view, COLOR_ACTIVE);
+                return true;
+
+            case DragEvent.ACTION_DROP:
+                return processDrop(view, event);
+
+            case DragEvent.ACTION_DRAG_ENDED:
+                setTargetColor(view, COLOR_INACTIVE);
+                return true;
+
+            default:
+                break;
+        }
+
+        return false;
+    }
+
+    private void setTargetColor(View view, int color) {
+        view.setBackgroundColor(color);
+    }
+
+    private boolean processDrop(View view, DragEvent event) {
+        ClipData clipData = event.getClipData();
+        if (clipData == null || clipData.getItemCount() == 0) {
+            return false;
+        }
+        ClipData.Item item = clipData.getItemAt(0);
+        if (item == null) {
+            return false;
+        }
+        Uri uri = item.getUri();
+        if (uri == null) {
+            return false;
+        }
+        return setImageUri(view, event, uri);
+    }
+
+    protected void processLocation(float x, float y) {
+    }
+
+    protected boolean setImageUri(View view, DragEvent event, Uri uri) {
+        if (!(view instanceof ImageView)) {
+            return false;
+        }
+        ((ImageView) view).setImageURI(uri);
+        return true;
+    }
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/MainActivity.java b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/MainActivity.java
new file mode 100644
index 000000000..67bbb6c9b
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DragSource/src/com.example.android/dragsource/MainActivity.java
@@ -0,0 +1,110 @@
+/*
+* 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.
+*/
+
+
+package com.example.android.dragsource;
+
+import com.example.android.common.activities.SampleActivityBase;
+import com.example.android.common.logger.Log;
+import com.example.android.common.logger.LogFragment;
+import com.example.android.common.logger.LogWrapper;
+import com.example.android.common.logger.MessageOnlyLogFilter;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentTransaction;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.ViewAnimator;
+
+/**
+ * A simple launcher activity containing a summary sample description, sample log and a custom
+ * {@link android.support.v4.app.Fragment} which can display a view.
+ * <p>
+ * For devices with displays with a width of 720dp or greater, the sample log is always visible,
+ * on other devices it's visibility is controlled by an item on the Action Bar.
+ */
+public class MainActivity extends SampleActivityBase {
+
+    public static final String TAG = "MainActivity";
+
+    // Whether the Log Fragment is currently shown
+    private boolean mLogShown;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        if (savedInstanceState == null) {
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+            DragSourceFragment fragment = new DragSourceFragment();
+            transaction.replace(R.id.sample_content_fragment, fragment);
+            transaction.commit();
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        MenuItem logToggle = menu.findItem(R.id.menu_toggle_log);
+        logToggle.setVisible(findViewById(R.id.sample_output) instanceof ViewAnimator);
+        logToggle.setTitle(mLogShown ? R.string.sample_hide_log : R.string.sample_show_log);
+
+        return super.onPrepareOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_toggle_log:
+                mLogShown = !mLogShown;
+                ViewAnimator output = (ViewAnimator) findViewById(R.id.sample_output);
+                if (mLogShown) {
+                    output.setDisplayedChild(1);
+                } else {
+                    output.setDisplayedChild(0);
+                }
+                supportInvalidateOptionsMenu();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    /** Create a chain of targets that will receive log data */
+    @Override
+    public void initializeLogging() {
+        // Wraps Android's native log framework.
+        LogWrapper logWrapper = new LogWrapper();
+        // Using Log, front-end to the logging chain, emulates android.util.log method signatures.
+        Log.setLogNode(logWrapper);
+
+        // Filter strips out everything except the message text.
+        MessageOnlyLogFilter msgFilter = new MessageOnlyLogFilter();
+        logWrapper.setNext(msgFilter);
+
+        // On screen logging via a fragment with a TextView.
+        LogFragment logFragment = (LogFragment) getSupportFragmentManager()
+                .findFragmentById(R.id.log_fragment);
+        msgFilter.setNext(logFragment.getLogView());
+
+        Log.i(TAG, "Ready");
+    }
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/AndroidManifest.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/AndroidManifest.xml
new file mode 100644
index 000000000..02f39b2ee
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+     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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.android.droptarget">
+
+    <application android:label="DropTarget Sample"
+        android:icon="@mipmap/ic_launcher">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/drawable-hdpi/tile.9.png b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/drawable-hdpi/tile.9.png
new file mode 100644
index 000000000..135862883
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/drawable-hdpi/tile.9.png
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout-w720dp/activity_main.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout-w720dp/activity_main.xml
new file mode 100755
index 000000000..efc54b70b
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout-w720dp/activity_main.xml
@@ -0,0 +1,72 @@
+<!--
+  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.
+  -->
+<LinearLayout android:id="@+id/sample_main_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+
+    <LinearLayout
+        android:id="@+id/sample_output"
+        android:layout_width="0px"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <FrameLayout
+            style="@style/Widget.SampleMessageTile"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                style="@style/Widget.SampleMessage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingBottom="@dimen/margin_large"
+                android:paddingLeft="@dimen/margin_medium"
+                android:paddingRight="@dimen/margin_medium"
+                android:paddingTop="@dimen/margin_large"
+                android:text="@string/intro_message" />
+        </FrameLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@android:color/darker_gray" />
+
+        <fragment
+            android:id="@+id/log_fragment"
+            android:name="com.example.android.common.logger.LogFragment"
+            android:layout_width="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:background="@android:color/darker_gray" />
+
+    <FrameLayout
+        android:id="@+id/sample_content_fragment"
+        android:layout_width="0px"
+        android:layout_height="match_parent"
+        android:layout_weight="2" />
+
+</LinearLayout>
+
+
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout/activity_main.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout/activity_main.xml
new file mode 100755
index 000000000..17bc911a8
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout/activity_main.xml
@@ -0,0 +1,64 @@
+<!--
+  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.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/sample_main_layout">
+
+    <ViewAnimator
+        android:id="@+id/sample_output"
+        android:layout_width="match_parent"
+        android:layout_height="0px"
+        android:layout_weight="1">
+
+        <ScrollView
+            style="@style/Widget.SampleMessageTile"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                style="@style/Widget.SampleMessage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/horizontal_page_margin"
+                android:paddingRight="@dimen/horizontal_page_margin"
+                android:paddingTop="@dimen/vertical_page_margin"
+                android:paddingBottom="@dimen/vertical_page_margin"
+                android:text="@string/intro_message" />
+        </ScrollView>
+
+        <fragment
+            android:name="com.example.android.common.logger.LogFragment"
+            android:id="@+id/log_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </ViewAnimator>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@android:color/darker_gray" />
+
+    <FrameLayout
+        android:id="@+id/sample_content_fragment"
+        android:layout_weight="2"
+        android:layout_width="match_parent"
+        android:layout_height="0px" />
+
+</LinearLayout>
+
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout/fragment_droptarget.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout/fragment_droptarget.xml
new file mode 100644
index 000000000..672117117
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/layout/fragment_droptarget.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+     Copyright 2016 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.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/section_margin"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/image_target"
+            android:layout_width="@dimen/image_size"
+            android:layout_height="@dimen/image_size"
+            android:background="@color/drag_inactive"
+            android:pointerIcon="crosshair"
+            android:scaleType="centerCrop" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/section_margin"
+            android:gravity="center"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/text_margin"
+                android:text="@string/image_target_prompt" />
+            <CheckBox
+                android:id="@+id/release_checkbox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/release_checkbox_text"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/text_margin"
+                android:layout_marginRight="@dimen/text_margin"
+                android:text="@string/release_checkbox_note" />
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/menu/main.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/menu/main.xml
new file mode 100644
index 000000000..480cafef6
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/menu/main.xml
@@ -0,0 +1,22 @@
+<!--
+  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.
+  -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_toggle_log"
+        android:showAsAction="always"
+        android:title="@string/sample_show_log" />
+</menu>
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-hdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..0732a105b
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-hdpi/ic_launcher.png
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-mdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..6f8f369eb
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-mdpi/ic_launcher.png
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xhdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..01f2b2e33
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xhdpi/ic_launcher.png
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xxhdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..48899e6d2
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xxxhdpi/ic_launcher.png b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..6d4a7c530
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-sw600dp/template-dimens.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-sw600dp/template-dimens.xml
new file mode 100644
index 000000000..22074a2bd
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-sw600dp/template-dimens.xml
@@ -0,0 +1,24 @@
+<!--
+  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/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-sw600dp/template-styles.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-sw600dp/template-styles.xml
new file mode 100644
index 000000000..03d197418
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-sw600dp/template-styles.xml
@@ -0,0 +1,25 @@
+<!--
+  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/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-v11/template-styles.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-v11/template-styles.xml
new file mode 100644
index 000000000..8c1ea66f2
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-v11/template-styles.xml
@@ -0,0 +1,22 @@
+<!--
+  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/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-v21/base-colors.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-v21/base-colors.xml
new file mode 100644
index 000000000..b662ae2cb
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-v21/base-colors.xml
@@ -0,0 +1,20 @@
+<?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>
+
+
+</resources>
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-v21/base-template-styles.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-v21/base-template-styles.xml
new file mode 100644
index 000000000..d95b9b724
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values-v21/base-template-styles.xml
@@ -0,0 +1,22 @@
+<?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/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/colors.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/colors.xml
new file mode 100644
index 000000000..801e292dd
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/colors.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+     Copyright 2016 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>
+    <color name="drag_inactive">#ff888888</color>
+</resources>
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/dimen.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/dimen.xml
new file mode 100644
index 000000000..1efd96e3d
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/dimen.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+     Copyright 2016 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>
+    <dimen name="section_margin">16dp</dimen>
+
+    <dimen name="image_size">150dp</dimen>
+
+    <dimen name="text_size">0dp</dimen>
+    <dimen name="text_margin">10dp</dimen>
+    <dimen name="checkbox_margin">6dp</dimen>
+</resources>
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/fragmentview_strings.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/fragmentview_strings.xml
new file mode 100755
index 000000000..7b9d9ec4f
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/fragmentview_strings.xml
@@ -0,0 +1,19 @@
+<!--
+  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="sample_show_log">Show Log</string>
+    <string name="sample_hide_log">Hide Log</string>
+</resources>
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/strings.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/strings.xml
new file mode 100644
index 000000000..585a7890d
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+     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.
+-->
+
+<resources>
+
+    <string name="image_target_prompt">Drop image here.\nThe app will request permission from the source app before displaying the image.</string>
+
+    <string name="intro_message">This sample demonstrates drag and drop functionality and is the \'target\' app for this sample. It shows how data can be received when dragged from another app.\nOpen the \'DragSource\' sample app next to this one and try dragging an image into the space below.</string>
+
+    <string name="release_checkbox_text">Release permissions immediately after a drop</string>
+
+    <string name="release_checkbox_note">Releasing permissions will prevent the image from being properly restored after the activity has been resized.</string>
+</resources>
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/template-dimens.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/template-dimens.xml
new file mode 100644
index 000000000..39e710b5c
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/template-dimens.xml
@@ -0,0 +1,32 @@
+<!--
+  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/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/template-styles.xml b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/template-styles.xml
new file mode 100644
index 000000000..6e7d593dd
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/res/values/template-styles.xml
@@ -0,0 +1,42 @@
+<!--
+  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/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/activities/SampleActivityBase.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/activities/SampleActivityBase.java
new file mode 100644
index 000000000..3228927b7
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/activities/SampleActivityBase.java
@@ -0,0 +1,52 @@
+/*
+* 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.
+*/
+
+package com.example.android.common.activities;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
+
+import com.example.android.common.logger.Log;
+import com.example.android.common.logger.LogWrapper;
+
+/**
+ * Base launcher activity, to handle most of the common plumbing for samples.
+ */
+public class SampleActivityBase extends FragmentActivity {
+
+    public static final String TAG = "SampleActivityBase";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    protected  void onStart() {
+        super.onStart();
+        initializeLogging();
+    }
+
+    /** Set up targets to receive log data */
+    public void initializeLogging() {
+        // Using Log, front-end to the logging chain, emulates android.util.log method signatures.
+        // Wraps Android's native log framework
+        LogWrapper logWrapper = new LogWrapper();
+        Log.setLogNode(logWrapper);
+
+        Log.i(TAG, "Ready");
+    }
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/Log.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/Log.java
new file mode 100644
index 000000000..17503c568
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/Log.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (C) 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.
+ */
+package com.example.android.common.logger;
+
+/**
+ * Helper class for a list (or tree) of LoggerNodes.
+ *
+ * <p>When this is set as the head of the list,
+ * an instance of it can function as a drop-in replacement for {@link android.util.Log}.
+ * Most of the methods in this class server only to map a method call in Log to its equivalent
+ * in LogNode.</p>
+ */
+public class Log {
+    // Grabbing the native values from Android's native logging facilities,
+    // to make for easy migration and interop.
+    public static final int NONE = -1;
+    public static final int VERBOSE = android.util.Log.VERBOSE;
+    public static final int DEBUG = android.util.Log.DEBUG;
+    public static final int INFO = android.util.Log.INFO;
+    public static final int WARN = android.util.Log.WARN;
+    public static final int ERROR = android.util.Log.ERROR;
+    public static final int ASSERT = android.util.Log.ASSERT;
+
+    // Stores the beginning of the LogNode topology.
+    private static LogNode mLogNode;
+
+    /**
+     * Returns the next LogNode in the linked list.
+     */
+    public static LogNode getLogNode() {
+        return mLogNode;
+    }
+
+    /**
+     * Sets the LogNode data will be sent to.
+     */
+    public static void setLogNode(LogNode node) {
+        mLogNode = node;
+    }
+
+    /**
+     * Instructs the LogNode to print the log data provided. Other LogNodes can
+     * be chained to the end of the LogNode as desired.
+     *
+     * @param priority Log level of the data being logged. Verbose, Error, etc.
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     * @param tr If an exception was thrown, this can be sent along for the logging facilities
+     *           to extract and print useful information.
+     */
+    public static void println(int priority, String tag, String msg, Throwable tr) {
+        if (mLogNode != null) {
+            mLogNode.println(priority, tag, msg, tr);
+        }
+    }
+
+    /**
+     * Instructs the LogNode to print the log data provided. Other LogNodes can
+     * be chained to the end of the LogNode as desired.
+     *
+     * @param priority Log level of the data being logged. Verbose, Error, etc.
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged. The actual message to be logged.
+     */
+    public static void println(int priority, String tag, String msg) {
+        println(priority, tag, msg, null);
+    }
+
+   /**
+     * Prints a message at VERBOSE priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     * @param tr If an exception was thrown, this can be sent along for the logging facilities
+     *           to extract and print useful information.
+     */
+    public static void v(String tag, String msg, Throwable tr) {
+        println(VERBOSE, tag, msg, tr);
+    }
+
+    /**
+     * Prints a message at VERBOSE priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     */
+    public static void v(String tag, String msg) {
+        v(tag, msg, null);
+    }
+
+
+    /**
+     * Prints a message at DEBUG priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     * @param tr If an exception was thrown, this can be sent along for the logging facilities
+     *           to extract and print useful information.
+     */
+    public static void d(String tag, String msg, Throwable tr) {
+        println(DEBUG, tag, msg, tr);
+    }
+
+    /**
+     * Prints a message at DEBUG priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     */
+    public static void d(String tag, String msg) {
+        d(tag, msg, null);
+    }
+
+    /**
+     * Prints a message at INFO priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     * @param tr If an exception was thrown, this can be sent along for the logging facilities
+     *           to extract and print useful information.
+     */
+    public static void i(String tag, String msg, Throwable tr) {
+        println(INFO, tag, msg, tr);
+    }
+
+    /**
+     * Prints a message at INFO priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     */
+    public static void i(String tag, String msg) {
+        i(tag, msg, null);
+    }
+
+    /**
+     * Prints a message at WARN priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     * @param tr If an exception was thrown, this can be sent along for the logging facilities
+     *           to extract and print useful information.
+     */
+    public static void w(String tag, String msg, Throwable tr) {
+        println(WARN, tag, msg, tr);
+    }
+
+    /**
+     * Prints a message at WARN priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     */
+    public static void w(String tag, String msg) {
+        w(tag, msg, null);
+    }
+
+    /**
+     * Prints a message at WARN priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param tr If an exception was thrown, this can be sent along for the logging facilities
+     *           to extract and print useful information.
+     */
+    public static void w(String tag, Throwable tr) {
+        w(tag, null, tr);
+    }
+
+    /**
+     * Prints a message at ERROR priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     * @param tr If an exception was thrown, this can be sent along for the logging facilities
+     *           to extract and print useful information.
+     */
+    public static void e(String tag, String msg, Throwable tr) {
+        println(ERROR, tag, msg, tr);
+    }
+
+    /**
+     * Prints a message at ERROR priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     */
+    public static void e(String tag, String msg) {
+        e(tag, msg, null);
+    }
+
+    /**
+     * Prints a message at ASSERT priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     * @param tr If an exception was thrown, this can be sent along for the logging facilities
+     *           to extract and print useful information.
+     */
+    public static void wtf(String tag, String msg, Throwable tr) {
+        println(ASSERT, tag, msg, tr);
+    }
+
+    /**
+     * Prints a message at ASSERT priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param msg The actual message to be logged.
+     */
+    public static void wtf(String tag, String msg) {
+        wtf(tag, msg, null);
+    }
+
+    /**
+     * Prints a message at ASSERT priority.
+     *
+     * @param tag Tag for for the log data. Can be used to organize log statements.
+     * @param tr If an exception was thrown, this can be sent along for the logging facilities
+     *           to extract and print useful information.
+     */
+    public static void wtf(String tag, Throwable tr) {
+        wtf(tag, null, tr);
+    }
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogFragment.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogFragment.java
new file mode 100644
index 000000000..c1f369a28
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogFragment.java
@@ -0,0 +1,94 @@
+/*
+* 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.
+*/
+
+package com.example.android.common.logger;
+
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ScrollView;
+
+/**
+ * Simple fragment which contains a LogView and uses is to output log data it receives
+ * through the LogNode interface.
+ */
+public class LogFragment extends Fragment {
+
+    private LogView mLogView;
+    private ScrollView mScrollView;
+
+    public LogFragment() {}
+
+    public View inflateViews() {
+        mScrollView = new ScrollView(getActivity());
+        ViewGroup.LayoutParams scrollParams = new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT);
+        mScrollView.setLayoutParams(scrollParams);
+
+        mLogView = new LogView(getActivity());
+        ViewGroup.LayoutParams logParams = new ViewGroup.LayoutParams(scrollParams);
+        logParams.height = ViewGroup.LayoutParams.WRAP_CONTENT;
+        mLogView.setLayoutParams(logParams);
+        mLogView.setClickable(true);
+        mLogView.setFocusable(true);
+        mLogView.setTypeface(Typeface.MONOSPACE);
+
+        // Want to set padding as 16 dips, setPadding takes pixels.  Hooray math!
+        int paddingDips = 16;
+        double scale = getResources().getDisplayMetrics().density;
+        int paddingPixels = (int) ((paddingDips * (scale)) + .5);
+        mLogView.setPadding(paddingPixels, paddingPixels, paddingPixels, paddingPixels);
+        mLogView.setCompoundDrawablePadding(paddingPixels);
+
+        mLogView.setGravity(Gravity.BOTTOM);
+        mLogView.setTextAppearance(getActivity(), android.R.style.TextAppearance_Holo_Medium);
+
+        mScrollView.addView(mLogView);
+        return mScrollView;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        View result = inflateViews();
+
+        mLogView.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {}
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                mScrollView.fullScroll(ScrollView.FOCUS_DOWN);
+            }
+        });
+        return result;
+    }
+
+    public LogView getLogView() {
+        return mLogView;
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogNode.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogNode.java
new file mode 100644
index 000000000..bc37cabc0
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogNode.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+package com.example.android.common.logger;
+
+/**
+ * Basic interface for a logging system that can output to one or more targets.
+ * Note that in addition to classes that will output these logs in some format,
+ * one can also implement this interface over a filter and insert that in the chain,
+ * such that no targets further down see certain data, or see manipulated forms of the data.
+ * You could, for instance, write a "ToHtmlLoggerNode" that just converted all the log data
+ * it received to HTML and sent it along to the next node in the chain, without printing it
+ * anywhere.
+ */
+public interface LogNode {
+
+    /**
+     * Instructs first LogNode in the list to print the log data provided.
+     * @param priority Log level of the data being logged.  Verbose, Error, etc.
+     * @param tag Tag for for the log data.  Can be used to organize log statements.
+     * @param msg The actual message to be logged. The actual message to be logged.
+     * @param tr If an exception was thrown, this can be sent along for the logging facilities
+     *           to extract and print useful information.
+     */
+    public void println(int priority, String tag, String msg, Throwable tr);
+
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogView.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogView.java
new file mode 100644
index 000000000..c01542b91
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogView.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 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.
+ */
+package com.example.android.common.logger;
+
+import android.app.Activity;
+import android.content.Context;
+import android.util.*;
+import android.widget.TextView;
+
+/** Simple TextView which is used to output log data received through the LogNode interface.
+*/
+public class LogView extends TextView implements LogNode {
+
+    public LogView(Context context) {
+        super(context);
+    }
+
+    public LogView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public LogView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    /**
+     * Formats the log data and prints it out to the LogView.
+     * @param priority Log level of the data being logged.  Verbose, Error, etc.
+     * @param tag Tag for for the log data.  Can be used to organize log statements.
+     * @param msg The actual message to be logged. The actual message to be logged.
+     * @param tr If an exception was thrown, this can be sent along for the logging facilities
+     *           to extract and print useful information.
+     */
+    @Override
+    public void println(int priority, String tag, String msg, Throwable tr) {
+
+        
+        String priorityStr = null;
+
+        // For the purposes of this View, we want to print the priority as readable text.
+        switch(priority) {
+            case android.util.Log.VERBOSE:
+                priorityStr = "VERBOSE";
+                break;
+            case android.util.Log.DEBUG:
+                priorityStr = "DEBUG";
+                break;
+            case android.util.Log.INFO:
+                priorityStr = "INFO";
+                break;
+            case android.util.Log.WARN:
+                priorityStr = "WARN";
+                break;
+            case android.util.Log.ERROR:
+                priorityStr = "ERROR";
+                break;
+            case android.util.Log.ASSERT:
+                priorityStr = "ASSERT";
+                break;
+            default:
+                break;
+        }
+
+        // Handily, the Log class has a facility for converting a stack trace into a usable string.
+        String exceptionStr = null;
+        if (tr != null) {
+            exceptionStr = android.util.Log.getStackTraceString(tr);
+        }
+
+        // Take the priority, tag, message, and exception, and concatenate as necessary
+        // into one usable line of text.
+        final StringBuilder outputBuilder = new StringBuilder();
+
+        String delimiter = "\t";
+        appendIfNotNull(outputBuilder, priorityStr, delimiter);
+        appendIfNotNull(outputBuilder, tag, delimiter);
+        appendIfNotNull(outputBuilder, msg, delimiter);
+        appendIfNotNull(outputBuilder, exceptionStr, delimiter);
+
+        // In case this was originally called from an AsyncTask or some other off-UI thread,
+        // make sure the update occurs within the UI thread.
+        ((Activity) getContext()).runOnUiThread( (new Thread(new Runnable() {
+            @Override
+            public void run() {
+                // Display the text we just generated within the LogView.
+                appendToLog(outputBuilder.toString());
+            }
+        })));
+
+        if (mNext != null) {
+            mNext.println(priority, tag, msg, tr);
+        }
+    }
+
+    public LogNode getNext() {
+        return mNext;
+    }
+
+    public void setNext(LogNode node) {
+        mNext = node;
+    }
+
+    /** Takes a string and adds to it, with a separator, if the bit to be added isn't null. Since
+     * the logger takes so many arguments that might be null, this method helps cut out some of the
+     * agonizing tedium of writing the same 3 lines over and over.
+     * @param source StringBuilder containing the text to append to.
+     * @param addStr The String to append
+     * @param delimiter The String to separate the source and appended strings. A tab or comma,
+     *                  for instance.
+     * @return The fully concatenated String as a StringBuilder
+     */
+    private StringBuilder appendIfNotNull(StringBuilder source, String addStr, String delimiter) {
+        if (addStr != null) {
+            if (addStr.length() == 0) {
+                delimiter = "";
+            }
+
+            return source.append(addStr).append(delimiter);
+        }
+        return source;
+    }
+
+    // The next LogNode in the chain.
+    LogNode mNext;
+
+    /** Outputs the string as a new line of log data in the LogView. */
+    public void appendToLog(String s) {
+        append("\n" + s);
+    }
+
+
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogWrapper.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogWrapper.java
new file mode 100644
index 000000000..16a9e7ba2
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/LogWrapper.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+package com.example.android.common.logger;
+
+import android.util.Log;
+
+/**
+ * Helper class which wraps Android's native Log utility in the Logger interface.  This way
+ * normal DDMS output can be one of the many targets receiving and outputting logs simultaneously.
+ */
+public class LogWrapper implements LogNode {
+
+    // For piping:  The next node to receive Log data after this one has done its work.
+    private LogNode mNext;
+
+    /**
+     * Returns the next LogNode in the linked list.
+     */
+    public LogNode getNext() {
+        return mNext;
+    }
+
+    /**
+     * Sets the LogNode data will be sent to..
+     */
+    public void setNext(LogNode node) {
+        mNext = node;
+    }
+
+    /**
+     * Prints data out to the console using Android's native log mechanism.
+     * @param priority Log level of the data being logged.  Verbose, Error, etc.
+     * @param tag Tag for for the log data.  Can be used to organize log statements.
+     * @param msg The actual message to be logged. The actual message to be logged.
+     * @param tr If an exception was thrown, this can be sent along for the logging facilities
+     *           to extract and print useful information.
+     */
+    @Override
+    public void println(int priority, String tag, String msg, Throwable tr) {
+        // There actually are log methods that don't take a msg parameter.  For now,
+        // if that's the case, just convert null to the empty string and move on.
+        String useMsg = msg;
+        if (useMsg == null) {
+            useMsg = "";
+        }
+
+        // If an exeption was provided, convert that exception to a usable string and attach
+        // it to the end of the msg method.
+        if (tr != null) {
+            msg += "\n" + Log.getStackTraceString(tr);
+        }
+
+        // This is functionally identical to Log.x(tag, useMsg);
+        // For instance, if priority were Log.VERBOSE, this would be the same as Log.v(tag, useMsg)
+        Log.println(priority, tag, useMsg);
+
+        // If this isn't the last node in the chain, move things along.
+        if (mNext != null) {
+            mNext.println(priority, tag, msg, tr);
+        }
+    }
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/MessageOnlyLogFilter.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/MessageOnlyLogFilter.java
new file mode 100644
index 000000000..19967dcd4
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/common/logger/MessageOnlyLogFilter.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 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.
+ */
+package com.example.android.common.logger;
+
+/**
+ * Simple {@link LogNode} filter, removes everything except the message.
+ * Useful for situations like on-screen log output where you don't want a lot of metadata displayed,
+ * just easy-to-read message updates as they're happening.
+ */
+public class MessageOnlyLogFilter implements LogNode {
+
+    LogNode mNext;
+
+    /**
+     * Takes the "next" LogNode as a parameter, to simplify chaining.
+     *
+     * @param next The next LogNode in the pipeline.
+     */
+    public MessageOnlyLogFilter(LogNode next) {
+        mNext = next;
+    }
+
+    public MessageOnlyLogFilter() {
+    }
+
+    @Override
+    public void println(int priority, String tag, String msg, Throwable tr) {
+        if (mNext != null) {
+            getNext().println(Log.NONE, null, msg, null);
+        }
+    }
+
+    /**
+     * Returns the next LogNode in the chain.
+     */
+    public LogNode getNext() {
+        return mNext;
+    }
+
+    /**
+     * Sets the LogNode data will be sent to..
+     */
+    public void setNext(LogNode node) {
+        mNext = node;
+    }
+
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/DropTargetFragment.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/DropTargetFragment.java
new file mode 100644
index 000000000..9705e2b1e
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/DropTargetFragment.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+package com.example.android.droptarget;
+
+import com.example.android.common.logger.Log;
+
+import android.app.Activity;
+import android.content.ClipDescription;
+import android.content.ContentResolver;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.support.annotation.Nullable;
+import android.support.v13.app.ActivityCompat;
+import android.support.v13.view.DragAndDropPermissionsCompat;
+import android.support.v4.app.Fragment;
+import android.view.DragEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+
+/**
+ * This sample demonstrates data can be moved between views in different applications via
+ * drag and drop.
+ * <p>This is the Target app for the drag and drop process. This app uses a
+ * {@link android.widget.ImageView} as the drop target. Images onto this
+ * view from the DragSource app that is also part of this sample.
+ * <p>
+ * There is also a {@link android.widget.EditText} widget that can accept dropped text (no
+ * extra setup is necessary).
+ * To access content URIs requiring permissions, the target app needs to request the
+ * {@link android.view.DragAndDropPermissions} from the Activity via
+ * {@link ActivityCompat#requestDragAndDropPermissions(Activity, DragEvent)}. This permission will
+ * stay either as long as the activity is alive, or until the release() method is called on the
+ * {@link android.view.DragAndDropPermissions} object.
+ */
+public class DropTargetFragment extends Fragment {
+
+    private static final String IMAGE_URI = "IMAGE_URI";
+
+    public static final String EXTRA_IMAGE_INFO = "IMAGE_INFO";
+
+    private static final String TAG = "DropTargetFragment";
+
+    private Uri mImageUri;
+
+    private CheckBox mReleasePermissionCheckBox;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+            @Nullable Bundle savedInstanceState) {
+
+        View rootView = inflater.inflate(R.layout.fragment_droptarget, container, false);
+        final ImageView imageView = (ImageView) rootView.findViewById(R.id.image_target);
+
+        ImageDragListener imageDragListener = new PermissionAwareImageDragListener();
+
+        imageView.setOnDragListener(imageDragListener);
+
+        // Restore the application state if an image was being displayed.
+        if (savedInstanceState != null) {
+            final String uriString = savedInstanceState.getString(IMAGE_URI);
+            if (uriString != null) {
+                mImageUri = Uri.parse(uriString);
+                imageView.setImageURI(mImageUri);
+            }
+        }
+
+        mReleasePermissionCheckBox = (CheckBox) rootView.findViewById(R.id.release_checkbox);
+
+        return rootView;
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle savedInstanceState) {
+        if (mImageUri != null) {
+            savedInstanceState.putString(IMAGE_URI, mImageUri.toString());
+        }
+        super.onSaveInstanceState(savedInstanceState);
+    }
+
+    private class PermissionAwareImageDragListener extends ImageDragListener {
+
+        @Override
+        protected void processLocation(float x, float y) {
+            // Callback is received when the dragged image enters the drop area.
+        }
+
+        @Override
+        protected boolean setImageUri(View view, DragEvent event, Uri uri) {
+            // Read the string from the clip description extras.
+            Log.d(TAG, "ClipDescription extra: " + getExtra(event));
+
+            Log.d(TAG, "Setting image source to: " + uri.toString());
+            mImageUri = uri;
+
+            if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {
+                // Accessing a "content" scheme Uri requires a permission grant.
+                DragAndDropPermissionsCompat dropPermissions = ActivityCompat
+                        .requestDragAndDropPermissions(getActivity(), event);
+                Log.d(TAG, "Requesting permissions.");
+
+                if (dropPermissions == null) {
+                    // Permission could not be obtained.
+                    Log.d(TAG, "Drop permission request failed.");
+                    return false;
+                }
+
+                final boolean result = super.setImageUri(view, event, uri);
+
+                if (mReleasePermissionCheckBox.isChecked()) {
+                    /* Release the permissions if you are done with the URI.
+                     Note that you may need to hold onto the permission until later if other
+                     operations are performed on the content. For instance, releasing the
+                     permissions here will prevent onCreateView from properly restoring the
+                     ImageView state.
+                     If permissions are not explicitly released, the permission grant will be
+                     revoked when the activity is destroyed.
+                     */
+                    dropPermissions.release();
+                    Log.d(TAG, "Permissions released.");
+                }
+
+                return result;
+            } else {
+                // Other schemes (such as "android.resource") do not require a permission grant.
+                return super.setImageUri(view, event, uri);
+            }
+        }
+
+        @Override
+        public boolean onDrag(View view, DragEvent event) {
+            // DragTarget is peeking into the MIME types of the dragged event in order to ignore
+            // non-image drags completely.
+            // DragSource does not do that but rejects non-image content once a drop has happened.
+            ClipDescription clipDescription = event.getClipDescription();
+            if (clipDescription != null && !clipDescription.hasMimeType("image/*")) {
+                return false;
+            }
+            // Callback received when image is being dragged.
+            return super.onDrag(view, event);
+        }
+    }
+
+    /**
+     * DragEvents can contain additional data packaged in a {@link PersistableBundle}.
+     * Extract the extras from the event and return the String stored for the
+     * {@link #EXTRA_IMAGE_INFO} entry.
+     */
+    private String getExtra(DragEvent event) {
+        // The extras are contained in the ClipDescription in the DragEvent.
+        ClipDescription clipDescription = event.getClipDescription();
+        if (clipDescription != null) {
+            PersistableBundle extras = clipDescription.getExtras();
+            if (extras != null) {
+                return extras.getString(EXTRA_IMAGE_INFO);
+            }
+        }
+        return null;
+    }
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/ImageDragListener.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/ImageDragListener.java
new file mode 100644
index 000000000..84a8b254d
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/ImageDragListener.java
@@ -0,0 +1,96 @@
+/*
+* Copyright 2016, 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.
+*/
+
+package com.example.android.droptarget;
+
+import android.content.ClipData;
+import android.net.Uri;
+import android.view.DragEvent;
+import android.view.View;
+import android.widget.ImageView;
+
+public class ImageDragListener implements View.OnDragListener {
+
+    private static final int COLOR_INACTIVE = 0xFF888888;
+
+    private static final int COLOR_ACTIVE = 0xFFCCCCCC;
+
+    private static final int COLOR_HOVER = 0xFFEEEEEE;
+
+    @Override
+    public boolean onDrag(View view, DragEvent event) {
+        switch (event.getAction()) {
+            case DragEvent.ACTION_DRAG_STARTED:
+                setTargetColor(view, COLOR_ACTIVE);
+                return true;
+
+            case DragEvent.ACTION_DRAG_ENTERED:
+                setTargetColor(view, COLOR_HOVER);
+                return true;
+
+            case DragEvent.ACTION_DRAG_LOCATION:
+                processLocation(event.getX(), event.getY());
+                return true;
+
+            case DragEvent.ACTION_DRAG_EXITED:
+                setTargetColor(view, COLOR_ACTIVE);
+                return true;
+
+            case DragEvent.ACTION_DROP:
+                return processDrop(view, event);
+
+            case DragEvent.ACTION_DRAG_ENDED:
+                setTargetColor(view, COLOR_INACTIVE);
+                return true;
+
+            default:
+                break;
+        }
+
+        return false;
+    }
+
+    private void setTargetColor(View view, int color) {
+        view.setBackgroundColor(color);
+    }
+
+    private boolean processDrop(View view, DragEvent event) {
+        ClipData clipData = event.getClipData();
+        if (clipData == null || clipData.getItemCount() == 0) {
+            return false;
+        }
+        ClipData.Item item = clipData.getItemAt(0);
+        if (item == null) {
+            return false;
+        }
+        Uri uri = item.getUri();
+        if (uri == null) {
+            return false;
+        }
+        return setImageUri(view, event, uri);
+    }
+
+    protected void processLocation(float x, float y) {
+    }
+
+    protected boolean setImageUri(View view, DragEvent event, Uri uri) {
+        if (!(view instanceof ImageView)) {
+            return false;
+        }
+        ((ImageView) view).setImageURI(uri);
+        return true;
+    }
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/MainActivity.java b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/MainActivity.java
new file mode 100644
index 000000000..462f49b87
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/DropTarget/src/com.example.android/droptarget/MainActivity.java
@@ -0,0 +1,110 @@
+/*
+* 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.
+*/
+
+
+package com.example.android.droptarget;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentTransaction;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.ViewAnimator;
+
+import com.example.android.common.activities.SampleActivityBase;
+import com.example.android.common.logger.Log;
+import com.example.android.common.logger.LogFragment;
+import com.example.android.common.logger.LogWrapper;
+import com.example.android.common.logger.MessageOnlyLogFilter;
+
+/**
+ * A simple launcher activity containing a summary sample description, sample log and a custom
+ * {@link android.support.v4.app.Fragment} which can display a view.
+ * <p>
+ * For devices with displays with a width of 720dp or greater, the sample log is always visible,
+ * on other devices it's visibility is controlled by an item on the Action Bar.
+ */
+public class MainActivity extends SampleActivityBase {
+
+    public static final String TAG = "MainActivity";
+
+    // Whether the Log Fragment is currently shown
+    private boolean mLogShown;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        if (savedInstanceState == null) {
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+            DropTargetFragment fragment = new DropTargetFragment();
+            transaction.replace(R.id.sample_content_fragment, fragment);
+            transaction.commit();
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        MenuItem logToggle = menu.findItem(R.id.menu_toggle_log);
+        logToggle.setVisible(findViewById(R.id.sample_output) instanceof ViewAnimator);
+        logToggle.setTitle(mLogShown ? R.string.sample_hide_log : R.string.sample_show_log);
+
+        return super.onPrepareOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch(item.getItemId()) {
+            case R.id.menu_toggle_log:
+                mLogShown = !mLogShown;
+                ViewAnimator output = (ViewAnimator) findViewById(R.id.sample_output);
+                if (mLogShown) {
+                    output.setDisplayedChild(1);
+                } else {
+                    output.setDisplayedChild(0);
+                }
+                supportInvalidateOptionsMenu();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    /** Create a chain of targets that will receive log data */
+    @Override
+    public void initializeLogging() {
+        // Wraps Android's native log framework.
+        LogWrapper logWrapper = new LogWrapper();
+        // Using Log, front-end to the logging chain, emulates android.util.log method signatures.
+        Log.setLogNode(logWrapper);
+
+        // Filter strips out everything except the message text.
+        MessageOnlyLogFilter msgFilter = new MessageOnlyLogFilter();
+        logWrapper.setNext(msgFilter);
+
+        // On screen logging via a fragment with a TextView.
+        LogFragment logFragment = (LogFragment) getSupportFragmentManager()
+                .findFragmentById(R.id.log_fragment);
+        msgFilter.setNext(logFragment.getLogView());
+
+        Log.i(TAG, "Ready");
+    }
+}
diff --git a/samples/browseable/DragAndDropAcrossApps/_index.jd b/samples/browseable/DragAndDropAcrossApps/_index.jd
new file mode 100644
index 000000000..d780944c0
--- /dev/null
+++ b/samples/browseable/DragAndDropAcrossApps/_index.jd
@@ -0,0 +1,18 @@
+
+page.tags="DragAndDropAcrossApps-new"
+sample.group=ui
+@jd:body
+
+<p>
+
+This sample demonstrates how data can be moved between views within an 
+app or between different apps via drag and drop.
+This sample contains two separate Android applications: DragSource and
+DropTarget. DragSource contains images and text that can be dropped into the DropTarget
+app. Images are shared between the two apps through a URI for which the receiving app
+must request permission first, before it can be used.
+
+It also demonstrates the use of the DragStartHelper from the v13 support library to easily
+handle drag and drop events.
+
+        </p>
diff --git a/samples/browseable/RenderScriptIntrinsic/res/values/attrs.xml b/samples/browseable/RenderScriptIntrinsic/res/values/attrs.xml
deleted file mode 100644
index e67df0a37..000000000
--- a/samples/browseable/RenderScriptIntrinsic/res/values/attrs.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resources>
-
-    <!--
-         Declare custom theme attributes that allow changing which styles are
-         used for button bars depending on the API level.
-         ?android:attr/buttonBarStyle is new as of API 11 so this is
-         necessary to support previous API levels.
-    -->
-    <declare-styleable name="ButtonBarContainerTheme">
-        <attr name="buttonBarStyle" format="reference" />
-        <attr name="buttonBarButtonStyle" format="reference" />
-    </declare-styleable>
-
-</resources>
diff --git a/samples/browseable/StorageProvider/_index.jd b/samples/browseable/StorageProvider/_index.jd
index ef6f64621..9af4ec5ce 100644
--- a/samples/browseable/StorageProvider/_index.jd
+++ b/samples/browseable/StorageProvider/_index.jd
@@ -5,7 +5,7 @@ sample.group=Content
 
 <p>
             
-            \nA simple implementation of a documents provider using the storage access framework in
-            Android 4.4.
+A simple implementation of a documents provider using the storage access framework in
+Android 4.4.
             
         </p>
diff --git a/samples/browseable/StorageProvider/res/values/base-strings.xml b/samples/browseable/StorageProvider/res/values/base-strings.xml
index 5fd804c44..d80a40a6d 100644
--- a/samples/browseable/StorageProvider/res/values/base-strings.xml
+++ b/samples/browseable/StorageProvider/res/values/base-strings.xml
@@ -21,8 +21,8 @@
         <![CDATA[
         
             
-            \nA simple implementation of a documents provider using the storage access framework in
-            Android 4.4.
+A simple implementation of a documents provider using the storage access framework in
+Android 4.4.
             
         
         ]]>
diff --git a/samples/browseable/WatchFace/Wearable/AndroidManifest.xml b/samples/browseable/WatchFace/Wearable/AndroidManifest.xml
index a92229711..7dd5b69a9 100644
--- a/samples/browseable/WatchFace/Wearable/AndroidManifest.xml
+++ b/samples/browseable/WatchFace/Wearable/AndroidManifest.xml
@@ -14,125 +14,132 @@
      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.wearable.watchface" >
+<manifest package="com.example.android.wearable.watchface"
+          xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-sdk
         android:minSdkVersion="21"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="23"/>
 
-    <uses-feature android:name="android.hardware.type.watch" />
+    <uses-feature android:name="android.hardware.type.watch"/>
 
     <!-- Required to act as a custom watch face. -->
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+
+    <!-- Required for complications to receive complication data and open the provider chooser. -->
+    <uses-permission android:name="com.google.android.wearable.permission.RECEIVE_COMPLICATION_DATA"/>
 
     <!-- Calendar permission used by CalendarWatchFaceService -->
-    <uses-permission android:name="android.permission.READ_CALENDAR" />
+    <uses-permission android:name="android.permission.READ_CALENDAR"/>
 
     <!-- Location permission used by FitDistanceWatchFaceService -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+
+    <android:uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <android:uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <android:uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name" >
-
+        android:label="@string/app_name">
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
+            android:value="@integer/google_play_services_version"/>
 
-        <uses-library android:name="com.google.android.wearable" android:required="false" />
+        <uses-library
+            android:name="com.google.android.wearable"
+            android:required="false"/>
 
         <service
             android:name=".AnalogWatchFaceService"
             android:label="@string/analog_name"
-            android:permission="android.permission.BIND_WALLPAPER" >
+            android:permission="android.permission.BIND_WALLPAPER">
             <meta-data
                 android:name="android.service.wallpaper"
-                android:resource="@xml/watch_face" />
+                android:resource="@xml/watch_face"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview"
-                android:resource="@drawable/preview_analog" />
+                android:resource="@drawable/preview_analog"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview_circular"
-                android:resource="@drawable/preview_analog_circular" />
+                android:resource="@drawable/preview_analog_circular"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.companionConfigurationAction"
-                android:value="com.example.android.wearable.watchface.CONFIG_ANALOG" />
+                android:value="com.example.android.wearable.watchface.CONFIG_ANALOG"/>
 
             <intent-filter>
-                <action android:name="android.service.wallpaper.WallpaperService" />
+                <action android:name="android.service.wallpaper.WallpaperService"/>
 
-                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE"/>
             </intent-filter>
         </service>
         <service
             android:name=".SweepWatchFaceService"
             android:label="@string/sweep_name"
-            android:permission="android.permission.BIND_WALLPAPER" >
+            android:permission="android.permission.BIND_WALLPAPER">
             <meta-data
                 android:name="android.service.wallpaper"
-                android:resource="@xml/watch_face" />
+                android:resource="@xml/watch_face"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview"
-                android:resource="@drawable/preview_analog" />
+                android:resource="@drawable/preview_analog"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview_circular"
-                android:resource="@drawable/preview_analog_circular" />
+                android:resource="@drawable/preview_analog_circular"/>
 
             <intent-filter>
-                <action android:name="android.service.wallpaper.WallpaperService" />
+                <action android:name="android.service.wallpaper.WallpaperService"/>
 
-                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE"/>
             </intent-filter>
         </service>
         <service
             android:name=".OpenGLWatchFaceService"
             android:label="@string/opengl_name"
-            android:permission="android.permission.BIND_WALLPAPER" >
+            android:permission="android.permission.BIND_WALLPAPER">
             <meta-data
                 android:name="android.service.wallpaper"
-                android:resource="@xml/watch_face" />
+                android:resource="@xml/watch_face"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview"
-                android:resource="@drawable/preview_opengl" />
+                android:resource="@drawable/preview_opengl"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview_circular"
-                android:resource="@drawable/preview_opengl_circular" />
+                android:resource="@drawable/preview_opengl_circular"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.companionConfigurationAction"
-                android:value="com.example.android.wearable.watchface.CONFIG_OPENGL" />
+                android:value="com.example.android.wearable.watchface.CONFIG_OPENGL"/>
 
             <intent-filter>
-                <action android:name="android.service.wallpaper.WallpaperService" />
+                <action android:name="android.service.wallpaper.WallpaperService"/>
 
-                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE"/>
             </intent-filter>
         </service>
         <service
             android:name=".CardBoundsWatchFaceService"
             android:label="@string/card_bounds_name"
-            android:permission="android.permission.BIND_WALLPAPER" >
+            android:permission="android.permission.BIND_WALLPAPER">
             <meta-data
                 android:name="android.service.wallpaper"
-                android:resource="@xml/watch_face" />
+                android:resource="@xml/watch_face"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview"
-                android:resource="@drawable/preview_card_bounds" />
+                android:resource="@drawable/preview_card_bounds"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview_circular"
-                android:resource="@drawable/preview_card_bounds_circular" />
+                android:resource="@drawable/preview_card_bounds_circular"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.companionConfigurationAction"
-                android:value="com.example.android.wearable.watchface.CONFIG_CARD_BOUNDS" />
+                android:value="com.example.android.wearable.watchface.CONFIG_CARD_BOUNDS"/>
 
             <intent-filter>
-                <action android:name="android.service.wallpaper.WallpaperService" />
+                <action android:name="android.service.wallpaper.WallpaperService"/>
 
-                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE"/>
             </intent-filter>
         </service>
-
         <service
             android:name=".ComplicationSimpleWatchFaceService"
             android:enabled="true"
@@ -157,6 +164,8 @@
                 <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE"/>
             </intent-filter>
         </service>
+
+        <activity android:name="android.support.wearable.complications.ComplicationHelperActivity"/>
         <activity
             android:name=".ComplicationSimpleConfigActivity"
             android:label="@string/complication_simple">
@@ -171,47 +180,47 @@
         <service
             android:name=".InteractiveWatchFaceService"
             android:label="@string/interactive_name"
-            android:permission="android.permission.BIND_WALLPAPER" >
+            android:permission="android.permission.BIND_WALLPAPER">
             <meta-data
                 android:name="android.service.wallpaper"
-                android:resource="@xml/watch_face" />
+                android:resource="@xml/watch_face"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview"
-                android:resource="@drawable/preview_interactive" />
+                android:resource="@drawable/preview_interactive"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview_circular"
-                android:resource="@drawable/preview_interactive_circular" />
+                android:resource="@drawable/preview_interactive_circular"/>
 
             <intent-filter>
-                <action android:name="android.service.wallpaper.WallpaperService" />
+                <action android:name="android.service.wallpaper.WallpaperService"/>
 
-                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE"/>
             </intent-filter>
         </service>
         <service
             android:name=".DigitalWatchFaceService"
             android:label="@string/digital_name"
-            android:permission="android.permission.BIND_WALLPAPER" >
+            android:permission="android.permission.BIND_WALLPAPER">
             <meta-data
                 android:name="android.service.wallpaper"
-                android:resource="@xml/watch_face" />
+                android:resource="@xml/watch_face"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview"
-                android:resource="@drawable/preview_digital" />
+                android:resource="@drawable/preview_digital"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview_circular"
-                android:resource="@drawable/preview_digital_circular" />
+                android:resource="@drawable/preview_digital_circular"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.companionConfigurationAction"
-                android:value="com.example.android.wearable.watchface.CONFIG_DIGITAL" />
+                android:value="com.example.android.wearable.watchface.CONFIG_DIGITAL"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.wearableConfigurationAction"
-                android:value="com.example.android.wearable.watchface.CONFIG_DIGITAL" />
+                android:value="com.example.android.wearable.watchface.CONFIG_DIGITAL"/>
 
             <intent-filter>
-                <action android:name="android.service.wallpaper.WallpaperService" />
+                <action android:name="android.service.wallpaper.WallpaperService"/>
 
-                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE"/>
             </intent-filter>
         </service>
 
@@ -223,95 +232,99 @@
 
         <activity
             android:name=".DigitalWatchFaceWearableConfigActivity"
-            android:label="@string/digital_config_name" >
+            android:label="@string/digital_config_name">
             <intent-filter>
-                <action android:name="com.example.android.wearable.watchface.CONFIG_DIGITAL" />
+                <action android:name="com.example.android.wearable.watchface.CONFIG_DIGITAL"/>
 
-                <category android:name="com.google.android.wearable.watchface.category.WEARABLE_CONFIGURATION" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.google.android.wearable.watchface.category.WEARABLE_CONFIGURATION"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
 
         <service
             android:name=".CalendarWatchFaceService"
             android:label="@string/calendar_name"
-            android:permission="android.permission.BIND_WALLPAPER" >
+            android:permission="android.permission.BIND_WALLPAPER">
             <meta-data
                 android:name="android.service.wallpaper"
-                android:resource="@xml/watch_face" />
+                android:resource="@xml/watch_face"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview"
-                android:resource="@drawable/preview_calendar" />
+                android:resource="@drawable/preview_calendar"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview_circular"
-                android:resource="@drawable/preview_calendar_circular" />
+                android:resource="@drawable/preview_calendar_circular"/>
 
             <intent-filter>
-                <action android:name="android.service.wallpaper.WallpaperService" />
+                <action android:name="android.service.wallpaper.WallpaperService"/>
 
-                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE"/>
             </intent-filter>
         </service>
-        <service android:name=".DigitalWatchFaceConfigListenerService" >
+        <service android:name=".DigitalWatchFaceConfigListenerService">
             <intent-filter>
-                <action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED" />
-                <data android:scheme="wear" android:host="*" android:pathPrefix="/"/>
+                <action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED"/>
+
+                <data
+                    android:host="*"
+                    android:pathPrefix="/"
+                    android:scheme="wear"/>
             </intent-filter>
         </service>
         <service
             android:name=".FitDistanceWatchFaceService"
             android:label="@string/fit_distance_name"
-            android:permission="android.permission.BIND_WALLPAPER" >
+            android:permission="android.permission.BIND_WALLPAPER">
             <meta-data
                 android:name="android.service.wallpaper"
-                android:resource="@xml/watch_face" />
+                android:resource="@xml/watch_face"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview"
-                android:resource="@drawable/preview_distance" />
+                android:resource="@drawable/preview_distance"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview_circular"
-                android:resource="@drawable/preview_distance_circular" />
+                android:resource="@drawable/preview_distance_circular"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.companionConfigurationAction"
-                android:value="com.example.android.wearable.watchface.CONFIG_FIT_DISTANCE" />
+                android:value="com.example.android.wearable.watchface.CONFIG_FIT_DISTANCE"/>
 
             <intent-filter>
-                <action android:name="android.service.wallpaper.WallpaperService" />
+                <action android:name="android.service.wallpaper.WallpaperService"/>
 
-                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE"/>
             </intent-filter>
         </service>
         <service
             android:name=".FitStepsWatchFaceService"
             android:label="@string/fit_steps_name"
-            android:permission="android.permission.BIND_WALLPAPER" >
+            android:permission="android.permission.BIND_WALLPAPER">
             <meta-data
                 android:name="android.service.wallpaper"
-                android:resource="@xml/watch_face" />
+                android:resource="@xml/watch_face"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview"
-                android:resource="@drawable/preview_fit" />
+                android:resource="@drawable/preview_fit"/>
             <meta-data
                 android:name="com.google.android.wearable.watchface.preview_circular"
-                android:resource="@drawable/preview_fit_circular" />
+                android:resource="@drawable/preview_fit_circular"/>
 
             <intent-filter>
-                <action android:name="android.service.wallpaper.WallpaperService" />
+                <action android:name="android.service.wallpaper.WallpaperService"/>
 
-                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE"/>
             </intent-filter>
         </service>
 
         <activity
             android:name=".CalendarWatchFacePermissionActivity"
-            android:label="@string/title_activity_calendar_watch_face_permission" >
+            android:label="@string/title_activity_calendar_watch_face_permission">
         </activity>
 
         <service
             android:name=".provider.RandomNumberProviderService"
+            android:icon="@drawable/ic_launcher"
             android:label="@string/complications_provider_random_number"
-            android:icon="@drawable/ic_launcher">
-
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
             <intent-filter>
                 <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST"/>
             </intent-filter>
@@ -322,19 +335,24 @@
             <!--
             When your complication data provider is active, UPDATE_PERIOD_SECONDS specifies how
             often you want the system to check for updates to the data. In this case, the time is
-            specified to a relatively short 120 seconds, so we can observe the result of this code
-            lab. In everyday use, developers should consider intervals in the order of minutes.
+            specified to 600 seconds (10 minutes).
+
+            In general, you want to set this value high and manually trigger updates only when your
+            complication data actually changes via ProviderUpdateRequester (check
+            UpdateComplicationDataService.java for an example).
+
+            In everyday use, developers should consider intervals in the order of minutes.
             Also, remember that this is only a guidance for the system. Android Wear may update less
             frequently.
-
-            If your app needs to push updates instead of updating on a regular schedule, you should
-            set this value to 0 and use ProviderUpdateRequester.requestUpdate() to trigger an update
-            request when you need one.
             -->
             <meta-data
                 android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
-                android:value="120"/>
+                android:value="600"/>
+        </service>
+        <service
+            android:name=".provider.UpdateComplicationDataService"
+            android:exported="false">
         </service>
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleConfigActivity.java b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleConfigActivity.java
index 66e208c2e..6d4e521a1 100644
--- a/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleConfigActivity.java
+++ b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleConfigActivity.java
@@ -22,6 +22,8 @@ import android.content.Intent;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.support.wearable.complications.ComplicationHelperActivity;
+import android.support.wearable.complications.ComplicationProviderInfo;
 import android.support.wearable.complications.ProviderChooserIntent;
 import android.support.wearable.view.WearableListView;
 import android.util.Log;
@@ -64,6 +66,13 @@ public class ComplicationSimpleConfigActivity extends Activity implements
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == PROVIDER_CHOOSER_REQUEST_CODE
                 && resultCode == RESULT_OK) {
+
+            // Retrieves information for selected Complication provider.
+            ComplicationProviderInfo complicationProviderInfo =
+                    data.getParcelableExtra(ProviderChooserIntent.EXTRA_PROVIDER_INFO);
+
+            Log.d(TAG, "Selected Provider: " + complicationProviderInfo);
+
             finish();
         }
     }
@@ -77,10 +86,16 @@ public class ComplicationSimpleConfigActivity extends Activity implements
         Integer tag = (Integer) viewHolder.itemView.getTag();
         ComplicationItem complicationItem = mAdapter.getItem(tag);
 
-        startActivityForResult(ProviderChooserIntent.createProviderChooserIntent(
-                complicationItem.watchFace,
-                complicationItem.complicationId,
-                complicationItem.supportedTypes), PROVIDER_CHOOSER_REQUEST_CODE);
+        // Note: If you were previously using ProviderChooserIntent.createProviderChooserIntent()
+        // (now deprecated), you will want to switch to
+        // ComplicationHelperActivity.createProviderChooserHelperIntent()
+        startActivityForResult(
+                ComplicationHelperActivity.createProviderChooserHelperIntent(
+                        getApplicationContext(),
+                        complicationItem.watchFace,
+                        complicationItem.complicationId,
+                        complicationItem.supportedTypes),
+                PROVIDER_CHOOSER_REQUEST_CODE);
     }
 
     private List<ComplicationItem> getComplicationItems() {
@@ -187,5 +202,4 @@ public class ComplicationSimpleConfigActivity extends Activity implements
             return mItems.get(position);
         }
     }
-
 }
\ No newline at end of file
diff --git a/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleWatchFaceService.java b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleWatchFaceService.java
index 9eca2c33b..4905293dd 100644
--- a/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleWatchFaceService.java
+++ b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/ComplicationSimpleWatchFaceService.java
@@ -18,6 +18,7 @@ package com.example.android.wearable.watchface;
 
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -35,6 +36,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.support.v7.graphics.Palette;
 import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationHelperActivity;
 import android.support.wearable.complications.ComplicationText;
 import android.support.wearable.watchface.CanvasWatchFaceService;
 import android.support.wearable.watchface.WatchFaceService;
@@ -362,16 +364,34 @@ public class ComplicationSimpleWatchFaceService extends CanvasWatchFaceService {
             if (Log.isLoggable(TAG, Log.DEBUG)) {
                 Log.d(TAG, "onComplicationTap()");
             }
+
             ComplicationData complicationData =
                     mActiveComplicationDataSparseArray.get(complicationId);
 
-            if ((complicationData != null) && (complicationData.getTapAction() != null)) {
-                try {
-                    complicationData.getTapAction().send();
-                } catch (PendingIntent.CanceledException e) {
-                    Log.e(TAG, "On complication tap action error " + e);
+            if (complicationData != null) {
+
+                if (complicationData.getTapAction() != null) {
+                    try {
+                        complicationData.getTapAction().send();
+                    } catch (PendingIntent.CanceledException e) {
+                        Log.e(TAG, "On complication tap action error " + e);
+                    }
+
+                } else if (complicationData.getType() == ComplicationData.TYPE_NO_PERMISSION) {
+
+                    // Watch face does not have permission to receive complication data, so launch
+                    // permission request.
+                    ComponentName componentName = new ComponentName(
+                            getApplicationContext(),
+                            ComplicationSimpleWatchFaceService.class);
+
+                    Intent permissionRequestIntent =
+                            ComplicationHelperActivity.createPermissionRequestHelperIntent(
+                                    getApplicationContext(), componentName);
+
+                    startActivity(permissionRequestIntent);
                 }
-                invalidate();
+
             } else {
                 if (Log.isLoggable(TAG, Log.DEBUG)) {
                     Log.d(TAG, "No PendingIntent for complication " + complicationId + ".");
@@ -551,50 +571,57 @@ public class ComplicationSimpleWatchFaceService extends CanvasWatchFaceService {
                 complicationData = mActiveComplicationDataSparseArray.get(COMPLICATION_IDS[i]);
 
                 if ((complicationData != null)
-                        && (complicationData.isActive(currentTimeMillis))
-                        && (complicationData.getType() == ComplicationData.TYPE_SHORT_TEXT)) {
-
-                    ComplicationText mainText = complicationData.getShortText();
-                    ComplicationText subText = complicationData.getShortTitle();
-
-                    CharSequence complicationMessage =
-                            mainText.getText(getApplicationContext(), currentTimeMillis);
-
-                    /* In most cases you would want the subText (Title) under the mainText (Text),
-                     * but to keep it simple for the code lab, we are concatenating them all on one
-                     * line.
-                     */
-                    if (subText != null) {
-                        complicationMessage = TextUtils.concat(
-                                complicationMessage,
-                                " ",
-                                subText.getText(getApplicationContext(), currentTimeMillis));
-                    }
-
-                    //Log.d(TAG, "Comp id: " + COMPLICATION_IDS[i] + "\t" + complicationMessage);
-                    double textWidth =
-                            mComplicationPaint.measureText(
+                        && (complicationData.isActive(currentTimeMillis))) {
+
+                    // Both Short Text and No Permission Types can be rendered with the same code.
+                    // No Permission will display "--" with an Intent to launch a permission prompt.
+                    // If you want to support more types, just add a "else if" below with your
+                    // rendering code inside.
+                    if (complicationData.getType() == ComplicationData.TYPE_SHORT_TEXT
+                            || complicationData.getType() == ComplicationData.TYPE_NO_PERMISSION) {
+
+                        ComplicationText mainText = complicationData.getShortText();
+                        ComplicationText subText = complicationData.getShortTitle();
+
+                        CharSequence complicationMessage =
+                                mainText.getText(getApplicationContext(), currentTimeMillis);
+
+                        /* In most cases you would want the subText (Title) under the
+                         * mainText (Text), but to keep it simple for the code lab, we are
+                         * concatenating them all on one line.
+                         */
+                        if (subText != null) {
+                            complicationMessage = TextUtils.concat(
                                     complicationMessage,
-                                    0,
-                                    complicationMessage.length());
+                                    " ",
+                                    subText.getText(getApplicationContext(), currentTimeMillis));
+                        }
 
-                    int complicationsX;
+                        //Log.d(TAG, "Com id: " + COMPLICATION_IDS[i] + "\t" + complicationMessage);
+                        double textWidth =
+                                mComplicationPaint.measureText(
+                                        complicationMessage,
+                                        0,
+                                        complicationMessage.length());
+
+                        int complicationsX;
+
+                        if (COMPLICATION_IDS[i] == LEFT_DIAL_COMPLICATION) {
+                            complicationsX = (int) ((mWidth / 2) - textWidth) / 2;
+                        } else {
+                            // RIGHT_DIAL_COMPLICATION calculations
+                            int offset = (int) ((mWidth / 2) - textWidth) / 2;
+                            complicationsX = (mWidth / 2) + offset;
+                        }
 
-                    if (COMPLICATION_IDS[i] == LEFT_DIAL_COMPLICATION) {
-                        complicationsX = (int) ((mWidth / 2) - textWidth) / 2;
-                    } else {
-                        // RIGHT_DIAL_COMPLICATION calculations
-                        int offset = (int) ((mWidth / 2) - textWidth) / 2;
-                        complicationsX = (mWidth / 2) + offset;
+                        canvas.drawText(
+                                complicationMessage,
+                                0,
+                                complicationMessage.length(),
+                                complicationsX,
+                                mComplicationsY,
+                                mComplicationPaint);
                     }
-
-                    canvas.drawText(
-                            complicationMessage,
-                            0,
-                            complicationMessage.length(),
-                            complicationsX,
-                            mComplicationsY,
-                            mComplicationPaint);
                 }
             }
         }
diff --git a/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/provider/RandomNumberProviderService.java b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/provider/RandomNumberProviderService.java
index 916f90fd9..17d03c272 100644
--- a/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/provider/RandomNumberProviderService.java
+++ b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/provider/RandomNumberProviderService.java
@@ -1,5 +1,7 @@
 package com.example.android.wearable.watchface.provider;
 
+import android.app.PendingIntent;
+import android.content.Intent;
 import android.support.wearable.complications.ComplicationData;
 import android.support.wearable.complications.ComplicationManager;
 import android.support.wearable.complications.ComplicationProviderService;
@@ -42,7 +44,7 @@ public class RandomNumberProviderService extends ComplicationProviderService {
     @Override
     public void onComplicationUpdate(
             int complicationId, int dataType, ComplicationManager complicationManager) {
-        Log.d(TAG, "onComplicationUpdate()");
+        Log.d(TAG, "onComplicationUpdate() id: " + complicationId);
 
 
         // Retrieve your data, in this case, we simply create a random number to display.
@@ -51,6 +53,24 @@ public class RandomNumberProviderService extends ComplicationProviderService {
         String randomNumberText =
                 String.format(Locale.getDefault(), "%d!", randomNumber);
 
+        // Create Tap Action so that the user can trigger an update by tapping the complication.
+        Intent updateIntent =
+                new Intent(getApplicationContext(), UpdateComplicationDataService.class);
+        updateIntent.setAction(UpdateComplicationDataService.ACTION_UPDATE_COMPLICATION);
+        // We pass the complication id, so we can only update the specific complication tapped.
+        updateIntent.putExtra(UpdateComplicationDataService.EXTRA_COMPLICATION_ID, complicationId);
+
+        PendingIntent pendingIntent = PendingIntent.getService(
+                getApplicationContext(),
+                // Set the requestCode to the complication id. This ensures the system doesn't
+                // combine other PendingIntents with the same context with this one (basically it
+                // would then reuse the Extra you set in the initial PendingIntent). If you don't
+                // do this and multiple complications with your data are active, every PendingIntent
+                // assigned for tap, would use the same complication id (first one created).
+                complicationId,
+                updateIntent,
+                0);
+
         ComplicationData complicationData = null;
 
         switch (dataType) {
@@ -60,17 +80,20 @@ public class RandomNumberProviderService extends ComplicationProviderService {
                         .setMinValue(0)
                         .setMaxValue(10)
                         .setShortText(ComplicationText.plainText(randomNumberText))
+                        .setTapAction(pendingIntent)
                         .build();
                 break;
             case ComplicationData.TYPE_SHORT_TEXT:
                 complicationData = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
                         .setShortText(ComplicationText.plainText(randomNumberText))
+                        .setTapAction(pendingIntent)
                         .build();
                 break;
             case ComplicationData.TYPE_LONG_TEXT:
                 complicationData = new ComplicationData.Builder(ComplicationData.TYPE_LONG_TEXT)
                         .setLongText(
                                 ComplicationText.plainText("Random Number: " + randomNumberText))
+                        .setTapAction(pendingIntent)
                         .build();
                 break;
             default:
diff --git a/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/provider/UpdateComplicationDataService.java b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/provider/UpdateComplicationDataService.java
new file mode 100644
index 000000000..203e491c2
--- /dev/null
+++ b/samples/browseable/WatchFace/Wearable/src/com.example.android.wearable.watchface/provider/UpdateComplicationDataService.java
@@ -0,0 +1,63 @@
+package com.example.android.wearable.watchface.provider;
+
+import android.app.IntentService;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.support.wearable.complications.ProviderUpdateRequester;
+import android.util.Log;
+
+/**
+ * Simple {@link IntentService} subclass for asynchronously requesting an update for the random
+ * number complication (triggered via TapAction on complication).
+ */
+public class UpdateComplicationDataService extends IntentService {
+
+    private static final String TAG = "UpdateCompService";
+
+    public static final String ACTION_UPDATE_COMPLICATION =
+            "com.example.android.wearable.watchface.provider.action.UPDATE_COMPLICATION";
+
+    public static final String EXTRA_COMPLICATION_ID =
+            "com.example.android.wearable.watchface.provider.action.COMPLICATION_ID";
+
+    public UpdateComplicationDataService() {
+        super("UpdateComplicationDataService");
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+
+        if (intent != null) {
+
+            final String action = intent.getAction();
+
+            if (ACTION_UPDATE_COMPLICATION.equals(action)) {
+
+                int complicationId = intent.getIntExtra(EXTRA_COMPLICATION_ID, -1);
+                handleActionUpdateComplicationData(complicationId);
+            }
+        }
+    }
+
+    /**
+     * Handle action UpdateComplicationData in the provided background thread with the provided
+     * parameters.
+     */
+    private void handleActionUpdateComplicationData(int complicationId) {
+
+        Log.d(TAG, "Complication id to update via service: " + complicationId);
+
+        ComponentName componentName =
+                new ComponentName(getApplicationContext(), RandomNumberProviderService.class);
+
+        ProviderUpdateRequester providerUpdateRequester =
+                new ProviderUpdateRequester(getApplicationContext(), componentName);
+
+        if (complicationId > 0) {
+            // This method only updates the specific complication tapped on the watch, if you
+            // wanted to update all active complications associated with your data, you would
+            // call providerUpdateRequester.requestUpdateAll().
+            providerUpdateRequester.requestUpdate(complicationId);
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearDrawers/AndroidManifest.xml b/samples/browseable/WearDrawers/AndroidManifest.xml
index 3044d1906..eaf9dbdbf 100644
--- a/samples/browseable/WearDrawers/AndroidManifest.xml
+++ b/samples/browseable/WearDrawers/AndroidManifest.xml
@@ -21,7 +21,6 @@
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
-
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
diff --git a/samples/browseable/WearNotifications/Application/AndroidManifest.xml b/samples/browseable/WearNotifications/Application/AndroidManifest.xml
new file mode 100644
index 000000000..20c44cc12
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/AndroidManifest.xml
@@ -0,0 +1,83 @@
+<?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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.example.android.wearable.wear.wearnotifications"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppThemeOverride">
+
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".handlers.BigTextMainActivity"
+            android:excludeFromRecents="true"
+            android:label="@string/title_activity_big_text_main"
+            android:taskAffinity="">
+        </activity>
+
+        <activity
+            android:name=".handlers.BigPictureSocialMainActivity"
+            android:label="@string/title_activity_big_picture_main">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainActivity"/>
+        </activity>
+
+
+        <activity
+            android:name=".handlers.InboxMainActivity"
+            android:label="@string/title_activity_inbox_main">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainActivity"/>
+        </activity>
+
+        <activity
+            android:name=".handlers.MessagingMainActivity"
+            android:label="@string/title_activity_messaging_main">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainActivity"/>
+        </activity>
+
+        <service
+            android:name=".handlers.BigTextIntentService"
+            android:exported="false">
+        </service>
+
+        <service
+            android:name=".handlers.MessagingIntentService"
+            android:exported="false">
+        </service>
+
+        <service
+            android:name=".handlers.BigPictureSocialIntentService"
+            android:exported="false">
+        </service>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/earth.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/earth.png
new file mode 100644
index 000000000..13abd77a5
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/earth.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_alarm_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_alarm_white_48dp.png
new file mode 100644
index 000000000..75e5a46ee
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_alarm_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_cancel_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_cancel_white_48dp.png
new file mode 100644
index 000000000..dc32a14f9
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_cancel_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_launcher.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 000000000..0ed1b5fbf
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_message_black_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_message_black_18dp.png
new file mode 100644
index 000000000..d921ba2da
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_message_black_18dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_person_black_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..f1e148490
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_person_black_48dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_reply_white_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_reply_white_18dp.png
new file mode 100644
index 000000000..cc732baab
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/ic_reply_white_18dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-hdpi/tile.9.png b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/tile.9.png
new file mode 100644
index 000000000..135862883
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-hdpi/tile.9.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_alarm_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_alarm_white_48dp.png
new file mode 100644
index 000000000..280e09df3
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_alarm_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_cancel_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_cancel_white_48dp.png
new file mode 100644
index 000000000..6ebbc8316
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_cancel_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_launcher.png b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 000000000..2b6948acb
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_message_black_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_message_black_18dp.png
new file mode 100644
index 000000000..2156f1673
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_message_black_18dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_person_black_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..360a32f27
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_person_black_48dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_reply_white_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_reply_white_18dp.png
new file mode 100644
index 000000000..b336e2f4d
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-mdpi/ic_reply_white_18dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_alarm_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_alarm_white_48dp.png
new file mode 100644
index 000000000..aa8102fd2
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_alarm_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_cancel_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_cancel_white_48dp.png
new file mode 100644
index 000000000..dc775b243
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_cancel_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_launcher.png b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..d9b134890
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_launcher.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_message_black_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_message_black_18dp.png
new file mode 100644
index 000000000..185d6136e
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_message_black_18dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_person_black_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..1ebc37be1
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_person_black_48dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_reply_white_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_reply_white_18dp.png
new file mode 100644
index 000000000..0424c2bd6
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xhdpi/ic_reply_white_18dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_alarm_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_alarm_white_48dp.png
new file mode 100644
index 000000000..f665286f8
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_alarm_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_cancel_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_cancel_white_48dp.png
new file mode 100644
index 000000000..cf2822a07
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_cancel_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_launcher.png b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..cb4f56f26
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_launcher.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_message_black_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_message_black_18dp.png
new file mode 100644
index 000000000..e710deeb5
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_message_black_18dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_person_black_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..77e3a1816
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_person_black_48dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_reply_white_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_reply_white_18dp.png
new file mode 100644
index 000000000..eeb5d4977
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xxhdpi/ic_reply_white_18dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_alarm_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_alarm_white_48dp.png
new file mode 100644
index 000000000..419f4bb4f
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_alarm_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_cancel_white_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_cancel_white_48dp.png
new file mode 100644
index 000000000..8bea844cd
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_cancel_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_launcher.png b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..77c9929cb
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_message_black_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_message_black_18dp.png
new file mode 100644
index 000000000..5456c42f4
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_message_black_18dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_person_black_48dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..6be3e3063
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_person_black_48dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_reply_white_18dp.png b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_reply_white_18dp.png
new file mode 100644
index 000000000..de0dad204
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/drawable-xxxhdpi/ic_reply_white_18dp.png
diff --git a/samples/browseable/WearNotifications/Application/res/layout/activity_big_picture_main.xml b/samples/browseable/WearNotifications/Application/res/layout/activity_big_picture_main.xml
new file mode 100644
index 000000000..e86c462f5
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/layout/activity_big_picture_main.xml
@@ -0,0 +1,37 @@
+<?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.
+-->
+<RelativeLayout
+    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:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context=".handlers.BigPictureSocialMainActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/main_text_activity_big_picture_main"
+        android:id="@+id/mainTextView"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"/>
+</RelativeLayout>
diff --git a/samples/browseable/WearNotifications/Application/res/layout/activity_big_text_main.xml b/samples/browseable/WearNotifications/Application/res/layout/activity_big_text_main.xml
new file mode 100644
index 000000000..5b37603bd
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/layout/activity_big_text_main.xml
@@ -0,0 +1,38 @@
+<?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.
+-->
+<RelativeLayout
+    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:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context=".handlers.BigTextMainActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/main_text_activity_big_text_main"
+        android:id="@+id/mainTextView"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"/>
+
+</RelativeLayout>
diff --git a/samples/browseable/WearNotifications/Application/res/layout/activity_inbox_main.xml b/samples/browseable/WearNotifications/Application/res/layout/activity_inbox_main.xml
new file mode 100644
index 000000000..0377b4ae8
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/layout/activity_inbox_main.xml
@@ -0,0 +1,38 @@
+<?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.
+-->
+<RelativeLayout
+    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:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context=".handlers.InboxMainActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/main_text_activity_inbox_main"
+        android:id="@+id/mainTextView"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"/>
+
+</RelativeLayout>
diff --git a/samples/browseable/WearNotifications/Application/res/layout/activity_main.xml b/samples/browseable/WearNotifications/Application/res/layout/activity_main.xml
new file mode 100644
index 000000000..c18e102b2
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/layout/activity_main.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2016 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.
+-->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/mainRelativeLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.example.android.wearable.wear.wearnotifications.MainActivity">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Pick your Notification Style:"
+        android:id="@+id/spinnerHeadertextView"/>
+
+    <Spinner
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/spinner"
+        android:layout_below="@+id/spinnerHeadertextView"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/notificationDetails"
+        android:layout_below="@+id/spinner"
+        android:layout_alignParentStart="true"
+        android:layout_above="@+id/submit"
+        android:layout_alignEnd="@+id/spinner"
+        android:paddingTop="@dimen/activity_vertical_margin"/>
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Launch!"
+        android:onClick="onClick"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
+        android:id="@+id/submit"/>
+</RelativeLayout>
diff --git a/samples/browseable/WearNotifications/Application/res/layout/activity_messaging_main.xml b/samples/browseable/WearNotifications/Application/res/layout/activity_messaging_main.xml
new file mode 100644
index 000000000..205b4285d
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/layout/activity_messaging_main.xml
@@ -0,0 +1,38 @@
+<?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.
+-->
+<RelativeLayout
+    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:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context=".handlers.MessagingMainActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/main_text_activity_messaging_main"
+        android:id="@+id/mainTextView"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Application/res/values-sw600dp/template-dimens.xml b/samples/browseable/WearNotifications/Application/res/values-sw600dp/template-dimens.xml
new file mode 100644
index 000000000..22074a2bd
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/values-sw600dp/template-dimens.xml
@@ -0,0 +1,24 @@
+<!--
+  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/samples/browseable/WearNotifications/Application/res/values-sw600dp/template-styles.xml b/samples/browseable/WearNotifications/Application/res/values-sw600dp/template-styles.xml
new file mode 100644
index 000000000..03d197418
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/values-sw600dp/template-styles.xml
@@ -0,0 +1,25 @@
+<!--
+  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/samples/browseable/WearNotifications/Application/res/values-v11/template-styles.xml b/samples/browseable/WearNotifications/Application/res/values-v11/template-styles.xml
new file mode 100644
index 000000000..8c1ea66f2
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/values-v11/template-styles.xml
@@ -0,0 +1,22 @@
+<!--
+  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/samples/browseable/WearNotifications/Application/res/values-v21/base-colors.xml b/samples/browseable/WearNotifications/Application/res/values-v21/base-colors.xml
new file mode 100644
index 000000000..8b6ec3f85
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/values-v21/base-colors.xml
@@ -0,0 +1,21 @@
+<?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>
+
+
+</resources>
diff --git a/samples/browseable/WearNotifications/Application/res/values-v21/base-template-styles.xml b/samples/browseable/WearNotifications/Application/res/values-v21/base-template-styles.xml
new file mode 100644
index 000000000..c778e4f98
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/values-v21/base-template-styles.xml
@@ -0,0 +1,24 @@
+<?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/samples/browseable/WearNotifications/Application/res/values-w820dp/dimens.xml b/samples/browseable/WearNotifications/Application/res/values-w820dp/dimens.xml
new file mode 100644
index 000000000..2a45ed87c
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/values-w820dp/dimens.xml
@@ -0,0 +1,22 @@
+<?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>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/samples/browseable/WearNotifications/Application/res/values/base-strings.xml b/samples/browseable/WearNotifications/Application/res/values/base-strings.xml
new file mode 100644
index 000000000..554428945
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/values/base-strings.xml
@@ -0,0 +1,33 @@
+<?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">Wear Notifications</string>
+    <string name="intro_message">
+        <![CDATA[
+        
+            
+            Sample demonstrates best practices for Notification Styles that support Android
+            phone/tablets and Android Wear. The phone app demonstrates best practices if you do not
+            have a dedicated Android Wear app for Notifications. While the Android Wear app
+            demonstrates best practices for a standalone Wear Notification experience without
+            the Notifications showing on the phone/tablet.
+            
+        
+        ]]>
+    </string>
+</resources>
diff --git a/samples/browseable/WearNotifications/Application/res/values/colors.xml b/samples/browseable/WearNotifications/Application/res/values/colors.xml
new file mode 100644
index 000000000..752b74fc3
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/values/colors.xml
@@ -0,0 +1,21 @@
+<?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>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/samples/browseable/WearNotifications/Application/res/values/dimens.xml b/samples/browseable/WearNotifications/Application/res/values/dimens.xml
new file mode 100644
index 000000000..fcb2a4296
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/values/dimens.xml
@@ -0,0 +1,21 @@
+<?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>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/samples/browseable/WearNotifications/Application/res/values/strings.xml b/samples/browseable/WearNotifications/Application/res/values/strings.xml
new file mode 100644
index 000000000..ddd1641be
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/values/strings.xml
@@ -0,0 +1,43 @@
+<?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="reply_label">Reply</string>
+    <string name="reply_name">Me</string>
+
+    <string name="title_activity_big_text_main">BigTextStyle Main Activity</string>
+    <string name="title_activity_big_picture_main">BigPictureStyle Main Activity</string>
+    <string name="title_activity_inbox_main">InboxStyle Main Activity</string>
+    <string name="title_activity_messaging_main">MessagingStyle Main Activity</string>
+
+    <string name="main_text_activity_big_text_main">
+        This Activity would handle the reminder app\'s functionality.
+        \n\nThe notification type for this example was the Big Text Style!
+    </string>
+    <string name="main_text_activity_big_picture_main">
+        This Activity would handle the social app\'s functionality for an individual post.
+        \n\nThe notification type for this example was the Big Picture Style!
+    </string>
+    <string name="main_text_activity_inbox_main">
+        This Activity would handle the email app\'s functionality for an email(s).
+        \n\nThe notification type for this example was the Inbox Style!
+    </string>
+    <string name="main_text_activity_messaging_main">
+        This Activity would handle the messaging app\'s functionality for a chat(s).
+        \n\nThe notification type for this example was the Messaging Style!
+    </string>
+</resources>
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Application/res/values/styles.xml b/samples/browseable/WearNotifications/Application/res/values/styles.xml
new file mode 100644
index 000000000..6ea59e045
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/values/styles.xml
@@ -0,0 +1,21 @@
+<?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>
+
+    <style name="AppThemeOverride" parent="Theme.AppCompat.Light" />
+
+</resources>
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Application/res/values/template-dimens.xml b/samples/browseable/WearNotifications/Application/res/values/template-dimens.xml
new file mode 100644
index 000000000..39e710b5c
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/values/template-dimens.xml
@@ -0,0 +1,32 @@
+<!--
+  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/samples/browseable/WearNotifications/Application/res/values/template-styles.xml b/samples/browseable/WearNotifications/Application/res/values/template-styles.xml
new file mode 100644
index 000000000..6e7d593dd
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/res/values/template-styles.xml
@@ -0,0 +1,42 @@
+<!--
+  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/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/GlobalNotificationBuilder.java b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/GlobalNotificationBuilder.java
new file mode 100644
index 000000000..1b1743f6f
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/GlobalNotificationBuilder.java
@@ -0,0 +1,60 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications;
+
+import android.support.v7.app.NotificationCompat;
+
+/**
+ * We use a Singleton for a global copy of the NotificationCompat.Builder to update active
+ * Notifications from other Services/Activities.
+ *
+ * You have two options for updating your notifications:
+ *
+ *  1. Use a new NotificationCompatBuilder to create the Notification. This approach requires you
+ *  to get *ALL* the information and pass it to the builder. We get all the information from a Mock
+ *  Database and this is the approach used in the MainActivity.
+ *
+ *  2. Use an existing NotificationCompatBuilder to create a Notification. This approach requires
+ *  you to store a reference to the original builder. The benefit is you only need the new/updated
+ *  information for an existing notification. We use this approach in the IntentService handlers to
+ *  update existing notifications.
+ *
+ *  IMPORTANT NOTE 1: You shouldn't save/modify the resulting Notification object using
+ *  its member variables and/or legacy APIs. If you want to retain anything from update
+ *  to update, retain the Builder as option 2 outlines.
+ *
+ *  IMPORTANT NOTE 2: If the global Notification Builder is lost because the process is killed, you
+ *  should have a way to recreate the Notification Builder from a persistent state. (We do this as
+ *  well in the sample, check the IntentServices.)
+ */
+public final class GlobalNotificationBuilder {
+
+    private static NotificationCompat.Builder sGlobalNotificationCompatBuilder = null;
+
+    /*
+     * Empty constructor - We don't initialize builder because we rely on a null state to let us
+     * know the Application's process was killed.
+     */
+    private GlobalNotificationBuilder () { }
+
+    public static void setNotificationCompatBuilderInstance (NotificationCompat.Builder builder) {
+        sGlobalNotificationCompatBuilder = builder;
+    }
+
+    public static NotificationCompat.Builder getNotificationCompatBuilderInstance(){
+        return sGlobalNotificationCompatBuilder;
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/MainActivity.java b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/MainActivity.java
new file mode 100644
index 000000000..65b0f7fcf
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/MainActivity.java
@@ -0,0 +1,828 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications;
+
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.graphics.BitmapFactory;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.NotificationCompat.BigPictureStyle;
+import android.support.v4.app.NotificationCompat.BigTextStyle;
+import android.support.v4.app.NotificationCompat.InboxStyle;
+import android.support.v4.app.NotificationCompat.MessagingStyle;
+import android.support.v4.app.NotificationManagerCompat;
+import android.support.v4.app.RemoteInput;
+import android.support.v4.app.TaskStackBuilder;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.app.NotificationCompat;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.RelativeLayout;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+
+
+import com.example.android.wearable.wear.wearnotifications.handlers.BigPictureSocialIntentService;
+import com.example.android.wearable.wear.wearnotifications.handlers.BigPictureSocialMainActivity;
+import com.example.android.wearable.wear.wearnotifications.handlers.BigTextIntentService;
+import com.example.android.wearable.wear.wearnotifications.handlers.BigTextMainActivity;
+import com.example.android.wearable.wear.wearnotifications.handlers.InboxMainActivity;
+import com.example.android.wearable.wear.wearnotifications.handlers.MessagingIntentService;
+import com.example.android.wearable.wear.wearnotifications.handlers.MessagingMainActivity;
+import com.example.android.wearable.wear.wearnotifications.mock.MockDatabase;
+
+/**
+ * The Activity demonstrates several popular Notification.Style examples along with their best
+ * practices (include proper Android Wear support when you don't have a dedicated Android Wear
+ * app).
+ */
+public class MainActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener {
+
+    public static final String TAG = "MainActivity";
+
+    public static final int NOTIFICATION_ID = 888;
+
+    // Used for Notification Style array and switch statement for Spinner selection
+    private static final String BIG_TEXT_STYLE = "BIG_TEXT_STYLE";
+    private static final String BIG_PICTURE_STYLE = "BIG_PICTURE_STYLE";
+    private static final String INBOX_STYLE = "INBOX_STYLE";
+    private static final String MESSAGING_STYLE = "MESSAGING_STYLE";
+
+    // Collection of notification styles to back ArrayAdapter for Spinner
+    private static final String[] NOTIFICATION_STYLES =
+            {BIG_TEXT_STYLE, BIG_PICTURE_STYLE, INBOX_STYLE, MESSAGING_STYLE};
+
+    private static final String[] NOTIFICATION_STYLES_DESCRIPTION =
+            {
+                    "Demos reminder type app using BIG_TEXT_STYLE",
+                    "Demos social type app using BIG_PICTURE_STYLE + inline notification response",
+                    "Demos email type app using INBOX_STYLE",
+                    "Demos messaging app using MESSAGING_STYLE + inline notification responses"
+            };
+
+    private NotificationManagerCompat mNotificationManagerCompat;
+
+    private int mSelectedNotification = 0;
+
+    // RelativeLayout is needed for SnackBars to alert users when Notifications are disabled for app
+    private RelativeLayout mMainRelativeLayout;
+    private Spinner mSpinner;
+    private TextView mNotificationDetailsTextView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        mMainRelativeLayout = (RelativeLayout) findViewById(R.id.mainRelativeLayout);
+        mNotificationDetailsTextView = (TextView) findViewById(R.id.notificationDetails);
+        mSpinner = (Spinner) findViewById(R.id.spinner);
+
+        mNotificationManagerCompat = NotificationManagerCompat.from(getApplicationContext());
+
+        // Create an ArrayAdapter using the string array and a default spinner layout
+        ArrayAdapter<CharSequence> adapter =
+                new ArrayAdapter(
+                        this,
+                        android.R.layout.simple_spinner_item,
+                        NOTIFICATION_STYLES);
+        // Specify the layout to use when the list of choices appears
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        // Apply the adapter to the spinner
+        mSpinner.setAdapter(adapter);
+        mSpinner.setOnItemSelectedListener(this);
+    }
+
+    @Override
+    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        Log.d(TAG, "onItemSelected(): position: " + position + " id: " + id);
+
+        mSelectedNotification = position;
+
+        mNotificationDetailsTextView.setText(
+                NOTIFICATION_STYLES_DESCRIPTION[mSelectedNotification]);
+    }
+    @Override
+    public void onNothingSelected(AdapterView<?> parent) {
+        // Required
+    }
+
+    public void onClick(View view) {
+
+        Log.d(TAG, "onClick()");
+
+        boolean areNotificationsEnabled = mNotificationManagerCompat.areNotificationsEnabled();
+
+        if (!areNotificationsEnabled) {
+            // Because the user took an action to create a notification, we create a prompt to let
+            // the user re-enable notifications for this application again.
+            Snackbar snackbar = Snackbar
+                    .make(
+                            mMainRelativeLayout,
+                            "You need to enable notifications for this app",
+                            Snackbar.LENGTH_LONG)
+                    .setAction("ENABLE", new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            // Links to this app's notification settings
+                            openNotificationSettingsForApp();
+                        }
+                    });
+            snackbar.show();
+            return;
+        }
+
+        String notificationStyle = NOTIFICATION_STYLES[mSelectedNotification];
+
+        switch (notificationStyle) {
+            case BIG_TEXT_STYLE:
+                generateBigTextStyleNotification();
+                break;
+
+            case BIG_PICTURE_STYLE:
+                generateBigPictureStyleNotification();
+                break;
+
+            case INBOX_STYLE:
+                generateInboxStyleNotification();
+                break;
+
+            case MESSAGING_STYLE:
+                generateMessagingStyleNotification();
+                break;
+
+            default:
+                // continue below
+        }
+    }
+
+    /*
+     * Generates a BIG_TEXT_STYLE Notification that supports both phone/tablet and wear. For devices
+     * on API level 16 (4.1.x - Jelly Bean) and after, displays BIG_TEXT_STYLE. Otherwise, displays
+     * a basic notification.
+     */
+    private void generateBigTextStyleNotification() {
+
+        Log.d(TAG, "generateBigTextStyleNotification()");
+
+        // Main steps for building a BIG_TEXT_STYLE notification:
+        //      0. Get your data
+        //      1. Build the BIG_TEXT_STYLE
+        //      2. Set up main Intent for notification
+        //      3. Create additional Actions for the Notification
+        //      4. Build and issue the notification
+
+        // 0. Get your data (everything unique per Notification)
+        MockDatabase.BigTextStyleReminderAppData bigTextStyleReminderAppData =
+                MockDatabase.getBigTextStyleData();
+
+        // 1. Build the BIG_TEXT_STYLE
+        BigTextStyle bigTextStyle = new NotificationCompat.BigTextStyle()
+                // Overrides ContentText in the big form of the template
+                .bigText(bigTextStyleReminderAppData.getBigText())
+                // Overrides ContentTitle in the big form of the template
+                .setBigContentTitle(bigTextStyleReminderAppData.getBigContentTitle())
+                // Summary line after the detail section in the big form of the template
+                // Note: To improve readability, don't overload the user with info. If Summary Text
+                // doesn't add critical information, you should skip it.
+                .setSummaryText(bigTextStyleReminderAppData.getSummaryText());
+
+
+        // 2. Set up main Intent for notification
+        Intent notifyIntent = new Intent(this, BigTextMainActivity.class);
+
+        // When creating your Intent, you need to take into account the back state, i.e., what
+        // happens after your Activity launches and the user presses the back button.
+
+        // There are two options:
+        //      1. Regular activity - You're starting an Activity that's part of the application's
+        //      normal workflow.
+
+        //      2. Special activity - The user only sees this Activity if it's started from a
+        //      notification. In a sense, the Activity extends the notification by providing
+        //      information that would be hard to display in the notification itself.
+
+        // For the BIG_TEXT_STYLE notification, we will consider the activity launched by the main
+        // Intent as a special activity, so we will follow option 2.
+
+        // For an example of option 1, check either the MESSAGING_STYLE or BIG_PICTURE_STYLE
+        // examples.
+
+        // For more information, check out our dev article:
+        // https://developer.android.com/training/notify-user/navigation.html
+
+        // Sets the Activity to start in a new, empty task
+        notifyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
+        PendingIntent notifyPendingIntent =
+                PendingIntent.getActivity(
+                        this,
+                        0,
+                        notifyIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                );
+
+
+        // 3. Create additional Actions (Intents) for the Notification
+
+        // In our case, we create two additional actions: a Snooze action and a Dismiss action
+        // Snooze Action
+        Intent snoozeIntent = new Intent(this, BigTextIntentService.class);
+        snoozeIntent.setAction(BigTextIntentService.ACTION_SNOOZE);
+
+        PendingIntent snoozePendingIntent = PendingIntent.getService(this, 0, snoozeIntent, 0);
+        NotificationCompat.Action snoozeAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_alarm_white_48dp,
+                        "Snooze",
+                        snoozePendingIntent)
+                        .build();
+
+
+        // Dismiss Action
+        Intent dismissIntent = new Intent(this, BigTextIntentService.class);
+        dismissIntent.setAction(BigTextIntentService.ACTION_DISMISS);
+
+        PendingIntent dismissPendingIntent = PendingIntent.getService(this, 0, dismissIntent, 0);
+        NotificationCompat.Action dismissAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_cancel_white_48dp,
+                        "Dismiss",
+                        dismissPendingIntent)
+                        .build();
+
+
+        // 4. Build and issue the notification
+
+        // Because we want this to be a new notification (not updating a previous notification), we
+        // create a new Builder. Later, we use the same global builder to get back the notification
+        // we built here for the snooze action, that is, canceling the notification and relaunching
+        // it several seconds later.
+
+        NotificationCompat.Builder notificationCompatBuilder =
+                new NotificationCompat.Builder(getApplicationContext());
+
+        GlobalNotificationBuilder.setNotificationCompatBuilderInstance(notificationCompatBuilder);
+
+        Notification notification = notificationCompatBuilder
+                // BIG_TEXT_STYLE sets title and content for API 16 (4.1 and after)
+                .setStyle(bigTextStyle)
+                // Title for API <16 (4.0 and below) devices
+                .setContentTitle(bigTextStyleReminderAppData.getContentTitle())
+                // Content for API <24 (7.0 and below) devices
+                .setContentText(bigTextStyleReminderAppData.getContentText())
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setLargeIcon(BitmapFactory.decodeResource(
+                        getResources(),
+                        R.drawable.ic_alarm_white_48dp))
+                .setContentIntent(notifyPendingIntent)
+                // Set primary color (important for Wear 2.0 Notifications)
+                .setColor(getResources().getColor(R.color.colorPrimary))
+
+                // SIDE NOTE: Auto-bundling is enabled for 4 or more notifications on API 24+ (N+)
+                // devices and all Android Wear devices. If you have more than one notification and
+                // you prefer a different summary notification, set a group key and create a
+                // summary notification via
+                // .setGroupSummary(true)
+                // .setGroup(GROUP_KEY_YOUR_NAME_HERE)
+
+                .setCategory(Notification.CATEGORY_REMINDER)
+                .setPriority(Notification.PRIORITY_HIGH)
+
+                // Shows content on the lock-screen
+                .setVisibility(Notification.VISIBILITY_PUBLIC)
+
+                // Adds additional actions specified above
+                .addAction(snoozeAction)
+                .addAction(dismissAction)
+
+                .build();
+
+        mNotificationManagerCompat.notify(NOTIFICATION_ID, notification);
+    }
+
+    /*
+     * Generates a BIG_PICTURE_STYLE Notification that supports both phone/tablet and wear. For
+     * devices on API level 16 (4.1.x - Jelly Bean) and after, displays BIG_PICTURE_STYLE.
+     * Otherwise, displays a basic notification.
+     *
+     * This example Notification is a social post. It allows updating the notification with
+     * comments/responses via RemoteInput and the BigPictureSocialIntentService on 24+ (N+) and
+     * Android Wear devices.
+     */
+    private void generateBigPictureStyleNotification() {
+
+        Log.d(TAG, "generateBigPictureStyleNotification()");
+
+        // Main steps for building a BIG_PICTURE_STYLE notification:
+        //      0. Get your data
+        //      1. Build the BIG_PICTURE_STYLE
+        //      2. Set up main Intent for notification
+        //      3. Set up RemoteInput, so users can input (keyboard and voice) from notification
+        //      4. Build and issue the notification
+
+        // 0. Get your data (everything unique per Notification)
+        MockDatabase.BigPictureStyleSocialAppData bigPictureStyleSocialAppData =
+                MockDatabase.getBigPictureStyleData();
+
+        // 1. Build the BIG_PICTURE_STYLE
+        BigPictureStyle bigPictureStyle = new NotificationCompat.BigPictureStyle()
+                // Provides the bitmap for the BigPicture notification
+                .bigPicture(
+                        BitmapFactory.decodeResource(
+                                getResources(),
+                                bigPictureStyleSocialAppData.getBigImage()))
+                // Overrides ContentTitle in the big form of the template
+                .setBigContentTitle(bigPictureStyleSocialAppData.getBigContentTitle())
+                // Summary line after the detail section in the big form of the template
+                .setSummaryText(bigPictureStyleSocialAppData.getSummaryText());
+
+        // 2. Set up main Intent for notification
+        Intent mainIntent = new Intent(this, BigPictureSocialMainActivity.class);
+
+        // When creating your Intent, you need to take into account the back state, i.e., what
+        // happens after your Activity launches and the user presses the back button.
+
+        // There are two options:
+        //      1. Regular activity - You're starting an Activity that's part of the application's
+        //      normal workflow.
+
+        //      2. Special activity - The user only sees this Activity if it's started from a
+        //      notification. In a sense, the Activity extends the notification by providing
+        //      information that would be hard to display in the notification itself.
+
+        // Even though this sample's MainActivity doesn't link to the Activity this Notification
+        // launches directly, i.e., it isn't part of the normal workflow, a social app generally
+        // always links to individual posts as part of the app flow, so we will follow option 1.
+
+        // For an example of option 2, check out the BIG_TEXT_STYLE example.
+
+        // For more information, check out our dev article:
+        // https://developer.android.com/training/notify-user/navigation.html
+
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);
+        // Adds the back stack
+        stackBuilder.addParentStack(BigPictureSocialMainActivity.class);
+        // Adds the Intent to the top of the stack
+        stackBuilder.addNextIntent(mainIntent);
+        // Gets a PendingIntent containing the entire back stack
+        PendingIntent mainPendingIntent =
+                PendingIntent.getActivity(
+                        this,
+                        0,
+                        mainIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                );
+
+        // 3. Set up RemoteInput, so users can input (keyboard and voice) from notification
+
+        // Note: For API <24 (M and below) we need to use an Activity, so the lock-screen presents
+        // the auth challenge. For API 24+ (N and above), we use a Service (could be a
+        // BroadcastReceiver), so the user can input from Notification or lock-screen (they have
+        // choice to allow) without leaving the notification.
+
+        // Create the RemoteInput
+        String replyLabel = getString(R.string.reply_label);
+        RemoteInput remoteInput =
+                new RemoteInput.Builder(BigPictureSocialIntentService.EXTRA_COMMENT)
+                        .setLabel(replyLabel)
+                        // List of quick response choices for any wearables paired with the phone
+                        .setChoices(bigPictureStyleSocialAppData.getPossiblePostResponses())
+                        .build();
+
+        // Pending intent =
+        //      API <24 (M and below): activity so the lock-screen presents the auth challenge
+        //      API 24+ (N and above): this should be a Service or BroadcastReceiver
+        PendingIntent replyActionPendingIntent;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            Intent intent = new Intent(this, BigPictureSocialIntentService.class);
+            intent.setAction(BigPictureSocialIntentService.ACTION_COMMENT);
+            replyActionPendingIntent = PendingIntent.getService(this, 0, intent, 0);
+
+        } else {
+            replyActionPendingIntent = mainPendingIntent;
+        }
+
+        NotificationCompat.Action replyAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_reply_white_18dp,
+                        replyLabel,
+                        replyActionPendingIntent)
+                        .addRemoteInput(remoteInput)
+                        .build();
+
+        // 4. Build and issue the notification
+
+        // Because we want this to be a new notification (not updating a previous notification), we
+        // create a new Builder. Later, we use the same global builder to get back the notification
+        // we built here for a comment on the post.
+
+        NotificationCompat.Builder notificationCompatBuilder =
+                new NotificationCompat.Builder(getApplicationContext());
+
+        GlobalNotificationBuilder.setNotificationCompatBuilderInstance(notificationCompatBuilder);
+
+        // 4. Build and issue the notification
+        notificationCompatBuilder
+                // BIG_PICTURE_STYLE sets title and content for API 16 (4.1 and after)
+                .setStyle(bigPictureStyle)
+                // Title for API <16 (4.0 and below) devices
+                .setContentTitle(bigPictureStyleSocialAppData.getContentTitle())
+                // Content for API <24 (7.0 and below) devices
+                .setContentText(bigPictureStyleSocialAppData.getContentText())
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setLargeIcon(BitmapFactory.decodeResource(
+                        getResources(),
+                        R.drawable.ic_person_black_48dp))
+                .setContentIntent(mainPendingIntent)
+                // Set primary color (important for Wear 2.0 Notifications)
+                .setColor(getResources().getColor(R.color.colorPrimary))
+
+                // SIDE NOTE: Auto-bundling is enabled for 4 or more notifications on API 24+ (N+)
+                // devices and all Android Wear devices. If you have more than one notification and
+                // you prefer a different summary notification, set a group key and create a
+                // summary notification via
+                // .setGroupSummary(true)
+                // .setGroup(GROUP_KEY_YOUR_NAME_HERE)
+
+                .setSubText(Integer.toString(1))
+                .addAction(replyAction)
+                .setCategory(Notification.CATEGORY_SOCIAL)
+                .setPriority(Notification.PRIORITY_HIGH)
+
+                // Hides content on the lock-screen
+                .setVisibility(Notification.VISIBILITY_PRIVATE);
+
+        // If the phone is in "Do not disturb mode, the user will still be notified if
+        // the sender(s) is starred as a favorite.
+        for (String name : bigPictureStyleSocialAppData.getParticipants()) {
+            notificationCompatBuilder.addPerson(name);
+        }
+
+        Notification notification = notificationCompatBuilder.build();
+
+        mNotificationManagerCompat.notify(NOTIFICATION_ID, notification);
+    }
+
+    /*
+     * Generates a INBOX_STYLE Notification that supports both phone/tablet and wear. For devices
+     * on API level 16 (4.1.x - Jelly Bean) and after, displays INBOX_STYLE. Otherwise, displays a
+     * basic notification.
+     */
+    private void generateInboxStyleNotification() {
+
+        Log.d(TAG, "generateInboxStyleNotification()");
+
+
+        // Main steps for building a INBOX_STYLE notification:
+        //      0. Get your data
+        //      1. Build the INBOX_STYLE
+        //      2. Set up main Intent for notification
+        //      3. Build and issue the notification
+
+        // 0. Get your data (everything unique per Notification)
+        MockDatabase.InboxStyleEmailAppData inboxStyleEmailAppData =
+                MockDatabase.getInboxStyleData();
+
+        // 1. Build the INBOX_STYLE
+        InboxStyle inboxStyle = new NotificationCompat.InboxStyle()
+                // This title is slightly different than regular title, since I know INBOX_STYLE is
+                // available.
+                .setBigContentTitle(inboxStyleEmailAppData.getBigContentTitle())
+                .setSummaryText(inboxStyleEmailAppData.getSummaryText());
+
+        // Add each summary line of the new emails, you can add up to 5
+        for (String summary : inboxStyleEmailAppData.getIndividualEmailSummary()) {
+            inboxStyle.addLine(summary);
+        }
+
+        // 2. Set up main Intent for notification
+        Intent mainIntent = new Intent(this, InboxMainActivity.class);
+
+        // When creating your Intent, you need to take into account the back state, i.e., what
+        // happens after your Activity launches and the user presses the back button.
+
+        // There are two options:
+        //      1. Regular activity - You're starting an Activity that's part of the application's
+        //      normal workflow.
+
+        //      2. Special activity - The user only sees this Activity if it's started from a
+        //      notification. In a sense, the Activity extends the notification by providing
+        //      information that would be hard to display in the notification itself.
+
+        // Even though this sample's MainActivity doesn't link to the Activity this Notification
+        // launches directly, i.e., it isn't part of the normal workflow, a eamil app generally
+        // always links to individual emails as part of the app flow, so we will follow option 1.
+
+        // For an example of option 2, check out the BIG_TEXT_STYLE example.
+
+        // For more information, check out our dev article:
+        // https://developer.android.com/training/notify-user/navigation.html
+
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);
+        // Adds the back stack
+        stackBuilder.addParentStack(InboxMainActivity.class);
+        // Adds the Intent to the top of the stack
+        stackBuilder.addNextIntent(mainIntent);
+        // Gets a PendingIntent containing the entire back stack
+        PendingIntent mainPendingIntent =
+                PendingIntent.getActivity(
+                        this,
+                        0,
+                        mainIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                );
+
+        // 3. Build and issue the notification
+
+        // Because we want this to be a new notification (not updating a previous notification), we
+        // create a new Builder. However, we don't need to update this notification later, so we
+        // will not need to set a global builder for access to the notification later.
+
+        NotificationCompat.Builder notificationCompatBuilder =
+                new NotificationCompat.Builder(getApplicationContext());
+
+        GlobalNotificationBuilder.setNotificationCompatBuilderInstance(notificationCompatBuilder);
+
+        // 4. Build and issue the notification
+        notificationCompatBuilder
+
+                // INBOX_STYLE sets title and content for API 16+ (4.1 and after) when the
+                // notification is expanded
+                .setStyle(inboxStyle)
+
+                // Title for API <16 (4.0 and below) devices and API 16+ (4.1 and after) when the
+                // notification is collapsed
+                .setContentTitle(inboxStyleEmailAppData.getContentTitle())
+
+                // Content for API <24 (7.0 and below) devices and API 16+ (4.1 and after) when the
+                // notification is collapsed
+                .setContentText(inboxStyleEmailAppData.getContentText())
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setLargeIcon(BitmapFactory.decodeResource(
+                        getResources(),
+                        R.drawable.ic_person_black_48dp))
+                .setContentIntent(mainPendingIntent)
+                // Set primary color (important for Wear 2.0 Notifications)
+                .setColor(getResources().getColor(R.color.colorPrimary))
+
+                // SIDE NOTE: Auto-bundling is enabled for 4 or more notifications on API 24+ (N+)
+                // devices and all Android Wear devices. If you have more than one notification and
+                // you prefer a different summary notification, set a group key and create a
+                // summary notification via
+                // .setGroupSummary(true)
+                // .setGroup(GROUP_KEY_YOUR_NAME_HERE)
+
+                // Sets large number at the right-hand side of the notification for API <24 devices
+                .setSubText(Integer.toString(inboxStyleEmailAppData.getNumberOfNewEmails()))
+
+                .setCategory(Notification.CATEGORY_EMAIL)
+                .setPriority(Notification.PRIORITY_HIGH)
+
+                // Hides content on the lock-screen
+                .setVisibility(Notification.VISIBILITY_PRIVATE);
+
+        // If the phone is in "Do not disturb mode, the user will still be notified if
+        // the sender(s) is starred as a favorite.
+        for (String name : inboxStyleEmailAppData.getParticipants()) {
+            notificationCompatBuilder.addPerson(name);
+        }
+
+        Notification notification = notificationCompatBuilder.build();
+
+        mNotificationManagerCompat.notify(NOTIFICATION_ID, notification);
+    }
+
+    /*
+     * Generates a MESSAGING_STYLE Notification that supports both phone/tablet and wear. For
+     * devices on API level 24 (7.0 - Nougat) and after, displays MESSAGING_STYLE. Otherwise,
+     * displays a basic BIG_TEXT_STYLE.
+     */
+    private void generateMessagingStyleNotification() {
+
+        Log.d(TAG, "generateMessagingStyleNotification()");
+
+        // Main steps for building a MESSAGING_STYLE notification:
+        //      0. Get your data
+        //      1. Build the MESSAGING_STYLE
+        //      2. Add support for Wear 1.+
+        //      3. Set up main Intent for notification
+        //      4. Set up RemoteInput (users can input directly from notification)
+        //      5. Build and issue the notification
+
+        // 0. Get your data (everything unique per Notification)
+        MockDatabase.MessagingStyleCommsAppData messagingStyleCommsAppData =
+                MockDatabase.getMessagingStyleData();
+
+        // 1. Build the Notification.Style (MESSAGING_STYLE)
+        String contentTitle = messagingStyleCommsAppData.getContentTitle();
+
+        MessagingStyle messagingStyle =
+                new NotificationCompat.MessagingStyle(messagingStyleCommsAppData.getReplayName())
+                        // You could set a different title to appear when the messaging style
+                        // is supported on device (24+) if you wish. In our case, we use the same
+                        // title.
+                        .setConversationTitle(contentTitle);
+
+        // Adds all Messages
+        // Note: Messages include the text, timestamp, and sender
+        for (MessagingStyle.Message message : messagingStyleCommsAppData.getMessages()) {
+            messagingStyle.addMessage(message);
+        }
+
+
+        // 2. Add support for Wear 1.+
+
+        // Since Wear 1.0 doesn't support the MESSAGING_STYLE, we use the BIG_TEXT_STYLE, so all the
+        // text is visible.
+
+        // This is basically a toString() of all the Messages above.
+        String fullMessageForWearVersion1 = messagingStyleCommsAppData.getFullConversation();
+
+        Notification chatHistoryForWearV1 = new NotificationCompat.Builder(getApplicationContext())
+                .setStyle(new BigTextStyle().bigText(fullMessageForWearVersion1))
+                .setContentTitle(contentTitle)
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setContentText(fullMessageForWearVersion1)
+                .build();
+
+        // Adds page with all text to support Wear 1.+.
+        NotificationCompat.WearableExtender wearableExtenderForWearVersion1 =
+                new NotificationCompat.WearableExtender()
+                        .addPage(chatHistoryForWearV1);
+
+
+
+        // 3. Set up main Intent for notification
+        Intent notifyIntent = new Intent(this, MessagingMainActivity.class);
+
+        // When creating your Intent, you need to take into account the back state, i.e., what
+        // happens after your Activity launches and the user presses the back button.
+
+        // There are two options:
+        //      1. Regular activity - You're starting an Activity that's part of the application's
+        //      normal workflow.
+
+        //      2. Special activity - The user only sees this Activity if it's started from a
+        //      notification. In a sense, the Activity extends the notification by providing
+        //      information that would be hard to display in the notification itself.
+
+        // Even though this sample's MainActivity doesn't link to the Activity this Notification
+        // launches directly, i.e., it isn't part of the normal workflow, a chat app generally
+        // always links to individual conversations as part of the app flow, so we will follow
+        // option 1.
+
+        // For an example of option 2, check out the BIG_TEXT_STYLE example.
+
+        // For more information, check out our dev article:
+        // https://developer.android.com/training/notify-user/navigation.html
+
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);
+        // Adds the back stack
+        stackBuilder.addParentStack(MessagingMainActivity.class);
+        // Adds the Intent to the top of the stack
+        stackBuilder.addNextIntent(notifyIntent);
+        // Gets a PendingIntent containing the entire back stack
+        PendingIntent mainPendingIntent =
+                PendingIntent.getActivity(
+                        this,
+                        0,
+                        notifyIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                );
+
+
+        // 4. Set up RemoteInput, so users can input (keyboard and voice) from notification
+
+        // Note: For API <24 (M and below) we need to use an Activity, so the lock-screen present
+        // the auth challenge. For API 24+ (N and above), we use a Service (could be a
+        // BroadcastReceiver), so the user can input from Notification or lock-screen (they have
+        // choice to allow) without leaving the notification.
+
+        // Create the RemoteInput specifying this key
+        String replyLabel = getString(R.string.reply_label);
+        RemoteInput remoteInput = new RemoteInput.Builder(MessagingIntentService.EXTRA_REPLY)
+                .setLabel(replyLabel)
+                .build();
+
+        // Pending intent =
+        //      API <24 (M and below): activity so the lock-screen presents the auth challenge
+        //      API 24+ (N and above): this should be a Service or BroadcastReceiver
+        PendingIntent replyActionPendingIntent;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            Intent intent = new Intent(this, MessagingIntentService.class);
+            intent.setAction(MessagingIntentService.ACTION_REPLY);
+            replyActionPendingIntent = PendingIntent.getService(this, 0, intent, 0);
+
+        } else {
+            replyActionPendingIntent = mainPendingIntent;
+        }
+
+        NotificationCompat.Action replyAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_reply_white_18dp,
+                        replyLabel,
+                        replyActionPendingIntent)
+                        .addRemoteInput(remoteInput)
+                        // Allows system to generate replies by context of conversation
+                        .setAllowGeneratedReplies(true)
+                        .build();
+
+
+        // 5. Build and issue the notification
+
+        // Because we want this to be a new notification (not updating current notification), we
+        // create a new Builder. Later, we update this same notification, so we need to save this
+        // Builder globally (as outlined earlier).
+
+        NotificationCompat.Builder notificationCompatBuilder =
+                new NotificationCompat.Builder(getApplicationContext());
+
+        GlobalNotificationBuilder.setNotificationCompatBuilderInstance(notificationCompatBuilder);
+
+        // Builds and issues notification
+        notificationCompatBuilder
+                // MESSAGING_STYLE sets title and content for API 24+ (N and above) devices
+                .setStyle(messagingStyle)
+                // Title for API <24 (M and below) devices
+                .setContentTitle(contentTitle)
+                // Content for API <24 (M and below) devices
+                .setContentText(messagingStyleCommsAppData.getContentText())
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setLargeIcon(BitmapFactory.decodeResource(
+                        getResources(),
+                        R.drawable.ic_person_black_48dp))
+                .setContentIntent(mainPendingIntent)
+                // Set primary color (important for Wear 2.0 Notifications)
+                .setColor(getResources().getColor(R.color.colorPrimary))
+
+                // SIDE NOTE: Auto-bundling is enabled for 4 or more notifications on API 24+ (N+)
+                // devices and all Android Wear devices. If you have more than one notification and
+                // you prefer a different summary notification, set a group key and create a
+                // summary notification via
+                // .setGroupSummary(true)
+                // .setGroup(GROUP_KEY_YOUR_NAME_HERE)
+
+                // Number of new notifications for API <24 (M and below) devices
+                .setSubText(Integer.toString(messagingStyleCommsAppData.getNumberOfNewMessages()))
+
+                .addAction(replyAction)
+                .setCategory(Notification.CATEGORY_MESSAGE)
+                .setPriority(Notification.PRIORITY_HIGH)
+
+                // Hides content on the lock-screen
+                .setVisibility(Notification.VISIBILITY_PRIVATE)
+
+                // Adds multiple pages for easy consumption on a wear device.
+                .extend(wearableExtenderForWearVersion1);
+
+        // If the phone is in "Do not disturb mode, the user will still be notified if
+        // the sender(s) is starred as a favorite.
+        for (String name : messagingStyleCommsAppData.getParticipants()) {
+            notificationCompatBuilder.addPerson(name);
+        }
+
+        Notification notification = notificationCompatBuilder.build();
+        mNotificationManagerCompat.notify(NOTIFICATION_ID, notification);
+    }
+
+    /**
+     * Helper method for the SnackBar action, i.e., if the user has this application's notifications
+     * disabled, this opens up the dialog to turn them back on after the user requests a
+     * Notification launch.
+     *
+     * IMPORTANT NOTE: You should not do this action unless the user takes an action to see your
+     * Notifications like this sample demonstrates. Spamming users to re-enable your notifications
+     * is a bad idea.
+     */
+    private void openNotificationSettingsForApp() {
+        // Links to this app's notification settings
+        Intent intent = new Intent();
+        intent.setAction("android.settings.APP_NOTIFICATION_SETTINGS");
+        intent.putExtra("app_package", getPackageName());
+        intent.putExtra("app_uid", getApplicationInfo().uid);
+        startActivity(intent);
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/BigPictureSocialIntentService.java b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/BigPictureSocialIntentService.java
new file mode 100644
index 000000000..470eedb08
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/BigPictureSocialIntentService.java
@@ -0,0 +1,228 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications.handlers;
+
+import android.app.IntentService;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.graphics.BitmapFactory;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v4.app.NotificationCompat.BigPictureStyle;
+import android.support.v4.app.NotificationManagerCompat;
+import android.support.v4.app.RemoteInput;
+import android.support.v4.app.TaskStackBuilder;
+import android.support.v7.app.NotificationCompat;
+import android.util.Log;
+
+import com.example.android.wearable.wear.wearnotifications.GlobalNotificationBuilder;
+import com.example.android.wearable.wear.wearnotifications.MainActivity;
+import com.example.android.wearable.wear.wearnotifications.R;
+import com.example.android.wearable.wear.wearnotifications.mock.MockDatabase;
+
+/**
+ * Asynchronously handles updating social app posts (and active Notification) with comments from
+ * user. Notification for social app use BigPictureStyle.
+ */
+public class BigPictureSocialIntentService extends IntentService {
+
+    private static final String TAG = "BigPictureService";
+
+    public static final String ACTION_COMMENT =
+            "com.example.android.wearable.wear.wearnotifications.handlers.action.COMMENT";
+
+    public static final String EXTRA_COMMENT =
+            "com.example.android.wearable.wear.wearnotifications.handlers.extra.COMMENT";
+
+    public BigPictureSocialIntentService() {
+        super("BigPictureSocialIntentService");
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        Log.d(TAG, "onHandleIntent(): " + intent);
+
+        if (intent != null) {
+            final String action = intent.getAction();
+            if (ACTION_COMMENT.equals(action)) {
+                handleActionComment(getMessage(intent));
+            }
+        }
+    }
+
+    /**
+     * Handles action for adding a comment from the notification.
+     */
+    private void handleActionComment(CharSequence comment) {
+        Log.d(TAG, "handleActionComment(): " + comment);
+
+        if (comment != null) {
+
+            // TODO: Asynchronously save your message to Database and servers.
+
+            /*
+             * You have two options for updating your notification (this class uses approach #2):
+             *
+             *  1. Use a new NotificationCompatBuilder to create the Notification. This approach
+             *  requires you to get *ALL* the information that existed in the previous
+             *  Notification (and updates) and pass it to the builder. This is the approach used in
+             *  the MainActivity.
+             *
+             *  2. Use the original NotificationCompatBuilder to create the Notification. This
+             *  approach requires you to store a reference to the original builder. The benefit is
+             *  you only need the new/updated information. In our case, the comment from the user
+             *  regarding the post (which we already have here).
+             *
+             *  IMPORTANT NOTE: You shouldn't save/modify the resulting Notification object using
+             *  its member variables and/or legacy APIs. If you want to retain anything from update
+             *  to update, retain the Builder as option 2 outlines.
+             */
+
+            // Retrieves NotificationCompat.Builder used to create initial Notification
+            NotificationCompat.Builder notificationCompatBuilder =
+                    GlobalNotificationBuilder.getNotificationCompatBuilderInstance();
+
+            // Recreate builder from persistent state if app process is killed
+            if (notificationCompatBuilder == null) {
+                // Note: New builder set globally in the method
+                notificationCompatBuilder = recreateBuilderWithBigPictureStyle();
+            }
+
+            // Updates active Notification
+            Notification updatedNotification = notificationCompatBuilder
+                    // Adds a line and comment below content in Notification
+                    .setRemoteInputHistory(new CharSequence[]{comment})
+                    .build();
+
+            // Pushes out the updated Notification
+            NotificationManagerCompat notificationManagerCompat =
+                    NotificationManagerCompat.from(getApplicationContext());
+            notificationManagerCompat.notify(MainActivity.NOTIFICATION_ID, updatedNotification);
+        }
+    }
+
+    /*
+     * Extracts CharSequence created from the RemoteInput associated with the Notification.
+     */
+    private CharSequence getMessage(Intent intent) {
+        Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
+        if (remoteInput != null) {
+            return remoteInput.getCharSequence(EXTRA_COMMENT);
+        }
+        return null;
+    }
+
+    /*
+     * This recreates the notification from the persistent state in case the app process was killed.
+     * It is basically the same code for creating the Notification from MainActivity.
+     */
+    private NotificationCompat.Builder recreateBuilderWithBigPictureStyle() {
+
+        // Main steps for building a BIG_PICTURE_STYLE notification (for more detailed comments on
+        // building this notification, check MainActivity.java):
+        //      0. Get your data
+        //      1. Build the BIG_PICTURE_STYLE
+        //      2. Set up main Intent for notification
+        //      3. Set up RemoteInput, so users can input (keyboard and voice) from notification
+        //      4. Build and issue the notification
+
+        // 0. Get your data (everything unique per Notification)
+        MockDatabase.BigPictureStyleSocialAppData bigPictureStyleSocialAppData =
+                MockDatabase.getBigPictureStyleData();
+
+        // 1. Build the BIG_PICTURE_STYLE
+        BigPictureStyle bigPictureStyle = new NotificationCompat.BigPictureStyle()
+                .bigPicture(
+                        BitmapFactory.decodeResource(
+                                getResources(),
+                                bigPictureStyleSocialAppData.getBigImage()))
+                .setBigContentTitle(bigPictureStyleSocialAppData.getBigContentTitle())
+                .setSummaryText(bigPictureStyleSocialAppData.getSummaryText());
+
+        // 2. Set up main Intent for notification
+        Intent mainIntent = new Intent(this, BigPictureSocialMainActivity.class);
+
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);
+        stackBuilder.addParentStack(BigPictureSocialMainActivity.class);
+        stackBuilder.addNextIntent(mainIntent);
+
+        PendingIntent mainPendingIntent =
+                PendingIntent.getActivity(
+                        this,
+                        0,
+                        mainIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                );
+
+        // 3. Set up RemoteInput, so users can input (keyboard and voice) from notification
+        String replyLabel = getString(R.string.reply_label);
+        RemoteInput remoteInput =
+                new RemoteInput.Builder(BigPictureSocialIntentService.EXTRA_COMMENT)
+                        .setLabel(replyLabel)
+                        .setChoices(bigPictureStyleSocialAppData.getPossiblePostResponses())
+                        .build();
+
+        PendingIntent replyActionPendingIntent;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            Intent intent = new Intent(this, BigPictureSocialIntentService.class);
+            intent.setAction(BigPictureSocialIntentService.ACTION_COMMENT);
+            replyActionPendingIntent = PendingIntent.getService(this, 0, intent, 0);
+
+        } else {
+            replyActionPendingIntent = mainPendingIntent;
+        }
+
+        NotificationCompat.Action replyAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_reply_white_18dp,
+                        replyLabel,
+                        replyActionPendingIntent)
+                        .addRemoteInput(remoteInput)
+                        .build();
+
+        // 4. Build and issue the notification
+        NotificationCompat.Builder notificationCompatBuilder =
+                new NotificationCompat.Builder(getApplicationContext());
+
+        GlobalNotificationBuilder.setNotificationCompatBuilderInstance(notificationCompatBuilder);
+
+        notificationCompatBuilder
+                .setStyle(bigPictureStyle)
+                .setContentTitle(bigPictureStyleSocialAppData.getContentTitle())
+                .setContentText(bigPictureStyleSocialAppData.getContentText())
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setLargeIcon(BitmapFactory.decodeResource(
+                        getResources(),
+                        R.drawable.ic_person_black_48dp))
+                .setContentIntent(mainPendingIntent)
+                .setColor(getResources().getColor(R.color.colorPrimary))
+                .setSubText(Integer.toString(1))
+                .addAction(replyAction)
+                .setCategory(Notification.CATEGORY_SOCIAL)
+                .setPriority(Notification.PRIORITY_HIGH)
+                .setVisibility(Notification.VISIBILITY_PRIVATE);
+
+        // If the phone is in "Do not disturb mode, the user will still be notified if
+        // the sender(s) is starred as a favorite.
+        for (String name : bigPictureStyleSocialAppData.getParticipants()) {
+            notificationCompatBuilder.addPerson(name);
+        }
+
+        return notificationCompatBuilder;
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/BigPictureSocialMainActivity.java b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/BigPictureSocialMainActivity.java
new file mode 100644
index 000000000..f9e13c24b
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/BigPictureSocialMainActivity.java
@@ -0,0 +1,45 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications.handlers;
+
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Bundle;
+
+import com.example.android.wearable.wear.wearnotifications.MainActivity;
+import com.example.android.wearable.wear.wearnotifications.R;
+
+/**
+ * Template class meant to include functionality for your Social App. (This project's main focus
+ * is on Notification Styles.)
+ */
+public class BigPictureSocialMainActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_big_picture_main);
+
+        // Cancel Notification
+        NotificationManager notificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+
+        notificationManager.cancel(MainActivity.NOTIFICATION_ID);
+
+        // TODO: Handle and display social post from your database
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/BigTextIntentService.java b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/BigTextIntentService.java
new file mode 100644
index 000000000..8f6664db7
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/BigTextIntentService.java
@@ -0,0 +1,206 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications.handlers;
+
+import android.app.IntentService;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.graphics.BitmapFactory;
+import android.support.v4.app.NotificationCompat.BigTextStyle;
+import android.support.v4.app.NotificationManagerCompat;
+import android.support.v7.app.NotificationCompat;
+import android.util.Log;
+
+import com.example.android.wearable.wear.wearnotifications.GlobalNotificationBuilder;
+import com.example.android.wearable.wear.wearnotifications.MainActivity;
+import com.example.android.wearable.wear.wearnotifications.R;
+import com.example.android.wearable.wear.wearnotifications.mock.MockDatabase;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Asynchronously handles snooze and dismiss actions for reminder app (and active Notification).
+ * Notification for for reminder app uses BigTextStyle.
+ */
+public class BigTextIntentService extends IntentService {
+
+    private static final String TAG = "BigTextService";
+
+    public static final String ACTION_DISMISS =
+            "com.example.android.wearable.wear.wearnotifications.handlers.action.DISMISS";
+    public static final String ACTION_SNOOZE =
+            "com.example.android.wearable.wear.wearnotifications.handlers.action.SNOOZE";
+
+    private static final long SNOOZE_TIME = TimeUnit.SECONDS.toMillis(5);
+
+    public BigTextIntentService() {
+        super("BigTextIntentService");
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        Log.d(TAG, "onHandleIntent(): " + intent);
+
+        if (intent != null) {
+            final String action = intent.getAction();
+            if (ACTION_DISMISS.equals(action)) {
+                handleActionDismiss();
+            } else if (ACTION_SNOOZE.equals(action)) {
+                handleActionSnooze();
+            }
+        }
+    }
+
+    /**
+     * Handles action Dismiss in the provided background thread.
+     */
+    private void handleActionDismiss() {
+        Log.d(TAG, "handleActionDismiss()");
+
+        NotificationManagerCompat notificationManagerCompat =
+                NotificationManagerCompat.from(getApplicationContext());
+        notificationManagerCompat.cancel(MainActivity.NOTIFICATION_ID);
+    }
+
+    /**
+     * Handles action Snooze in the provided background thread.
+     */
+    private void handleActionSnooze() {
+        Log.d(TAG, "handleActionSnooze()");
+
+        // You could use NotificationManager.getActiveNotifications() if you are targeting SDK 23
+        // and above, but we are targeting devices with lower SDK API numbers, so we saved the
+        // builder globally and get the notification back to recreate it later.
+
+        NotificationCompat.Builder notificationCompatBuilder =
+                GlobalNotificationBuilder.getNotificationCompatBuilderInstance();
+
+        // Recreate builder from persistent state if app process is killed
+        if (notificationCompatBuilder == null) {
+            // Note: New builder set globally in the method
+            notificationCompatBuilder = recreateBuilderWithBigTextStyle();
+        }
+
+        Notification notification;
+        notification = notificationCompatBuilder.build();
+
+
+        if (notification != null) {
+            NotificationManagerCompat notificationManagerCompat =
+                    NotificationManagerCompat.from(getApplicationContext());
+
+            notificationManagerCompat.cancel(MainActivity.NOTIFICATION_ID);
+
+            try {
+                Thread.sleep(SNOOZE_TIME);
+            } catch (InterruptedException ex) {
+                Thread.currentThread().interrupt();
+            }
+            notificationManagerCompat.notify(MainActivity.NOTIFICATION_ID, notification);
+        }
+
+    }
+
+    /*
+     * This recreates the notification from the persistent state in case the app process was killed.
+     * It is basically the same code for creating the Notification from MainActivity.
+     */
+    private NotificationCompat.Builder recreateBuilderWithBigTextStyle() {
+
+        // Main steps for building a BIG_TEXT_STYLE notification (for more detailed comments on
+        // building this notification, check MainActivity.java)::
+        //      0. Get your data
+        //      1. Build the BIG_TEXT_STYLE
+        //      2. Set up main Intent for notification
+        //      3. Create additional Actions for the Notification
+        //      4. Build and issue the notification
+
+        // 0. Get your data
+        MockDatabase.BigTextStyleReminderAppData bigTextData = MockDatabase.getBigTextStyleData();
+
+        // 1. Build the BIG_TEXT_STYLE
+        BigTextStyle bigTextStyle = new NotificationCompat.BigTextStyle()
+                .bigText(bigTextData.getBigText())
+                .setBigContentTitle(bigTextData.getBigContentTitle())
+                .setSummaryText(bigTextData.getSummaryText());
+
+
+        // 2. Set up main Intent for notification
+        Intent notifyIntent = new Intent(this, BigTextMainActivity.class);
+        notifyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
+        PendingIntent notifyPendingIntent =
+                PendingIntent.getActivity(
+                        this,
+                        0,
+                        notifyIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                );
+
+
+        // 3. Create additional Actions (Intents) for the Notification
+
+        // Snooze Action
+        Intent snoozeIntent = new Intent(this, BigTextIntentService.class);
+        snoozeIntent.setAction(BigTextIntentService.ACTION_SNOOZE);
+
+        PendingIntent snoozePendingIntent = PendingIntent.getService(this, 0, snoozeIntent, 0);
+        NotificationCompat.Action snoozeAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_alarm_white_48dp,
+                        "Snooze",
+                        snoozePendingIntent)
+                        .build();
+
+
+        // Dismiss Action
+        Intent dismissIntent = new Intent(this, BigTextIntentService.class);
+        dismissIntent.setAction(BigTextIntentService.ACTION_DISMISS);
+
+        PendingIntent dismissPendingIntent = PendingIntent.getService(this, 0, dismissIntent, 0);
+        NotificationCompat.Action dismissAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_cancel_white_48dp,
+                        "Dismiss",
+                        dismissPendingIntent)
+                        .build();
+
+        // 4. Build and issue the notification
+        NotificationCompat.Builder notificationCompatBuilder =
+                new NotificationCompat.Builder(getApplicationContext());
+
+        GlobalNotificationBuilder.setNotificationCompatBuilderInstance(notificationCompatBuilder);
+
+        notificationCompatBuilder
+                .setStyle(bigTextStyle)
+                .setContentTitle(bigTextData.getContentTitle())
+                .setContentText(bigTextData.getContentText())
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setLargeIcon(BitmapFactory.decodeResource(
+                        getResources(),
+                        R.drawable.ic_alarm_white_48dp))
+                .setContentIntent(notifyPendingIntent)
+                .setColor(getResources().getColor(R.color.colorPrimary))
+                .setCategory(Notification.CATEGORY_REMINDER)
+                .setPriority(Notification.PRIORITY_HIGH)
+                .setVisibility(Notification.VISIBILITY_PUBLIC)
+                .addAction(snoozeAction)
+                .addAction(dismissAction);
+
+        return notificationCompatBuilder;
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/BigTextMainActivity.java b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/BigTextMainActivity.java
new file mode 100644
index 000000000..92ae257ab
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/BigTextMainActivity.java
@@ -0,0 +1,45 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications.handlers;
+
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Bundle;
+
+import com.example.android.wearable.wear.wearnotifications.MainActivity;
+import com.example.android.wearable.wear.wearnotifications.R;
+
+/**
+ * Template class meant to include functionality for your Reminder/Alarm App. (This project's main
+ * focus is on Notification Styles.)
+ */
+public class BigTextMainActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_big_text_main);
+
+        // Cancel Notification
+        NotificationManager notificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+
+        notificationManager.cancel(MainActivity.NOTIFICATION_ID);
+
+        // TODO: Handle and display reminder from your database
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/InboxMainActivity.java b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/InboxMainActivity.java
new file mode 100644
index 000000000..403874666
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/InboxMainActivity.java
@@ -0,0 +1,45 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications.handlers;
+
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Bundle;
+
+import com.example.android.wearable.wear.wearnotifications.MainActivity;
+import com.example.android.wearable.wear.wearnotifications.R;
+
+/**
+ * Template class meant to include functionality for your email app. (This project's main focus
+ * is on Notification Styles.)
+ */
+public class InboxMainActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_inbox_main);
+
+        // Cancel Notification
+        NotificationManager notificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+
+        notificationManager.cancel(MainActivity.NOTIFICATION_ID);
+
+        // TODO: Handle and display email from your database
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/MessagingIntentService.java b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/MessagingIntentService.java
new file mode 100644
index 000000000..6d30c4f20
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/MessagingIntentService.java
@@ -0,0 +1,262 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications.handlers;
+
+import android.app.IntentService;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.graphics.BitmapFactory;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v4.app.NotificationCompat.MessagingStyle;
+import android.support.v4.app.NotificationManagerCompat;
+import android.support.v4.app.RemoteInput;
+import android.support.v4.app.TaskStackBuilder;
+import android.support.v7.app.NotificationCompat;
+import android.util.Log;
+
+import com.example.android.wearable.wear.wearnotifications.GlobalNotificationBuilder;
+import com.example.android.wearable.wear.wearnotifications.MainActivity;
+import com.example.android.wearable.wear.wearnotifications.R;
+import com.example.android.wearable.wear.wearnotifications.mock.MockDatabase;
+
+/**
+ * Asynchronously handles updating messaging app posts (and active Notification) with replies from
+ * user in a conversation. Notification for social app use MessagingStyle.
+ */
+public class MessagingIntentService extends IntentService {
+
+    private static final String TAG = "MessagingIntentService";
+
+    public static final String ACTION_REPLY =
+            "com.example.android.wearable.wear.wearnotifications.handlers.action.REPLY";
+
+    public static final String EXTRA_REPLY =
+            "com.example.android.wearable.wear.wearnotifications.handlers.extra.REPLY";
+
+
+    public MessagingIntentService() {
+        super("MessagingIntentService");
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        Log.d(TAG, "onHandleIntent(): " + intent);
+
+        if (intent != null) {
+            final String action = intent.getAction();
+            if (ACTION_REPLY.equals(action)) {
+                handleActionReply(getMessage(intent));
+            }
+        }
+    }
+
+    /**
+     * Handles action for replying to messages from the notification.
+     */
+    private void handleActionReply(CharSequence replyCharSequence) {
+        Log.d(TAG, "handleActionReply(): " + replyCharSequence);
+
+        if (replyCharSequence != null) {
+
+            // TODO: Asynchronously save your message to Database and servers.
+
+            /*
+             * You have two options for updating your notification (this class uses approach #2):
+             *
+             *  1. Use a new NotificationCompatBuilder to create the Notification. This approach
+             *  requires you to get *ALL* the information that existed in the previous
+             *  Notification (and updates) and pass it to the builder. This is the approach used in
+             *  the MainActivity.
+             *
+             *  2. Use the original NotificationCompatBuilder to create the Notification. This
+             *  approach requires you to store a reference to the original builder. The benefit is
+             *  you only need the new/updated information. In our case, the reply from the user
+             *  which we already have here.
+             *
+             *  IMPORTANT NOTE: You shouldn't save/modify the resulting Notification object using
+             *  its member variables and/or legacy APIs. If you want to retain anything from update
+             *  to update, retain the Builder as option 2 outlines.
+             */
+
+            // Retrieves NotificationCompat.Builder used to create initial Notification
+            NotificationCompat.Builder notificationCompatBuilder =
+                    GlobalNotificationBuilder.getNotificationCompatBuilderInstance();
+
+            // Recreate builder from persistent state if app process is killed
+            if (notificationCompatBuilder == null) {
+                // Note: New builder set globally in the method
+                notificationCompatBuilder = recreateBuilderWithMessagingStyle();
+            }
+
+
+            // Since we are adding to the MessagingStyle, we need to first retrieve the
+            // current MessagingStyle from the Notification itself.
+            Notification notification = notificationCompatBuilder.build();
+            MessagingStyle messagingStyle =
+                    NotificationCompat.MessagingStyle
+                            .extractMessagingStyleFromNotification(notification);
+
+            // Add new message to the MessagingStyle
+            messagingStyle.addMessage(replyCharSequence, System.currentTimeMillis(), null);
+
+            // Updates the Notification
+            notification = notificationCompatBuilder
+                    .setStyle(messagingStyle)
+                    .build();
+
+            // Pushes out the updated Notification
+            NotificationManagerCompat notificationManagerCompat =
+                    NotificationManagerCompat.from(getApplicationContext());
+            notificationManagerCompat.notify(MainActivity.NOTIFICATION_ID, notification);
+        }
+    }
+
+    /*
+     * Extracts CharSequence created from the RemoteInput associated with the Notification.
+     */
+    private CharSequence getMessage(Intent intent) {
+        Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
+        if (remoteInput != null) {
+            return remoteInput.getCharSequence(EXTRA_REPLY);
+        }
+        return null;
+    }
+
+    /*
+     * This recreates the notification from the persistent state in case the app process was killed.
+     * It is basically the same code for creating the Notification from MainActivity.
+     */
+    private NotificationCompat.Builder recreateBuilderWithMessagingStyle() {
+
+        // Main steps for building a MESSAGING_STYLE notification (for more detailed comments on
+        // building this notification, check MainActivity.java)::
+        //      0. Get your data
+        //      1. Build the MESSAGING_STYLE
+        //      2. Add support for Wear 1.+
+        //      3. Set up main Intent for notification
+        //      4. Set up RemoteInput (users can input directly from notification)
+        //      5. Build and issue the notification
+
+        // 0. Get your data
+        MockDatabase.MessagingStyleCommsAppData messagingData =
+                MockDatabase.getMessagingStyleData();
+
+        // 1. Build the Notification.Style (MESSAGING_STYLE)
+        String contentTitle = messagingData.getContentTitle();
+
+        MessagingStyle messagingStyle =
+                new NotificationCompat.MessagingStyle(messagingData.getReplayName())
+                        .setConversationTitle(contentTitle);
+
+        // Adds all Messages
+        // Note: Messages include the text, timestamp, and sender
+        for (MessagingStyle.Message message : messagingData.getMessages()) {
+            messagingStyle.addMessage(message);
+        }
+
+
+        // 2. Add support for Wear 1.+
+        String fullMessageForWearVersion1 = messagingData.getFullConversation();
+
+        Notification chatHistoryForWearV1 = new NotificationCompat.Builder(getApplicationContext())
+                .setStyle(new NotificationCompat.BigTextStyle().bigText(fullMessageForWearVersion1))
+                .setContentTitle(contentTitle)
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setContentText(fullMessageForWearVersion1)
+                .build();
+
+        NotificationCompat.WearableExtender wearableExtenderForWearVersion1 =
+                new NotificationCompat.WearableExtender()
+                        .addPage(chatHistoryForWearV1);
+
+
+
+        // 3. Set up main Intent for notification
+        Intent notifyIntent = new Intent(this, MessagingMainActivity.class);
+
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);
+        stackBuilder.addParentStack(MessagingMainActivity.class);
+        stackBuilder.addNextIntent(notifyIntent);
+
+        PendingIntent mainPendingIntent =
+                PendingIntent.getActivity(
+                        this,
+                        0,
+                        notifyIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                );
+
+
+        // 4. Set up RemoteInput, so users can input (keyboard and voice) from notification
+        String replyLabel = getString(R.string.reply_label);
+        RemoteInput remoteInput = new RemoteInput.Builder(MessagingIntentService.EXTRA_REPLY)
+                .setLabel(replyLabel)
+                .build();
+
+        PendingIntent replyActionPendingIntent;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            Intent intent = new Intent(this, MessagingIntentService.class);
+            intent.setAction(MessagingIntentService.ACTION_REPLY);
+            replyActionPendingIntent = PendingIntent.getService(this, 0, intent, 0);
+
+        } else {
+            replyActionPendingIntent = mainPendingIntent;
+        }
+
+        NotificationCompat.Action replyAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_reply_white_18dp,
+                        replyLabel,
+                        replyActionPendingIntent)
+                        .addRemoteInput(remoteInput)
+                        // Allows system to generate replies by context of conversation
+                        .setAllowGeneratedReplies(true)
+                        .build();
+
+
+        // 5. Build and issue the notification
+        NotificationCompat.Builder notificationCompatBuilder =
+                new NotificationCompat.Builder(getApplicationContext());
+
+        GlobalNotificationBuilder.setNotificationCompatBuilderInstance(notificationCompatBuilder);
+
+        notificationCompatBuilder
+                .setStyle(messagingStyle)
+                .setContentTitle(contentTitle)
+                .setContentText(messagingData.getContentText())
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setLargeIcon(BitmapFactory.decodeResource(
+                        getResources(),
+                        R.drawable.ic_person_black_48dp))
+                .setContentIntent(mainPendingIntent)
+                .setColor(getResources().getColor(R.color.colorPrimary))
+                .setSubText(Integer.toString(messagingData.getNumberOfNewMessages()))
+                .addAction(replyAction)
+                .setCategory(Notification.CATEGORY_MESSAGE)
+                .setPriority(Notification.PRIORITY_HIGH)
+                .setVisibility(Notification.VISIBILITY_PRIVATE)
+                .extend(wearableExtenderForWearVersion1);
+
+        for (String name : messagingData.getParticipants()) {
+            notificationCompatBuilder.addPerson(name);
+        }
+
+        return notificationCompatBuilder;
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/MessagingMainActivity.java b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/MessagingMainActivity.java
new file mode 100644
index 000000000..77d9d0cc7
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/handlers/MessagingMainActivity.java
@@ -0,0 +1,47 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications.handlers;
+
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Bundle;
+
+import com.example.android.wearable.wear.wearnotifications.MainActivity;
+import com.example.android.wearable.wear.wearnotifications.R;
+
+/**
+ * Template class meant to include functionality for your Messaging App. (This project's main focus
+ * is on Notification Styles.)
+ */
+public class MessagingMainActivity extends Activity {
+
+    private static final String TAG = "MessagingMainActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_messaging_main);
+
+        // Cancel Notification
+        NotificationManager notificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+
+        notificationManager.cancel(MainActivity.NOTIFICATION_ID);
+
+        // TODO: Handle and display message/conversation from your database
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/mock/MockDatabase.java b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/mock/MockDatabase.java
new file mode 100644
index 000000000..b552f6d3a
--- /dev/null
+++ b/samples/browseable/WearNotifications/Application/src/com.example.android.wearable.wear.wearnotifications/mock/MockDatabase.java
@@ -0,0 +1,400 @@
+package com.example.android.wearable.wear.wearnotifications.mock;
+
+import android.support.v4.app.NotificationCompat.MessagingStyle;
+
+import com.example.android.wearable.wear.wearnotifications.R;
+
+import java.util.ArrayList;
+
+/**
+ * Mock data for each of the Notification Style Demos.
+ */
+public final class MockDatabase {
+
+    public static BigTextStyleReminderAppData getBigTextStyleData() {
+        return BigTextStyleReminderAppData.getInstance();
+    }
+
+    public static BigPictureStyleSocialAppData getBigPictureStyleData() {
+        return BigPictureStyleSocialAppData.getInstance();
+    }
+
+    public static InboxStyleEmailAppData getInboxStyleData() {
+        return InboxStyleEmailAppData.getInstance();
+    }
+
+    public static MessagingStyleCommsAppData getMessagingStyleData() {
+        return MessagingStyleCommsAppData.getInstance();
+    }
+
+    /**
+     * Represents data needed for BigTextStyle Notification.
+     */
+    public static class BigTextStyleReminderAppData {
+
+        private static BigTextStyleReminderAppData sInstance = null;
+
+        // Standard notification values
+        private String mContentTitle;
+        private String mContentText;
+
+        // Style notification values
+        private String mBigContentTitle;
+        private String mBigText;
+        private String mSummaryText;
+
+
+        public static BigTextStyleReminderAppData getInstance() {
+            if (sInstance == null) {
+                sInstance = getSync();
+            }
+
+            return sInstance;
+        }
+
+        private static synchronized BigTextStyleReminderAppData getSync() {
+            if (sInstance == null) {
+                sInstance = new BigTextStyleReminderAppData();
+            }
+
+            return sInstance;
+        }
+
+        private BigTextStyleReminderAppData() {
+            // Standard Notification values
+            // Title for API <16 (4.0 and below) devices
+            mContentTitle = "Don't forget to...";
+            // Content for API <24 (4.0 and below) devices
+            mContentText = "Feed Dogs and check garage!";
+
+            // BigText Style Notification values
+            mBigContentTitle = "Don't forget to...";
+            mBigText = "... feed the dogs before you leave for work, and check the garage to "
+                            + "make sure the door is closed.";
+            mSummaryText = "Dogs and Garage";
+        }
+        public String getContentTitle() {
+            return mContentTitle;
+        }
+
+        public String getContentText() {
+            return mContentText;
+        }
+
+        public String getBigContentTitle() {
+            return mBigContentTitle;
+        }
+
+        public String getBigText() {
+            return mBigText;
+        }
+
+        public String getSummaryText() {
+            return mSummaryText;
+        }
+
+        @Override
+        public String toString() {
+            return getBigContentTitle() + getBigText();
+        }
+    }
+
+    /**
+     * Represents data needed for BigPictureStyle Notification.
+     */
+    public static class BigPictureStyleSocialAppData {
+        private static BigPictureStyleSocialAppData sInstance = null;
+
+        // Standard notification values
+        private String mContentTitle;
+        private String mContentText;
+
+        // Style notification values
+        private int mBigImage;
+        private String mBigContentTitle;
+        private String mSummaryText;
+
+        private CharSequence[] mPossiblePostResponses;
+
+        private ArrayList<String> mParticipants;
+
+
+        public static BigPictureStyleSocialAppData getInstance() {
+            if (sInstance == null) {
+                sInstance = getSync();
+            }
+            return sInstance;
+        }
+
+        private static synchronized BigPictureStyleSocialAppData getSync() {
+            if (sInstance == null) {
+                sInstance = new BigPictureStyleSocialAppData();
+            }
+
+            return sInstance;
+        }
+
+        private BigPictureStyleSocialAppData() {
+            // Standard Notification values
+            // Title/Content for API <16 (4.0 and below) devices
+            mContentTitle = "Bob's Post";
+            mContentText = "[Picture] Like my shot of Earth?";
+
+            // Style notification values
+            mBigImage = R.drawable.earth;
+            mBigContentTitle = "Bob's Post";
+            mSummaryText = "Like my shot of Earth?";
+
+            // This would be possible responses based on the contents of the post
+            mPossiblePostResponses = new CharSequence[]{"Yes", "No", "Maybe?"};
+
+            mParticipants = new ArrayList<>();
+            mParticipants.add("Bob Smith");
+        }
+
+        public String getContentTitle() {
+            return mContentTitle;
+        }
+
+        public String getContentText() {
+            return mContentText;
+        }
+
+        public int getBigImage() {
+            return mBigImage;
+        }
+
+        public String getBigContentTitle() {
+            return mBigContentTitle;
+        }
+
+        public String getSummaryText() {
+            return mSummaryText;
+        }
+
+        public CharSequence[] getPossiblePostResponses() {
+            return mPossiblePostResponses;
+        }
+
+        public ArrayList<String> getParticipants() {
+            return mParticipants;
+        }
+
+        @Override
+        public String toString() {
+            return getContentTitle() + " - " + getContentText();
+        }
+    }
+
+    /**
+     * Represents data needed for InboxStyle Notification.
+     */
+    public static class InboxStyleEmailAppData {
+        private static InboxStyleEmailAppData sInstance = null;
+
+        // Standard notification values
+        private String mContentTitle;
+        private String mContentText;
+        private int mNumberOfNewEmails;
+
+        // Style notification values
+        private String mBigContentTitle;
+        private String mSummaryText;
+        private ArrayList<String> mIndividualEmailSummary;
+
+        private ArrayList<String> mParticipants;
+
+        public static InboxStyleEmailAppData getInstance() {
+            if (sInstance == null) {
+                sInstance = getSync();
+            }
+            return sInstance;
+        }
+
+        private static synchronized InboxStyleEmailAppData getSync() {
+            if (sInstance == null) {
+                sInstance = new InboxStyleEmailAppData();
+            }
+
+            return sInstance;
+        }
+
+        private InboxStyleEmailAppData() {
+            // Standard Notification values
+            // Title/Content for API <16 (4.0 and below) devices
+            mContentTitle = "5 new emails";
+            mContentText = "from Jane, Jay, Alex +2 more";
+            mNumberOfNewEmails = 5;
+
+            // Style notification values
+            mBigContentTitle = "5 new emails from Jane, Jay, Alex +2";
+            mSummaryText = "New emails";
+
+            // Add each summary line of the new emails, you can add up to 5
+            mIndividualEmailSummary = new ArrayList<>();
+            mIndividualEmailSummary.add("Jane Faab  -   Launch Party is here...");
+            mIndividualEmailSummary.add("Jay Walker -   There's a turtle on the server!");
+            mIndividualEmailSummary.add("Alex Chang -   Check this out...");
+            mIndividualEmailSummary.add("Jane Johns -   Check in code?");
+            mIndividualEmailSummary.add("John Smith -   Movies later....");
+
+            // If the phone is in "Do not disturb mode, the user will still be notified if
+            // the user(s) is starred as a favorite.
+            mParticipants = new ArrayList<>();
+            mParticipants.add("Jane Faab");
+            mParticipants.add("Jay Walker");
+            mParticipants.add("Alex Chang");
+            mParticipants.add("Jane Johns");
+            mParticipants.add("John Smith");
+        }
+
+        public String getContentTitle() {
+            return mContentTitle;
+        }
+
+        public String getContentText() {
+            return mContentText;
+        }
+
+        public int getNumberOfNewEmails() {
+            return mNumberOfNewEmails;
+        }
+
+        public String getBigContentTitle() {
+            return mBigContentTitle;
+        }
+
+        public String getSummaryText() {
+            return mSummaryText;
+        }
+
+        public ArrayList<String> getIndividualEmailSummary() {
+            return mIndividualEmailSummary;
+        }
+
+        public ArrayList<String> getParticipants() {
+            return mParticipants;
+        }
+
+        @Override
+        public String toString() {
+            return getContentTitle() + " " + getContentText();
+        }
+    }
+
+    /**
+     * Represents data needed for MessagingStyle Notification.
+     */
+    public static class MessagingStyleCommsAppData {
+
+        private static MessagingStyleCommsAppData sInstance = null;
+
+        // Standard notification values
+        private String mContentTitle;
+        private String mContentText;
+
+        // Style notification values
+        private ArrayList<MessagingStyle.Message> mMessages;
+        // Basically, String of all mMessages
+        private String mFullConversation;
+        // Name preferred when replying to chat
+        private String mReplayName;
+        private int mNumberOfNewMessages;
+        private ArrayList<String> mParticipants;
+
+        public static MessagingStyleCommsAppData getInstance() {
+            if (sInstance == null) {
+                sInstance = getSync();
+            }
+            return sInstance;
+        }
+
+        private static synchronized MessagingStyleCommsAppData getSync() {
+            if (sInstance == null) {
+                sInstance = new MessagingStyleCommsAppData();
+            }
+
+            return sInstance;
+        }
+
+        private MessagingStyleCommsAppData() {
+            // Standard notification values
+            // Content for API <24 (M and below) devices
+            mContentTitle = "2 Messages w/ Famous McFamously";
+            mContentText = "Dude! ... You know I am a Pesce-pescetarian. :P";
+
+            // Style notification values
+
+            // For each message, you need the timestamp, in this case, we are using arbitrary ones.
+            long currentTime = System.currentTimeMillis();
+
+            mMessages = new ArrayList<>();
+            mMessages.add(new MessagingStyle.Message(
+                    "What are you doing tonight?", currentTime - 4000, "Famous"));
+            mMessages.add(new MessagingStyle.Message(
+                    "I don't know, dinner maybe?", currentTime - 3000, null));
+            mMessages.add(new MessagingStyle.Message(
+                    "Sounds good.", currentTime - 2000, "Famous"));
+            mMessages.add(new MessagingStyle.Message(
+                    "How about BBQ?", currentTime - 1000, null));
+            // Last two are the newest message (2) from friend
+            mMessages.add(new MessagingStyle.Message(
+                    "Dude!", currentTime, "Famous"));
+            mMessages.add(new MessagingStyle.Message(
+                    "You know I am a Pesce-pescetarian. :P", currentTime, "Famous"));
+
+
+            // String version of the mMessages above
+            mFullConversation = "Famous: What are you doing tonight?\n\n"
+                    + "Me: I don't know, dinner maybe?\n\n"
+                    + "Famous: Sounds good.\n\n"
+                    + "Me: How about BBQ?\n\n"
+                    + "Famous: Dude!\n\n"
+                    + "Famous: You know I am a Pesce-pescetarian. :P\n\n";
+
+            mNumberOfNewMessages = 2;
+
+            // Name preferred when replying to chat
+            mReplayName = "Me";
+
+            // If the phone is in "Do not disturb mode, the user will still be notified if
+            // the user(s) is starred as a favorite.
+            mParticipants = new ArrayList<>();
+            mParticipants.add("Famous McFamously");
+
+        }
+
+        public String getContentTitle() {
+            return mContentTitle;
+        }
+
+        public String getContentText() {
+            return mContentText;
+        }
+
+        public ArrayList<MessagingStyle.Message> getMessages() {
+            return mMessages;
+        }
+
+        public String getFullConversation() {
+            return mFullConversation;
+        }
+
+        public String getReplayName() {
+            return mReplayName;
+        }
+
+        public int getNumberOfNewMessages() {
+            return mNumberOfNewMessages;
+        }
+
+        public ArrayList<String> getParticipants() {
+            return mParticipants;
+        }
+
+        @Override
+        public String toString() {
+            return getFullConversation();
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/AndroidManifest.xml b/samples/browseable/WearNotifications/Wearable/AndroidManifest.xml
new file mode 100644
index 000000000..95176561b
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/AndroidManifest.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.example.android.wearable.wear.wearnotifications"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-feature android:name="android.hardware.type.watch"/>
+    <!-- Required for Always-on. -->
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <application android:allowBackup="true"
+                 android:icon="@mipmap/ic_launcher"
+                 android:label="@string/app_name"
+                 android:supportsRtl="true"
+                 android:theme="@android:style/Theme.DeviceDefault">
+
+        <!--
+        Important Note: Usually, you will want to disable bridging if you have a local/native
+        Android Wear app creating Notifications. In our case, we don't, as our sample shows both
+        Notifications launched from a Phone app (that needed to be bridged) and a Wear app.
+
+        To disable, create a meta-data tag here:
+
+        meta-data
+            name: com.google.android.wearable.notificationBridgeMode
+            value: NO_BRIDGING
+        -->
+
+        <!--If you want your app to run on pre-22, then set required to false -->
+        <uses-library android:name="com.google.android.wearable" android:required="false" />
+
+        <activity android:name=".StandaloneMainActivity"
+                  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=".handlers.BigTextMainActivity"
+            android:label="@string/title_activity_big_text_main"
+            android:taskAffinity="">
+        </activity>
+
+        <activity
+            android:name=".handlers.BigPictureSocialMainActivity"
+            android:label="@string/title_activity_big_picture_main"
+            android:taskAffinity="">
+        </activity>
+
+
+        <activity
+            android:name=".handlers.InboxMainActivity"
+            android:label="@string/title_activity_inbox_main"
+            android:taskAffinity="">
+        </activity>
+
+        <activity
+            android:name=".handlers.MessagingMainActivity"
+            android:label="@string/title_activity_messaging_main"
+            android:taskAffinity="">
+        </activity>
+
+        <service
+            android:name=".handlers.BigTextIntentService"
+            android:exported="false">
+        </service>
+
+        <service
+            android:name=".handlers.MessagingIntentService"
+            android:exported="false">
+        </service>
+
+        <service
+            android:name=".handlers.BigPictureSocialIntentService"
+            android:exported="false">
+        </service>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/earth.png b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/earth.png
new file mode 100644
index 000000000..13abd77a5
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/earth.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_alarm_white_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_alarm_white_48dp.png
new file mode 100644
index 000000000..75e5a46ee
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_alarm_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_cancel_white_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_cancel_white_48dp.png
new file mode 100644
index 000000000..dc32a14f9
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_cancel_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_launcher.png b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 000000000..0ed1b5fbf
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_message_black_18dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_message_black_18dp.png
new file mode 100644
index 000000000..d921ba2da
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_message_black_18dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_person_black_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..f1e148490
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_person_black_48dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_reply_white_18dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_reply_white_18dp.png
new file mode 100644
index 000000000..cc732baab
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_reply_white_18dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_alarm_white_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_alarm_white_48dp.png
new file mode 100644
index 000000000..280e09df3
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_alarm_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_cancel_white_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_cancel_white_48dp.png
new file mode 100644
index 000000000..6ebbc8316
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_cancel_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_launcher.png b/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 000000000..2b6948acb
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_message_black_18dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_message_black_18dp.png
new file mode 100644
index 000000000..2156f1673
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_message_black_18dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_person_black_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..360a32f27
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_person_black_48dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_reply_white_18dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_reply_white_18dp.png
new file mode 100644
index 000000000..b336e2f4d
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-mdpi/ic_reply_white_18dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_alarm_white_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_alarm_white_48dp.png
new file mode 100644
index 000000000..aa8102fd2
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_alarm_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_cancel_white_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_cancel_white_48dp.png
new file mode 100644
index 000000000..dc775b243
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_cancel_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_launcher.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..d9b134890
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_launcher.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_message_black_18dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_message_black_18dp.png
new file mode 100644
index 000000000..185d6136e
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_message_black_18dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_person_black_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..1ebc37be1
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_person_black_48dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_reply_white_18dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_reply_white_18dp.png
new file mode 100644
index 000000000..0424c2bd6
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xhdpi/ic_reply_white_18dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_alarm_white_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_alarm_white_48dp.png
new file mode 100644
index 000000000..f665286f8
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_alarm_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_cancel_white_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_cancel_white_48dp.png
new file mode 100644
index 000000000..cf2822a07
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_cancel_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_launcher.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..cb4f56f26
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_launcher.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_message_black_18dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_message_black_18dp.png
new file mode 100644
index 000000000..e710deeb5
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_message_black_18dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_person_black_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..77e3a1816
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_person_black_48dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_reply_white_18dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_reply_white_18dp.png
new file mode 100644
index 000000000..eeb5d4977
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xxhdpi/ic_reply_white_18dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_alarm_white_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_alarm_white_48dp.png
new file mode 100644
index 000000000..419f4bb4f
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_alarm_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_cancel_white_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_cancel_white_48dp.png
new file mode 100644
index 000000000..8bea844cd
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_cancel_white_48dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_launcher.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..77c9929cb
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_message_black_18dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_message_black_18dp.png
new file mode 100644
index 000000000..5456c42f4
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_message_black_18dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_person_black_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..6be3e3063
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_person_black_48dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_reply_white_18dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_reply_white_18dp.png
new file mode 100644
index 000000000..de0dad204
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-xxxhdpi/ic_reply_white_18dp.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/layout/activity_big_picture_main.xml b/samples/browseable/WearNotifications/Wearable/res/layout/activity_big_picture_main.xml
new file mode 100644
index 000000000..c52cd05dc
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/layout/activity_big_picture_main.xml
@@ -0,0 +1,37 @@
+<?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.
+-->
+<RelativeLayout
+    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:paddingBottom="@dimen/activity_header_end_padding"
+    android:paddingLeft="@dimen/list_start_padding"
+    android:paddingRight="@dimen/list_end_padding"
+    android:paddingTop="@dimen/activity_header_start_padding"
+    tools:context=".handlers.BigPictureSocialMainActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/main_text_activity_big_picture_main"
+        android:id="@+id/mainTextView"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"/>
+</RelativeLayout>
diff --git a/samples/browseable/WearNotifications/Wearable/res/layout/activity_big_text_main.xml b/samples/browseable/WearNotifications/Wearable/res/layout/activity_big_text_main.xml
new file mode 100644
index 000000000..946942682
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/layout/activity_big_text_main.xml
@@ -0,0 +1,38 @@
+<?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.
+-->
+<RelativeLayout
+    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:paddingBottom="@dimen/activity_header_end_padding"
+    android:paddingLeft="@dimen/list_start_padding"
+    android:paddingRight="@dimen/list_end_padding"
+    android:paddingTop="@dimen/activity_header_start_padding"
+    tools:context=".handlers.BigTextMainActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/main_text_activity_big_text_main"
+        android:id="@+id/mainTextView"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"/>
+
+</RelativeLayout>
diff --git a/samples/browseable/WearNotifications/Wearable/res/layout/activity_inbox_main.xml b/samples/browseable/WearNotifications/Wearable/res/layout/activity_inbox_main.xml
new file mode 100644
index 000000000..3123ecba8
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/layout/activity_inbox_main.xml
@@ -0,0 +1,38 @@
+<?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.
+-->
+<RelativeLayout
+    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:paddingBottom="@dimen/activity_header_end_padding"
+    android:paddingLeft="@dimen/list_start_padding"
+    android:paddingRight="@dimen/list_end_padding"
+    android:paddingTop="@dimen/activity_header_start_padding"
+    tools:context=".handlers.InboxMainActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/main_text_activity_inbox_main"
+        android:id="@+id/mainTextView"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"/>
+
+</RelativeLayout>
diff --git a/samples/browseable/WearNotifications/Wearable/res/layout/activity_main.xml b/samples/browseable/WearNotifications/Wearable/res/layout/activity_main.xml
new file mode 100644
index 000000000..467b461c9
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/layout/activity_main.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2016 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.
+-->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/mainRelativeLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_header_end_padding"
+    android:paddingLeft="@dimen/list_start_padding"
+    android:paddingRight="@dimen/list_end_padding"
+    android:paddingTop="@dimen/activity_header_start_padding"
+    tools:context="com.example.android.wearable.wear.wearnotifications.StandaloneMainActivity">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Pick Notification Style:"
+        android:id="@+id/spinnerHeadertextView"/>
+
+    <!--
+     android:paddingTop="@dimen/activity_vertical_margin"
+    -->
+
+    <Spinner
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/spinner"
+        android:layout_below="@+id/spinnerHeadertextView"/>
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Launch!"
+        android:onClick="onClick"
+        android:layout_below="@+id/spinner"
+        android:id="@+id/submit"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/res/layout/activity_messaging_main.xml b/samples/browseable/WearNotifications/Wearable/res/layout/activity_messaging_main.xml
new file mode 100644
index 000000000..0a710d0dd
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/layout/activity_messaging_main.xml
@@ -0,0 +1,38 @@
+<?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.
+-->
+<RelativeLayout
+    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:paddingBottom="@dimen/activity_header_end_padding"
+    android:paddingLeft="@dimen/list_start_padding"
+    android:paddingRight="@dimen/list_end_padding"
+    android:paddingTop="@dimen/activity_header_start_padding"
+    tools:context=".handlers.MessagingMainActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/main_text_activity_messaging_main"
+        android:id="@+id/mainTextView"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/res/mipmap-hdpi/ic_launcher.png b/samples/browseable/WearNotifications/Wearable/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..cde69bccc
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/mipmap-hdpi/ic_launcher.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/mipmap-mdpi/ic_launcher.png b/samples/browseable/WearNotifications/Wearable/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..c133a0cbd
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/mipmap-mdpi/ic_launcher.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/mipmap-xhdpi/ic_launcher.png b/samples/browseable/WearNotifications/Wearable/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..bfa42f0e7
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/mipmap-xhdpi/ic_launcher.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/mipmap-xxhdpi/ic_launcher.png b/samples/browseable/WearNotifications/Wearable/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..324e72cdd
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/samples/browseable/WearNotifications/Wearable/res/values-round/dimens.xml b/samples/browseable/WearNotifications/Wearable/res/values-round/dimens.xml
new file mode 100644
index 000000000..0bfb8a0d8
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/values-round/dimens.xml
@@ -0,0 +1,22 @@
+<?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>
+    <dimen name="activity_header_start_padding">36dp</dimen>
+    <dimen name="activity_header_end_padding">22dp</dimen>
+    <dimen name="list_start_padding">36dp</dimen>
+    <dimen name="list_end_padding">22dp</dimen>
+</resources>
diff --git a/samples/browseable/WearNotifications/Wearable/res/values/colors.xml b/samples/browseable/WearNotifications/Wearable/res/values/colors.xml
new file mode 100644
index 000000000..752b74fc3
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/values/colors.xml
@@ -0,0 +1,21 @@
+<?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>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/samples/browseable/WearNotifications/Wearable/res/values/dimens.xml b/samples/browseable/WearNotifications/Wearable/res/values/dimens.xml
new file mode 100644
index 000000000..05a0801db
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/values/dimens.xml
@@ -0,0 +1,22 @@
+<?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>
+    <dimen name="activity_header_start_padding">16dp</dimen>
+    <dimen name="activity_header_end_padding">16dp</dimen>
+    <dimen name="list_start_padding">10dp</dimen>
+    <dimen name="list_end_padding">10dp</dimen>
+</resources>
diff --git a/samples/browseable/WearNotifications/Wearable/res/values/strings.xml b/samples/browseable/WearNotifications/Wearable/res/values/strings.xml
new file mode 100644
index 000000000..ee3edc2d0
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/values/strings.xml
@@ -0,0 +1,44 @@
+<!--
+  Copyright 2016 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">Wear Notifications</string>
+
+    <string name="reply_label">Reply</string>
+    <string name="reply_name">Me</string>
+
+    <string name="title_activity_big_text_main">BigTextStyle Main Activity</string>
+    <string name="title_activity_big_picture_main">BigPictureStyle Main Activity</string>
+    <string name="title_activity_inbox_main">InboxStyle Main Activity</string>
+    <string name="title_activity_messaging_main">MessagingStyle Main Activity</string>
+
+    <string name="main_text_activity_big_text_main">
+        This Activity would handle the reminder app\'s functionality.
+        \n\nThe notification type for this example was the Big Text Style!
+    </string>
+    <string name="main_text_activity_big_picture_main">
+        This Activity would handle the social app\'s functionality for an individual post.
+        \n\nThe notification type for this example was the Big Picture Style!
+    </string>
+    <string name="main_text_activity_inbox_main">
+        This Activity would handle the email app\'s functionality for an email(s).
+        \n\nThe notification type for this example was the Inbox Style!
+    </string>
+    <string name="main_text_activity_messaging_main">
+        This Activity would handle the messaging app\'s functionality for a chat(s).
+        \n\nThe notification type for this example was the Messaging Style!
+    </string>
+
+</resources>
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/GlobalNotificationBuilder.java b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/GlobalNotificationBuilder.java
new file mode 100644
index 000000000..4023fbb6e
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/GlobalNotificationBuilder.java
@@ -0,0 +1,60 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications;
+
+import android.support.v7.app.NotificationCompat;
+
+/**
+ * We use a Singleton for a global copy of the NotificationCompat.Builder to update active
+ * Notifications from other Services/Activities.
+ *
+ * You have two options for updating your notifications:
+ *
+ *  1. Use a new NotificationCompatBuilder to create the Notification. This approach requires you
+ *  to get *ALL* the information and pass it to the builder. We get all the information from a Mock
+ *  Database and this is the approach used in the MainActivity.
+ *
+ *  2. Use an existing NotificationCompatBuilder to create a Notification. This approach requires
+ *  you to store a reference to the original builder. The benefit is you only need the new/updated
+ *  information for an existing notification. We use this approach in the IntentService handlers to
+ *  update existing notifications.
+ *
+ *  IMPORTANT NOTE 1: You shouldn't save/modify the resulting Notification object using
+ *  its member variables and/or legacy APIs. If you want to retain anything from update
+ *  to update, retain the Builder as option 2 outlines.
+ *
+ *  IMPORTANT NOTE 2: If the global Notification Builder is lost because the process is killed, you
+ *  should have a way to recreate the Notification Builder from a persistent state. (We do this as
+ *  well in the sample, check the IntentServices.)
+ */
+public final class GlobalNotificationBuilder {
+
+    private static NotificationCompat.Builder sGlobalNotificationCompatBuilder = null;
+
+    /*
+     * Empty constructor - We don't initialize builder because we rely on a null state to let us
+     * know the Application's process was killed.
+     */
+    private GlobalNotificationBuilder() { }
+
+    public static void setNotificationCompatBuilderInstance (NotificationCompat.Builder builder) {
+        sGlobalNotificationCompatBuilder = builder;
+    }
+
+    public static NotificationCompat.Builder getNotificationCompatBuilderInstance(){
+        return sGlobalNotificationCompatBuilder;
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/StandaloneMainActivity.java b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/StandaloneMainActivity.java
new file mode 100644
index 000000000..a390aca43
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/StandaloneMainActivity.java
@@ -0,0 +1,738 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications;
+
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.graphics.BitmapFactory;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.NotificationCompat.BigPictureStyle;
+import android.support.v4.app.NotificationCompat.BigTextStyle;
+import android.support.v4.app.NotificationCompat.InboxStyle;
+import android.support.v4.app.NotificationCompat.MessagingStyle;
+import android.support.v4.app.NotificationManagerCompat;
+import android.support.v4.app.RemoteInput;
+import android.support.v7.app.NotificationCompat;
+import android.support.wearable.activity.WearableActivity;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.RelativeLayout;
+import android.widget.Spinner;
+
+import com.example.android.wearable.wear.wearnotifications.handlers.BigPictureSocialIntentService;
+import com.example.android.wearable.wear.wearnotifications.handlers.BigPictureSocialMainActivity;
+import com.example.android.wearable.wear.wearnotifications.handlers.BigTextIntentService;
+import com.example.android.wearable.wear.wearnotifications.handlers.BigTextMainActivity;
+import com.example.android.wearable.wear.wearnotifications.handlers.InboxMainActivity;
+import com.example.android.wearable.wear.wearnotifications.handlers.MessagingIntentService;
+import com.example.android.wearable.wear.wearnotifications.handlers.MessagingMainActivity;
+import com.example.android.wearable.wear.wearnotifications.mock.MockDatabase;
+
+/**
+ * Demonstrates best practice for Notifications created by local standalone Android Wear apps. All
+ * Notification examples use Notification Styles.
+ */
+public class StandaloneMainActivity extends WearableActivity
+        implements AdapterView.OnItemSelectedListener {
+
+    private static final String TAG = "StandaloneMainActivity";
+
+    public static final int NOTIFICATION_ID = 888;
+
+    // Used for Notification Style array and switch statement for Spinner selection
+    private static final String BIG_TEXT_STYLE = "BIG_TEXT_STYLE";
+    private static final String BIG_PICTURE_STYLE = "BIG_PICTURE_STYLE";
+    private static final String INBOX_STYLE = "INBOX_STYLE";
+    private static final String MESSAGING_STYLE = "MESSAGING_STYLE";
+
+    // Collection of notification styles to back ArrayAdapter for Spinner
+    private static final String[] NOTIFICATION_STYLES =
+            {BIG_TEXT_STYLE, BIG_PICTURE_STYLE, INBOX_STYLE, MESSAGING_STYLE};
+
+    private NotificationManagerCompat mNotificationManagerCompat;
+
+    private int mSelectedNotification = 0;
+
+    // RelativeLayout is needed for SnackBars to alert users when Notifications are disabled for app
+    private RelativeLayout mMainRelativeLayout;
+    // TODO (jewalker): convert Spinner to WearableRecyclerView
+    private Spinner mSpinner;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Log.d(TAG, "onCreate()");
+
+        setContentView(R.layout.activity_main);
+        setAmbientEnabled();
+
+
+        mMainRelativeLayout = (RelativeLayout) findViewById(R.id.mainRelativeLayout);
+        mSpinner = (Spinner) findViewById(R.id.spinner);
+
+        mNotificationManagerCompat = NotificationManagerCompat.from(getApplicationContext());
+
+        // Create an ArrayAdapter using the string array and a default spinner layout
+        ArrayAdapter<CharSequence> adapter =
+                new ArrayAdapter(
+                        this,
+                        android.R.layout.simple_spinner_item,
+                        NOTIFICATION_STYLES);
+        // Specify the layout to use when the list of choices appears
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        // Apply the adapter to the spinner
+        mSpinner.setAdapter(adapter);
+        mSpinner.setOnItemSelectedListener(this);
+
+    }
+
+    @Override
+    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        Log.d(TAG, "onItemSelected(): position: " + position + " id: " + id);
+
+        mSelectedNotification = position;
+    }
+    @Override
+    public void onNothingSelected(AdapterView<?> parent) {
+        // Required
+    }
+
+    public void onClick(View view) {
+
+        Log.d(TAG, "onClick()");
+
+        boolean areNotificationsEnabled = mNotificationManagerCompat.areNotificationsEnabled();
+
+        // TODO (jewalker): Verify this is required, can't find way to disable in Wear 2.0.
+        if (!areNotificationsEnabled) {
+            // Because the user took an action to create a notification, we create a prompt to let
+            // the user re-enable notifications for this application again.
+            Snackbar snackbar = Snackbar
+                    .make(
+                            mMainRelativeLayout,
+                            "You need to enable notifications for this app",
+                            Snackbar.LENGTH_LONG)
+                    .setAction("ENABLE", new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            // Links to this app's notification settings
+                            openNotificationSettingsForApp();
+                        }
+                    });
+            snackbar.show();
+            return;
+        }
+
+        String notificationStyle = NOTIFICATION_STYLES[mSelectedNotification];
+
+        switch (notificationStyle) {
+            case BIG_TEXT_STYLE:
+                generateBigTextStyleNotification();
+                break;
+
+            case BIG_PICTURE_STYLE:
+                generateBigPictureStyleNotification();
+                break;
+
+            case INBOX_STYLE:
+                generateInboxStyleNotification();
+                break;
+
+            case MESSAGING_STYLE:
+                generateMessagingStyleNotification();
+                break;
+
+            default:
+                // continue below
+        }
+    }
+
+    /*
+     * Generates a BIG_TEXT_STYLE Notification that supports both Wear 1.+ and Wear 2.0.
+     *
+     * IMPORTANT NOTE:
+     * This method includes extra code to replicate Notification Styles behavior from Wear 1.+ and
+     * phones on Wear 2.0, i.e., the notification expands on click. To see the specific code in the
+     * method, search for "REPLICATE_NOTIFICATION_STYLE_CODE".
+     *
+     * Notification Styles behave slightly different on Wear 2.0 when they are launched by a
+     * native/local Wear app, i.e., they will NOT expand when the user taps them but will instead
+     * take the user directly into the local app for the richest experience. In contrast, a bridged
+     * Notification launched from the phone will expand with the style details (whether there is a
+     * local app or not).
+     *
+     * If you want to see the new behavior, please review the generateBigPictureStyleNotification()
+     * and generateMessagingStyleNotification() methods.
+     */
+    private void generateBigTextStyleNotification() {
+
+        Log.d(TAG, "generateBigTextStyleNotification()");
+
+        // Main steps for building a BIG_TEXT_STYLE notification:
+        //      0. Get your data
+        //      1. Build the BIG_TEXT_STYLE
+        //      2. Set up main Intent for notification
+        //      3. Create additional Actions for the Notification
+        //      4. Build and issue the notification
+
+        // 0. Get your data (everything unique per Notification)
+        MockDatabase.BigTextStyleReminderAppData bigTextStyleReminderAppData =
+                MockDatabase.getBigTextStyleData();
+
+        // 1. Build the BIG_TEXT_STYLE
+        BigTextStyle bigTextStyle = new NotificationCompat.BigTextStyle()
+                // Overrides ContentText in the big form of the template
+                .bigText(bigTextStyleReminderAppData.getBigText())
+                // Overrides ContentTitle in the big form of the template
+                .setBigContentTitle(bigTextStyleReminderAppData.getBigContentTitle())
+                // Summary line after the detail section in the big form of the template
+                // Note: To improve readability, don't overload the user with info. If Summary Text
+                // doesn't add critical information, you should skip it.
+                .setSummaryText(bigTextStyleReminderAppData.getSummaryText());
+
+
+        // 2. Set up main Intent for notification
+        Intent mainIntent = new Intent(this, BigTextMainActivity.class);
+
+        PendingIntent mainPendingIntent =
+                PendingIntent.getActivity(
+                        this,
+                        0,
+                        mainIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                );
+
+
+        // 3. Create additional Actions (Intents) for the Notification
+
+        // In our case, we create two additional actions: a Snooze action and a Dismiss action.
+
+        // Snooze Action
+        Intent snoozeIntent = new Intent(this, BigTextIntentService.class);
+        snoozeIntent.setAction(BigTextIntentService.ACTION_SNOOZE);
+
+        PendingIntent snoozePendingIntent = PendingIntent.getService(this, 0, snoozeIntent, 0);
+        NotificationCompat.Action snoozeAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_alarm_white_48dp,
+                        "Snooze",
+                        snoozePendingIntent)
+                        .build();
+
+        // Dismiss Action
+        Intent dismissIntent = new Intent(this, BigTextIntentService.class);
+        dismissIntent.setAction(BigTextIntentService.ACTION_DISMISS);
+
+        PendingIntent dismissPendingIntent = PendingIntent.getService(this, 0, dismissIntent, 0);
+        NotificationCompat.Action dismissAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_cancel_white_48dp,
+                        "Dismiss",
+                        dismissPendingIntent)
+                        .build();
+
+
+        // 4. Build and issue the notification
+
+        // Because we want this to be a new notification (not updating a previous notification), we
+        // create a new Builder. Later, we use the same global builder to get back the notification
+        // we built here for the snooze action, that is, canceling the notification and relaunching
+        // it several seconds later.
+
+        NotificationCompat.Builder notificationCompatBuilder =
+                new NotificationCompat.Builder(getApplicationContext());
+
+        GlobalNotificationBuilder.setNotificationCompatBuilderInstance(notificationCompatBuilder);
+
+        notificationCompatBuilder
+                // BIG_TEXT_STYLE sets title and content
+                .setStyle(bigTextStyle)
+                .setContentTitle(bigTextStyleReminderAppData.getContentTitle())
+                .setContentText(bigTextStyleReminderAppData.getContentText())
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setLargeIcon(BitmapFactory.decodeResource(
+                        getResources(),
+                        R.drawable.ic_alarm_white_48dp))
+                // Set primary color (important for Wear 2.0 Notifications)
+                .setColor(getResources().getColor(R.color.colorPrimary))
+
+                .setCategory(Notification.CATEGORY_REMINDER)
+                .setPriority(Notification.PRIORITY_HIGH)
+
+                // Shows content on the lock-screen
+                .setVisibility(Notification.VISIBILITY_PUBLIC)
+
+                // Adds additional actions specified above
+                .addAction(snoozeAction)
+                .addAction(dismissAction);
+
+        /* REPLICATE_NOTIFICATION_STYLE_CODE:
+         * You can replicate Notification Style functionality on Wear 2.0 (24+) by not setting the
+         * main content intent, that is, skipping the call setContentIntent(). However, you need to
+         * still allow the user to open the native Wear app from the Notification itself, so you
+         * add an action to launch the app.
+         */
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+
+            // Enables launching app in Wear 2.0 while keeping the old Notification Style behavior.
+            NotificationCompat.Action mainAction = new NotificationCompat.Action.Builder(
+                    R.drawable.ic_launcher,
+                    "Open",
+                    mainPendingIntent)
+                    .build();
+
+            notificationCompatBuilder.addAction(mainAction);
+
+        } else {
+            // Wear 1.+ still functions the same, so we set the main content intent.
+            notificationCompatBuilder.setContentIntent(mainPendingIntent);
+        }
+
+
+        Notification notification = notificationCompatBuilder.build();
+
+        mNotificationManagerCompat.notify(NOTIFICATION_ID, notification);
+
+        // Close app to demonstrate notification in steam.
+        finish();
+    }
+
+    /*
+     * Generates a BIG_PICTURE_STYLE Notification that supports both Wear 1.+ and Wear 2.0.
+     *
+     * This example Notification is a social post. It allows updating the notification with
+     * comments/responses via RemoteInput and the BigPictureSocialIntentService on 24+ (N+) and
+     * Android Wear devices.
+     *
+     * IMPORTANT NOTE:
+     * Notification Styles behave slightly different on Wear 2.0 when they are launched by a
+     * native/local Wear app, i.e., they will NOT expand when the user taps them but will instead
+     * take the user directly into the local app for the richest experience. In contrast, a bridged
+     * Notification launched from the phone will expand with the style details (whether there is a
+     * local app or not).
+     *
+     * If you want to enable an action on your Notification without launching the app, you can do so
+     * with the setHintDisplayActionInline() feature (shown below), but this only allows one action.
+     *
+     * If you wish to replicate the original experience of a bridged notification, please review the
+     * generateBigTextStyleNotification() method above to see how.
+     */
+    private void generateBigPictureStyleNotification() {
+
+        Log.d(TAG, "generateBigPictureStyleNotification()");
+
+        // Main steps for building a BIG_PICTURE_STYLE notification:
+        //      0. Get your data
+        //      1. Build the BIG_PICTURE_STYLE
+        //      2. Set up main Intent for notification
+        //      3. Set up RemoteInput, so users can input (keyboard and voice) from notification
+        //      4. Build and issue the notification
+
+        // 0. Get your data (everything unique per Notification)
+        MockDatabase.BigPictureStyleSocialAppData bigPictureStyleSocialAppData =
+                MockDatabase.getBigPictureStyleData();
+
+        // 1. Build the BIG_PICTURE_STYLE
+        BigPictureStyle bigPictureStyle = new NotificationCompat.BigPictureStyle()
+                // Provides the bitmap for the BigPicture notification
+                .bigPicture(
+                        BitmapFactory.decodeResource(
+                                getResources(),
+                                bigPictureStyleSocialAppData.getBigImage()))
+                // Overrides ContentTitle in the big form of the template
+                .setBigContentTitle(bigPictureStyleSocialAppData.getBigContentTitle())
+                // Summary line after the detail section in the big form of the template
+                .setSummaryText(bigPictureStyleSocialAppData.getSummaryText());
+
+        // 2. Set up main Intent for notification
+        Intent mainIntent = new Intent(this, BigPictureSocialMainActivity.class);
+
+        PendingIntent mainPendingIntent =
+                PendingIntent.getActivity(
+                        this,
+                        0,
+                        mainIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                );
+
+        // 3. Set up a RemoteInput Action, so users can input (keyboard, drawing, voice) directly
+        // from the notification without entering the app.
+
+        // Create the RemoteInput.
+        String replyLabel = getString(R.string.reply_label);
+        RemoteInput remoteInput =
+                new RemoteInput.Builder(BigPictureSocialIntentService.EXTRA_COMMENT)
+                        .setLabel(replyLabel)
+                        // List of quick response choices for any wearables paired with the phone
+                        .setChoices(bigPictureStyleSocialAppData.getPossiblePostResponses())
+                        .build();
+
+        // Create PendingIntent for service that handles input.
+        Intent replyIntent = new Intent(this, BigPictureSocialIntentService.class);
+        replyIntent.setAction(BigPictureSocialIntentService.ACTION_COMMENT);
+        PendingIntent replyActionPendingIntent = PendingIntent.getService(this, 0, replyIntent, 0);
+
+        // Enable action to appear inline on Wear 2.0 (24+). This means it will appear over the
+        // lower portion of the Notification for easy action (only possible for one action).
+        final NotificationCompat.Action.WearableExtender inlineActionForWear2 =
+                new NotificationCompat.Action.WearableExtender()
+                        .setHintDisplayActionInline(true)
+                        .setHintLaunchesActivity(false);
+
+        NotificationCompat.Action replyAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_reply_white_18dp,
+                        replyLabel,
+                        replyActionPendingIntent)
+                        .addRemoteInput(remoteInput)
+                        // Add WearableExtender to enable inline actions
+                        .extend(inlineActionForWear2)
+                        .build();
+
+        // 4. Build and issue the notification
+
+        // Because we want this to be a new notification (not updating a previous notification), we
+        // create a new Builder. Later, we use the same global builder to get back the notification
+        // we built here for a comment on the post.
+
+        NotificationCompat.Builder notificationCompatBuilder =
+                new NotificationCompat.Builder(getApplicationContext());
+
+        GlobalNotificationBuilder.setNotificationCompatBuilderInstance(notificationCompatBuilder);
+
+        // Build notification
+        notificationCompatBuilder
+                // BIG_PICTURE_STYLE sets title and content
+                .setStyle(bigPictureStyle)
+                .setContentTitle(bigPictureStyleSocialAppData.getContentTitle())
+                .setContentText(bigPictureStyleSocialAppData.getContentText())
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setLargeIcon(BitmapFactory.decodeResource(
+                        getResources(),
+                        R.drawable.ic_person_black_48dp))
+                .setContentIntent(mainPendingIntent)
+                // Set primary color (important for Wear 2.0 Notifications)
+                .setColor(getResources().getColor(R.color.colorPrimary))
+
+                .setSubText(Integer.toString(1))
+                .addAction(replyAction)
+                .setCategory(Notification.CATEGORY_SOCIAL)
+                .setPriority(Notification.PRIORITY_HIGH)
+
+                // Hides content on the lock-screen
+                .setVisibility(Notification.VISIBILITY_PRIVATE)
+                // Notifies system that the main launch intent is an Activity.
+                .extend(new NotificationCompat.WearableExtender()
+                        .setHintContentIntentLaunchesActivity(true));
+
+        // If the phone is in "Do not disturb mode, the user will still be notified if
+        // the sender(s) is starred as a favorite.
+        for (String name : bigPictureStyleSocialAppData.getParticipants()) {
+            notificationCompatBuilder.addPerson(name);
+        }
+
+        Notification notification = notificationCompatBuilder.build();
+        mNotificationManagerCompat.notify(NOTIFICATION_ID, notification);
+
+        // Close app to demonstrate notification in steam.
+        finish();
+    }
+
+    /*
+     * Generates a INBOX_STYLE Notification that supports both Wear 1.+ and Wear 2.0.
+     */
+    private void generateInboxStyleNotification() {
+
+        Log.d(TAG, "generateInboxStyleNotification()");
+
+
+        // Main steps for building a INBOX_STYLE notification:
+        //      0. Get your data
+        //      1. Build the INBOX_STYLE
+        //      2. Set up main Intent for notification
+        //      3. Build and issue the notification
+
+        // 0. Get your data (everything unique per Notification)
+        MockDatabase.InboxStyleEmailAppData inboxStyleEmailAppData =
+                MockDatabase.getInboxStyleData();
+
+        // 1. Build the INBOX_STYLE
+        InboxStyle inboxStyle = new NotificationCompat.InboxStyle()
+                // This title is slightly different than regular title, since I know INBOX_STYLE is
+                // available.
+                .setBigContentTitle(inboxStyleEmailAppData.getBigContentTitle())
+                .setSummaryText(inboxStyleEmailAppData.getSummaryText());
+
+        // Add each summary line of the new emails, you can add up to 5
+        for (String summary : inboxStyleEmailAppData.getIndividualEmailSummary()) {
+            inboxStyle.addLine(summary);
+        }
+
+        // 2. Set up main Intent for notification
+        Intent mainIntent = new Intent(this, InboxMainActivity.class);
+
+        PendingIntent mainPendingIntent =
+                PendingIntent.getActivity(
+                        this,
+                        0,
+                        mainIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                );
+
+        // 3. Build and issue the notification
+
+        // Because we want this to be a new notification (not updating a previous notification), we
+        // create a new Builder. However, we don't need to update this notification later, so we
+        // will not need to set a global builder for access to the notification later.
+
+        NotificationCompat.Builder notificationCompatBuilder =
+                new NotificationCompat.Builder(getApplicationContext());
+
+        GlobalNotificationBuilder.setNotificationCompatBuilderInstance(notificationCompatBuilder);
+
+        // 4. Build and issue the notification
+        notificationCompatBuilder
+                // INBOX_STYLE sets title and content
+                .setStyle(inboxStyle)
+                .setContentTitle(inboxStyleEmailAppData.getContentTitle())
+                .setContentText(inboxStyleEmailAppData.getContentText())
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setLargeIcon(BitmapFactory.decodeResource(
+                        getResources(),
+                        R.drawable.ic_person_black_48dp))
+                .setContentIntent(mainPendingIntent)
+                // Set primary color (important for Wear 2.0 Notifications)
+                .setColor(getResources().getColor(R.color.colorPrimary))
+
+                // Sets large number at the right-hand side of the notification for Wear 1.+.
+                .setSubText(Integer.toString(inboxStyleEmailAppData.getNumberOfNewEmails()))
+
+                .setCategory(Notification.CATEGORY_EMAIL)
+                .setPriority(Notification.PRIORITY_HIGH)
+
+                // Hides content on the lock-screen
+                .setVisibility(Notification.VISIBILITY_PRIVATE)
+                // Notifies system that the main launch intent is an Activity.
+                .extend(new NotificationCompat.WearableExtender()
+                        .setHintContentIntentLaunchesActivity(true));
+
+        // If the phone is in "Do not disturb mode, the user will still be notified if
+        // the sender(s) is starred as a favorite.
+        for (String name : inboxStyleEmailAppData.getParticipants()) {
+            notificationCompatBuilder.addPerson(name);
+        }
+
+        Notification notification = notificationCompatBuilder.build();
+        mNotificationManagerCompat.notify(NOTIFICATION_ID, notification);
+
+        // Close app to demonstrate notification in steam.
+        finish();
+    }
+
+    /*
+     * Generates a MESSAGING_STYLE Notification that supports both Wear 1.+ and Wear 2.0. For
+     * devices on API level 24 (Wear 2.0) and after, displays MESSAGING_STYLE. Otherwise, displays
+     * a basic BIG_TEXT_STYLE.
+     *
+     * IMPORTANT NOTE:
+     * Notification Styles behave slightly different on Wear 2.0 when they are launched by a
+     * native/local Wear app, i.e., they will NOT expand when the user taps them but will instead
+     * take the user directly into the local app for the richest experience. In contrast, a bridged
+     * Notification launched from the phone will expand with the style details (whether there is a
+     * local app or not).
+     *
+     * If you want to enable an action on your Notification without launching the app, you can do so
+     * with the setHintDisplayActionInline() feature (shown below), but this only allows one action.
+     *
+     * If you wish to replicate the original experience of a bridged notification, please review the
+     * generateBigTextStyleNotification() method above to see how.
+     */
+    private void generateMessagingStyleNotification() {
+
+        Log.d(TAG, "generateMessagingStyleNotification()");
+
+        // Main steps for building a MESSAGING_STYLE notification:
+        //      0. Get your data
+        //      1. Build the MESSAGING_STYLE
+        //      2. Add support for Wear 1.+
+        //      3. Set up main Intent for notification
+        //      4. Set up RemoteInput (users can input directly from notification)
+        //      5. Build and issue the notification
+
+        // 0. Get your data (everything unique per Notification)
+        MockDatabase.MessagingStyleCommsAppData messagingStyleCommsAppData =
+                MockDatabase.getMessagingStyleData();
+
+        // 1. Build the Notification.Style (MESSAGING_STYLE)
+        String contentTitle = messagingStyleCommsAppData.getContentTitle();
+
+        MessagingStyle messagingStyle =
+                new NotificationCompat.MessagingStyle(messagingStyleCommsAppData.getReplayName())
+                        // You could set a different title to appear when the messaging style
+                        // is supported on device (24+) if you wish. In our case, we use the same
+                        // title.
+                        .setConversationTitle(contentTitle);
+
+        // Adds all Messages
+        // Note: Messages include the text, timestamp, and sender
+        for (MessagingStyle.Message message : messagingStyleCommsAppData.getMessages()) {
+            messagingStyle.addMessage(message);
+        }
+
+
+        // 2. Add support for Wear 1.+
+
+        // Since Wear 1.0 doesn't support the MESSAGING_STYLE, we use the BIG_TEXT_STYLE, so all the
+        // text is visible.
+
+        // This is basically a toString() of all the Messages above.
+        String fullMessageForWearVersion1 = messagingStyleCommsAppData.getFullConversation();
+
+        Notification chatHistoryForWearV1 = new NotificationCompat.Builder(getApplicationContext())
+                .setStyle(new BigTextStyle().bigText(fullMessageForWearVersion1))
+                .setContentTitle(contentTitle)
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setContentText(fullMessageForWearVersion1)
+                .build();
+
+        // Adds page with all text to support Wear 1.+.
+        NotificationCompat.WearableExtender wearableExtenderForWearVersion1 =
+                new NotificationCompat.WearableExtender()
+                        .setHintContentIntentLaunchesActivity(true)
+                        .addPage(chatHistoryForWearV1);
+
+        // 3. Set up main Intent for notification
+        Intent notifyIntent = new Intent(this, MessagingMainActivity.class);
+
+        PendingIntent mainPendingIntent =
+                PendingIntent.getActivity(
+                        this,
+                        0,
+                        notifyIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                );
+
+
+        // 4. Set up a RemoteInput Action, so users can input (keyboard, drawing, voice) directly
+        // from the notification without entering the app.
+
+        // Create the RemoteInput specifying this key.
+        String replyLabel = getString(R.string.reply_label);
+        RemoteInput remoteInput = new RemoteInput.Builder(MessagingIntentService.EXTRA_REPLY)
+                .setLabel(replyLabel)
+                .build();
+
+        // Create PendingIntent for service that handles input.
+        Intent replyIntent = new Intent(this, MessagingIntentService.class);
+        replyIntent.setAction(MessagingIntentService.ACTION_REPLY);
+        PendingIntent replyActionPendingIntent = PendingIntent.getService(this, 0, replyIntent, 0);
+
+        // Enable action to appear inline on Wear 2.0 (24+). This means it will appear over the
+        // lower portion of the Notification for easy action (only possible for one action).
+        final NotificationCompat.Action.WearableExtender inlineActionForWear2 =
+                new NotificationCompat.Action.WearableExtender()
+                        .setHintDisplayActionInline(true)
+                        .setHintLaunchesActivity(false);
+
+        NotificationCompat.Action replyAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_reply_white_18dp,
+                        replyLabel,
+                        replyActionPendingIntent)
+                        .addRemoteInput(remoteInput)
+                        // Allows system to generate replies by context of conversation
+                        .setAllowGeneratedReplies(true)
+                        // Add WearableExtender to enable inline actions
+                        .extend(inlineActionForWear2)
+                        .build();
+
+
+        // 5. Build and issue the notification
+
+        // Because we want this to be a new notification (not updating current notification), we
+        // create a new Builder. Later, we update this same notification, so we need to save this
+        // Builder globally (as outlined earlier).
+
+        NotificationCompat.Builder notificationCompatBuilder =
+                new NotificationCompat.Builder(getApplicationContext());
+
+        GlobalNotificationBuilder.setNotificationCompatBuilderInstance(notificationCompatBuilder);
+
+        // Builds and issues notification
+        notificationCompatBuilder
+                // MESSAGING_STYLE sets title and content for API 24+ (Wear 2.0) devices
+                .setStyle(messagingStyle)
+                // Title for API <24 (Wear 1.+) devices
+                .setContentTitle(contentTitle)
+                // Content for API <24 (Wear 1.+) devices
+                .setContentText(messagingStyleCommsAppData.getContentText())
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setLargeIcon(BitmapFactory.decodeResource(
+                        getResources(),
+                        R.drawable.ic_person_black_48dp))
+                .setContentIntent(mainPendingIntent)
+                // Set primary color (important for Wear 2.0 Notifications)
+                .setColor(getResources().getColor(R.color.colorPrimary))
+
+                // Number of new notifications for API <24 (Wear 1.+) devices
+                .setSubText(Integer.toString(messagingStyleCommsAppData.getNumberOfNewMessages()))
+
+                .addAction(replyAction)
+                .setCategory(Notification.CATEGORY_MESSAGE)
+                .setPriority(Notification.PRIORITY_HIGH)
+
+                // Hides content on the lock-screen
+                .setVisibility(Notification.VISIBILITY_PRIVATE)
+
+                // Adds multiple pages for easy consumption on a wear device.
+                .extend(wearableExtenderForWearVersion1);
+
+        // If the phone is in "Do not disturb mode, the user will still be notified if
+        // the sender(s) is starred as a favorite.
+        for (String name : messagingStyleCommsAppData.getParticipants()) {
+            notificationCompatBuilder.addPerson(name);
+        }
+
+        Notification notification = notificationCompatBuilder.build();
+        mNotificationManagerCompat.notify(NOTIFICATION_ID, notification);
+
+        // Close app to demonstrate notification in steam.
+        finish();
+    }
+
+    /**
+     * Helper method for the SnackBar action, i.e., if the user has this application's notifications
+     * disabled, this opens up the dialog to turn them back on after the user requests a
+     * Notification launch.
+     *
+     * IMPORTANT NOTE: You should not do this action unless the user takes an action to see your
+     * Notifications like this sample demonstrates. Spamming users to re-enable your notifications
+     * is a bad idea.
+     */
+    private void openNotificationSettingsForApp() {
+        // Links to this app's notification settings
+        Intent intent = new Intent();
+        intent.setAction("android.settings.APP_NOTIFICATION_SETTINGS");
+        intent.putExtra("app_package", getPackageName());
+        intent.putExtra("app_uid", getApplicationInfo().uid);
+        startActivity(intent);
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/BigPictureSocialIntentService.java b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/BigPictureSocialIntentService.java
new file mode 100644
index 000000000..d49210c8d
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/BigPictureSocialIntentService.java
@@ -0,0 +1,228 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications.handlers;
+
+import android.app.IntentService;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.support.v4.app.NotificationCompat.BigPictureStyle;
+import android.support.v4.app.NotificationManagerCompat;
+import android.support.v4.app.RemoteInput;
+import android.support.v7.app.NotificationCompat;
+import android.util.Log;
+
+import com.example.android.wearable.wear.wearnotifications.GlobalNotificationBuilder;
+import com.example.android.wearable.wear.wearnotifications.R;
+import com.example.android.wearable.wear.wearnotifications.StandaloneMainActivity;
+import com.example.android.wearable.wear.wearnotifications.mock.MockDatabase;
+
+/**
+ * Asynchronously handles updating social app posts (and active Notification) with comments from
+ * user. Notification for social app use BigPictureStyle.
+ */
+public class BigPictureSocialIntentService extends IntentService {
+
+    private static final String TAG = "BigPictureService";
+
+    public static final String ACTION_COMMENT =
+            "com.example.android.wearable.wear.wearnotifications.handlers.action.COMMENT";
+
+    public static final String EXTRA_COMMENT =
+            "com.example.android.wearable.wear.wearnotifications.handlers.extra.COMMENT";
+
+    public BigPictureSocialIntentService() {
+        super("BigPictureSocialIntentService");
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        Log.d(TAG, "onHandleIntent(): " + intent);
+
+        if (intent != null) {
+            final String action = intent.getAction();
+            if (ACTION_COMMENT.equals(action)) {
+                handleActionComment(getMessage(intent));
+            }
+        }
+    }
+
+    /**
+     * Handles action for adding a comment from the notification.
+     */
+    private void handleActionComment(CharSequence comment) {
+        Log.d(TAG, "handleActionComment(): " + comment);
+
+        if (comment != null) {
+
+            // TODO: Asynchronously save your message to Database and servers.
+
+            /*
+             * You have two options for updating your notification (this class uses approach #2):
+             *
+             *  1. Use a new NotificationCompatBuilder to create the Notification. This approach
+             *  requires you to get *ALL* the information that existed in the previous
+             *  Notification (and updates) and pass it to the builder. This is the approach used in
+             *  the MainActivity.
+             *
+             *  2. Use the original NotificationCompatBuilder to create the Notification. This
+             *  approach requires you to store a reference to the original builder. The benefit is
+             *  you only need the new/updated information. In our case, the comment from the user
+             *  regarding the post (which we already have here).
+             *
+             *  IMPORTANT NOTE: You shouldn't save/modify the resulting Notification object using
+             *  its member variables and/or legacy APIs. If you want to retain anything from update
+             *  to update, retain the Builder as option 2 outlines.
+             */
+
+            // Retrieves NotificationCompat.Builder used to create initial Notification
+            NotificationCompat.Builder notificationCompatBuilder =
+                    GlobalNotificationBuilder.getNotificationCompatBuilderInstance();
+
+            // Recreate builder from persistent state if app process is killed
+            if (notificationCompatBuilder == null) {
+                // Note: New builder set globally in the method
+                notificationCompatBuilder = recreateBuilderWithBigPictureStyle();
+            }
+
+            // Updates active Notification
+            Notification updatedNotification = notificationCompatBuilder
+                    // Adds a line and comment below content in Notification
+                    .setRemoteInputHistory(new CharSequence[]{comment})
+                    .build();
+
+            // Pushes out the updated Notification
+            NotificationManagerCompat notificationManagerCompat =
+                    NotificationManagerCompat.from(getApplicationContext());
+            notificationManagerCompat.notify(
+                    StandaloneMainActivity.NOTIFICATION_ID,
+                    updatedNotification);
+        }
+    }
+
+    /*
+     * Extracts CharSequence created from the RemoteInput associated with the Notification.
+     */
+    private CharSequence getMessage(Intent intent) {
+        Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
+        if (remoteInput != null) {
+            return remoteInput.getCharSequence(EXTRA_COMMENT);
+        }
+        return null;
+    }
+
+    /*
+     * This recreates the notification from the persistent state in case the app process was killed.
+     * It is basically the same code for creating the Notification from StandaloneMainActivity.
+     */
+    private NotificationCompat.Builder recreateBuilderWithBigPictureStyle() {
+
+        // Main steps for building a BIG_PICTURE_STYLE notification (for more detailed comments on
+        // building this notification, check StandaloneMainActivity.java):
+        //      0. Get your data
+        //      1. Build the BIG_PICTURE_STYLE
+        //      2. Set up main Intent for notification
+        //      3. Set up RemoteInput, so users can input (keyboard and voice) from notification
+        //      4. Build and issue the notification
+
+        // 0. Get your data (everything unique per Notification)
+        MockDatabase.BigPictureStyleSocialAppData bigPictureStyleSocialAppData =
+                MockDatabase.getBigPictureStyleData();
+
+        // 1. Build the BIG_PICTURE_STYLE
+        BigPictureStyle bigPictureStyle = new NotificationCompat.BigPictureStyle()
+                .bigPicture(
+                        BitmapFactory.decodeResource(
+                                getResources(),
+                                bigPictureStyleSocialAppData.getBigImage()))
+                .setBigContentTitle(bigPictureStyleSocialAppData.getBigContentTitle())
+                .setSummaryText(bigPictureStyleSocialAppData.getSummaryText());
+
+        // 2. Set up main Intent for notification
+        Intent mainIntent = new Intent(this, BigPictureSocialMainActivity.class);
+
+        PendingIntent mainPendingIntent =
+                PendingIntent.getActivity(
+                        this,
+                        0,
+                        mainIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                );
+
+        // 3. Set up a RemoteInput Action, so users can input (keyboard, drawing, voice) directly
+        // from the notification without entering the app.
+        String replyLabel = getString(R.string.reply_label);
+        RemoteInput remoteInput =
+                new RemoteInput.Builder(BigPictureSocialIntentService.EXTRA_COMMENT)
+                        .setLabel(replyLabel)
+                        .setChoices(bigPictureStyleSocialAppData.getPossiblePostResponses())
+                        .build();
+
+        Intent replyIntent = new Intent(this, BigPictureSocialIntentService.class);
+        replyIntent.setAction(BigPictureSocialIntentService.ACTION_COMMENT);
+        PendingIntent replyActionPendingIntent = PendingIntent.getService(this, 0, replyIntent, 0);
+
+        // Enable action to appear inline on Wear 2.0 (24+). This means it will appear over the
+        // lower portion of the Notification for easy action (only possible for one action).
+        final NotificationCompat.Action.WearableExtender inlineActionForWear2 =
+                new NotificationCompat.Action.WearableExtender()
+                        .setHintDisplayActionInline(true)
+                        .setHintLaunchesActivity(false);
+
+        NotificationCompat.Action replyAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_reply_white_18dp,
+                        replyLabel,
+                        replyActionPendingIntent)
+                        .addRemoteInput(remoteInput)
+                        // Add WearableExtender to enable inline actions
+                        .extend(inlineActionForWear2)
+                        .build();
+
+        // 4. Build and issue the notification
+        NotificationCompat.Builder notificationCompatBuilder =
+                new NotificationCompat.Builder(getApplicationContext());
+
+        GlobalNotificationBuilder.setNotificationCompatBuilderInstance(notificationCompatBuilder);
+
+        // Build notification
+        notificationCompatBuilder
+                .setStyle(bigPictureStyle)
+                .setContentTitle(bigPictureStyleSocialAppData.getContentTitle())
+                .setContentText(bigPictureStyleSocialAppData.getContentText())
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setLargeIcon(BitmapFactory.decodeResource(
+                        getResources(),
+                        R.drawable.ic_person_black_48dp))
+                .setContentIntent(mainPendingIntent)
+                .setColor(getResources().getColor(R.color.colorPrimary))
+                .setSubText(Integer.toString(1))
+                .addAction(replyAction)
+                .setCategory(Notification.CATEGORY_SOCIAL)
+                .setPriority(Notification.PRIORITY_HIGH)
+                .setVisibility(Notification.VISIBILITY_PRIVATE)
+                .extend(new NotificationCompat.WearableExtender()
+                        .setHintContentIntentLaunchesActivity(true));
+
+        for (String name : bigPictureStyleSocialAppData.getParticipants()) {
+            notificationCompatBuilder.addPerson(name);
+        }
+
+        return notificationCompatBuilder;
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/BigPictureSocialMainActivity.java b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/BigPictureSocialMainActivity.java
new file mode 100644
index 000000000..27dae1ee6
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/BigPictureSocialMainActivity.java
@@ -0,0 +1,45 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications.handlers;
+
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Bundle;
+
+import com.example.android.wearable.wear.wearnotifications.R;
+import com.example.android.wearable.wear.wearnotifications.StandaloneMainActivity;
+
+/**
+ * Template class meant to include functionality for your Social App. (This project's main focus
+ * is on Notification Styles.)
+ */
+public class BigPictureSocialMainActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_big_picture_main);
+
+        // Cancel Notification
+        NotificationManager notificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+
+        notificationManager.cancel(StandaloneMainActivity.NOTIFICATION_ID);
+
+        // TODO: Handle and display social post from your database
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/BigTextIntentService.java b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/BigTextIntentService.java
new file mode 100644
index 000000000..67e92a701
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/BigTextIntentService.java
@@ -0,0 +1,227 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications.handlers;
+
+import android.app.IntentService;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.graphics.BitmapFactory;
+import android.os.Build;
+import android.support.v4.app.NotificationCompat.BigTextStyle;
+import android.support.v4.app.NotificationManagerCompat;
+import android.support.v7.app.NotificationCompat;
+import android.util.Log;
+
+import com.example.android.wearable.wear.wearnotifications.GlobalNotificationBuilder;
+import com.example.android.wearable.wear.wearnotifications.R;
+import com.example.android.wearable.wear.wearnotifications.StandaloneMainActivity;
+import com.example.android.wearable.wear.wearnotifications.mock.MockDatabase;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Asynchronously handles snooze and dismiss actions for reminder app (and active Notification).
+ * Notification for for reminder app uses BigTextStyle.
+ */
+public class BigTextIntentService extends IntentService {
+
+    private static final String TAG = "BigTextService";
+
+    public static final String ACTION_DISMISS =
+            "com.example.android.wearable.wear.wearnotifications.handlers.action.DISMISS";
+    public static final String ACTION_SNOOZE =
+            "com.example.android.wearable.wear.wearnotifications.handlers.action.SNOOZE";
+
+    private static final long SNOOZE_TIME = TimeUnit.SECONDS.toMillis(5);
+
+    public BigTextIntentService() {
+        super("BigTextIntentService");
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        Log.d(TAG, "onHandleIntent(): " + intent);
+
+        if (intent != null) {
+            final String action = intent.getAction();
+            if (ACTION_DISMISS.equals(action)) {
+                handleActionDismiss();
+            } else if (ACTION_SNOOZE.equals(action)) {
+                handleActionSnooze();
+            }
+        }
+    }
+
+    /**
+     * Handles action Dismiss in the provided background thread.
+     */
+    private void handleActionDismiss() {
+        Log.d(TAG, "handleActionDismiss()");
+
+        NotificationManagerCompat notificationManagerCompat =
+                NotificationManagerCompat.from(getApplicationContext());
+        notificationManagerCompat.cancel(StandaloneMainActivity.NOTIFICATION_ID);
+    }
+
+    /**
+     * Handles action Snooze in the provided background thread.
+     */
+    private void handleActionSnooze() {
+        Log.d(TAG, "handleActionSnooze()");
+
+        // You could use NotificationManager.getActiveNotifications() if you are targeting SDK 23
+        // and above, but we are targeting devices with lower SDK API numbers, so we saved the
+        // builder globally and get the notification back to recreate it later.
+
+        NotificationCompat.Builder notificationCompatBuilder =
+                GlobalNotificationBuilder.getNotificationCompatBuilderInstance();
+
+        // Recreate builder from persistent state if app process is killed
+        if (notificationCompatBuilder == null) {
+            // Note: New builder set globally in the method
+            notificationCompatBuilder = recreateBuilderWithBigTextStyle();
+        }
+
+        Notification notification;
+        notification = notificationCompatBuilder.build();
+
+
+        if (notification != null) {
+            NotificationManagerCompat notificationManagerCompat =
+                    NotificationManagerCompat.from(getApplicationContext());
+
+            notificationManagerCompat.cancel(StandaloneMainActivity.NOTIFICATION_ID);
+
+            try {
+                Thread.sleep(SNOOZE_TIME);
+            } catch (InterruptedException ex) {
+                Thread.currentThread().interrupt();
+            }
+            notificationManagerCompat.notify(StandaloneMainActivity.NOTIFICATION_ID, notification);
+        }
+
+    }
+
+    /*
+     * This recreates the notification from the persistent state in case the app process was killed.
+     * It is basically the same code for creating the Notification from StandaloneMainActivity.
+     */
+    private NotificationCompat.Builder recreateBuilderWithBigTextStyle() {
+
+        // Main steps for building a BIG_TEXT_STYLE notification (for more detailed comments on
+        // building this notification, check StandaloneMainActivity.java)::
+        //      0. Get your data
+        //      1. Build the BIG_TEXT_STYLE
+        //      2. Set up main Intent for notification
+        //      3. Create additional Actions for the Notification
+        //      4. Build and issue the notification
+
+        // 0. Get your data (everything unique per Notification)
+        MockDatabase.BigTextStyleReminderAppData bigTextStyleReminderAppData =
+                MockDatabase.getBigTextStyleData();
+
+        // 1. Build the BIG_TEXT_STYLE
+        BigTextStyle bigTextStyle = new NotificationCompat.BigTextStyle()
+                .bigText(bigTextStyleReminderAppData.getBigText())
+                .setBigContentTitle(bigTextStyleReminderAppData.getBigContentTitle())
+                .setSummaryText(bigTextStyleReminderAppData.getSummaryText());
+
+
+        // 2. Set up main Intent for notification
+        Intent mainIntent = new Intent(this, BigTextMainActivity.class);
+
+        PendingIntent mainPendingIntent =
+                PendingIntent.getActivity(
+                        this,
+                        0,
+                        mainIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                );
+
+
+        // 3. Create additional Actions (Intents) for the Notification
+        // Snooze Action
+        Intent snoozeIntent = new Intent(this, BigTextIntentService.class);
+        snoozeIntent.setAction(BigTextIntentService.ACTION_SNOOZE);
+
+        PendingIntent snoozePendingIntent = PendingIntent.getService(this, 0, snoozeIntent, 0);
+        NotificationCompat.Action snoozeAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_alarm_white_48dp,
+                        "Snooze",
+                        snoozePendingIntent)
+                        .build();
+
+        // Dismiss Action
+        Intent dismissIntent = new Intent(this, BigTextIntentService.class);
+        dismissIntent.setAction(BigTextIntentService.ACTION_DISMISS);
+
+        PendingIntent dismissPendingIntent = PendingIntent.getService(this, 0, dismissIntent, 0);
+        NotificationCompat.Action dismissAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_cancel_white_48dp,
+                        "Dismiss",
+                        dismissPendingIntent)
+                        .build();
+
+
+        // 4. Build and issue the notification
+        NotificationCompat.Builder notificationCompatBuilder =
+                new NotificationCompat.Builder(getApplicationContext());
+
+        GlobalNotificationBuilder.setNotificationCompatBuilderInstance(notificationCompatBuilder);
+
+        notificationCompatBuilder
+                .setStyle(bigTextStyle)
+                .setContentTitle(bigTextStyleReminderAppData.getContentTitle())
+                .setContentText(bigTextStyleReminderAppData.getContentText())
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setLargeIcon(BitmapFactory.decodeResource(
+                        getResources(),
+                        R.drawable.ic_alarm_white_48dp))
+                .setColor(getResources().getColor(R.color.colorPrimary))
+                .setCategory(Notification.CATEGORY_REMINDER)
+                .setPriority(Notification.PRIORITY_HIGH)
+                .setVisibility(Notification.VISIBILITY_PUBLIC)
+                .addAction(snoozeAction)
+                .addAction(dismissAction);
+
+        /* REPLICATE_NOTIFICATION_STYLE_CODE:
+         * You can replicate Notification Style functionality on Wear 2.0 (24+) by not setting the
+         * main content intent, that is, skipping the call setContentIntent(). However, you need to
+         * still allow the user to open the native Wear app from the Notification itself, so you
+         * add an action to launch the app.
+         */
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+
+            // Enables launching app in Wear 2.0 while keeping the old Notification Style behavior.
+            NotificationCompat.Action mainAction = new NotificationCompat.Action.Builder(
+                    R.drawable.ic_launcher,
+                    "Open",
+                    mainPendingIntent)
+                    .build();
+
+            notificationCompatBuilder.addAction(mainAction);
+
+        } else {
+            // Wear 1.+ still functions the same, so we set the main content intent.
+            notificationCompatBuilder.setContentIntent(mainPendingIntent);
+        }
+
+        return notificationCompatBuilder;
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/BigTextMainActivity.java b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/BigTextMainActivity.java
new file mode 100644
index 000000000..fb0b40e08
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/BigTextMainActivity.java
@@ -0,0 +1,45 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications.handlers;
+
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Bundle;
+
+import com.example.android.wearable.wear.wearnotifications.R;
+import com.example.android.wearable.wear.wearnotifications.StandaloneMainActivity;
+
+/**
+ * Template class meant to include functionality for your Reminder/Alarm App. (This project's main
+ * focus is on Notification Styles.)
+ */
+public class BigTextMainActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_big_text_main);
+
+        // Cancel Notification
+        NotificationManager notificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+
+        notificationManager.cancel(StandaloneMainActivity.NOTIFICATION_ID);
+
+        // TODO: Handle and display reminder from your database
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/InboxMainActivity.java b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/InboxMainActivity.java
new file mode 100644
index 000000000..0724015ea
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/InboxMainActivity.java
@@ -0,0 +1,45 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications.handlers;
+
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Bundle;
+
+import com.example.android.wearable.wear.wearnotifications.R;
+import com.example.android.wearable.wear.wearnotifications.StandaloneMainActivity;
+
+/**
+ * Template class meant to include functionality for your email app. (This project's main focus
+ * is on Notification Styles.)
+ */
+public class InboxMainActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_inbox_main);
+
+        // Cancel Notification
+        NotificationManager notificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+
+        notificationManager.cancel(StandaloneMainActivity.NOTIFICATION_ID);
+
+        // TODO: Handle and display email from your database
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/MessagingIntentService.java b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/MessagingIntentService.java
new file mode 100644
index 000000000..2268cfcb5
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/MessagingIntentService.java
@@ -0,0 +1,259 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications.handlers;
+
+import android.app.IntentService;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.support.v4.app.NotificationCompat.MessagingStyle;
+import android.support.v4.app.NotificationManagerCompat;
+import android.support.v4.app.RemoteInput;
+import android.support.v7.app.NotificationCompat;
+import android.util.Log;
+
+import com.example.android.wearable.wear.wearnotifications.GlobalNotificationBuilder;
+import com.example.android.wearable.wear.wearnotifications.R;
+import com.example.android.wearable.wear.wearnotifications.StandaloneMainActivity;
+import com.example.android.wearable.wear.wearnotifications.mock.MockDatabase;
+
+/**
+ * Asynchronously handles updating messaging app posts (and active Notification) with replies from
+ * user in a conversation. Notification for social app use MessagingStyle.
+ */
+public class MessagingIntentService extends IntentService {
+
+    private static final String TAG = "MessagingIntentService";
+
+    public static final String ACTION_REPLY =
+            "com.example.android.wearable.wear.wearnotifications.handlers.action.REPLY";
+
+    public static final String EXTRA_REPLY =
+            "com.example.android.wearable.wear.wearnotifications.handlers.extra.REPLY";
+
+
+    public MessagingIntentService() {
+        super("MessagingIntentService");
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        Log.d(TAG, "onHandleIntent(): " + intent);
+
+        if (intent != null) {
+            final String action = intent.getAction();
+            if (ACTION_REPLY.equals(action)) {
+                handleActionReply(getMessage(intent));
+            }
+        }
+    }
+
+    /**
+     * Handles action for replying to messages from the notification.
+     */
+    private void handleActionReply(CharSequence replyCharSequence) {
+        Log.d(TAG, "handleActionReply(): " + replyCharSequence);
+
+        if (replyCharSequence != null) {
+
+            // TODO: Asynchronously save your message to Database and servers.
+
+            /*
+             * You have two options for updating your notification (this class uses approach #2):
+             *
+             *  1. Use a new NotificationCompatBuilder to create the Notification. This approach
+             *  requires you to get *ALL* the information that existed in the previous
+             *  Notification (and updates) and pass it to the builder. This is the approach used in
+             *  the MainActivity.
+             *
+             *  2. Use the original NotificationCompatBuilder to create the Notification. This
+             *  approach requires you to store a reference to the original builder. The benefit is
+             *  you only need the new/updated information. In our case, the reply from the user
+             *  which we already have here.
+             *
+             *  IMPORTANT NOTE: You shouldn't save/modify the resulting Notification object using
+             *  its member variables and/or legacy APIs. If you want to retain anything from update
+             *  to update, retain the Builder as option 2 outlines.
+             */
+
+            // Retrieves NotificationCompat.Builder used to create initial Notification
+            NotificationCompat.Builder notificationCompatBuilder =
+                    GlobalNotificationBuilder.getNotificationCompatBuilderInstance();
+
+            // Recreate builder from persistent state if app process is killed
+            if (notificationCompatBuilder == null) {
+                // Note: New builder set globally in the method
+                notificationCompatBuilder = recreateBuilderWithMessagingStyle();
+            }
+
+
+            // Since we are adding to the MessagingStyle, we need to first retrieve the
+            // current MessagingStyle from the Notification itself.
+            Notification notification = notificationCompatBuilder.build();
+            MessagingStyle messagingStyle =
+                    NotificationCompat.MessagingStyle
+                            .extractMessagingStyleFromNotification(notification);
+
+            // Add new message to the MessagingStyle
+            messagingStyle.addMessage(replyCharSequence, System.currentTimeMillis(), null);
+
+            // Updates the Notification
+            notification = notificationCompatBuilder
+                    .setStyle(messagingStyle)
+                    .build();
+
+            // Pushes out the updated Notification
+            NotificationManagerCompat notificationManagerCompat =
+                    NotificationManagerCompat.from(getApplicationContext());
+            notificationManagerCompat.notify(StandaloneMainActivity.NOTIFICATION_ID, notification);
+        }
+    }
+
+    /*
+     * Extracts CharSequence created from the RemoteInput associated with the Notification.
+     */
+    private CharSequence getMessage(Intent intent) {
+        Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
+        if (remoteInput != null) {
+            return remoteInput.getCharSequence(EXTRA_REPLY);
+        }
+        return null;
+    }
+
+    /*
+     * This recreates the notification from the persistent state in case the app process was killed.
+     * It is basically the same code for creating the Notification from MainActivity.
+     */
+    private NotificationCompat.Builder recreateBuilderWithMessagingStyle() {
+
+        // Main steps for building a MESSAGING_STYLE notification (for more detailed comments on
+        // building this notification, check StandaloneMainActivity.java)::
+        //      0. Get your data
+        //      1. Build the MESSAGING_STYLE
+        //      2. Add support for Wear 1.+
+        //      3. Set up main Intent for notification
+        //      4. Set up RemoteInput (users can input directly from notification)
+        //      5. Build and issue the notification
+
+        // 0. Get your data (everything unique per Notification)
+        MockDatabase.MessagingStyleCommsAppData messagingStyleCommsAppData =
+                MockDatabase.getMessagingStyleData();
+
+        // 1. Build the Notification.Style (MESSAGING_STYLE)
+        String contentTitle = messagingStyleCommsAppData.getContentTitle();
+
+        MessagingStyle messagingStyle =
+                new NotificationCompat.MessagingStyle(messagingStyleCommsAppData.getReplayName())
+                        .setConversationTitle(contentTitle);
+
+        // Adds all Messages
+        for (MessagingStyle.Message message : messagingStyleCommsAppData.getMessages()) {
+            messagingStyle.addMessage(message);
+        }
+
+
+        // 2. Add support for Wear 1.+.
+        String fullMessageForWearVersion1 = messagingStyleCommsAppData.getFullConversation();
+
+        Notification chatHistoryForWearV1 = new NotificationCompat.Builder(getApplicationContext())
+                .setStyle(new NotificationCompat.BigTextStyle().bigText(fullMessageForWearVersion1))
+                .setContentTitle(contentTitle)
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setContentText(fullMessageForWearVersion1)
+                .build();
+
+        // Adds page with all text to support Wear 1.+.
+        NotificationCompat.WearableExtender wearableExtenderForWearVersion1 =
+                new NotificationCompat.WearableExtender()
+                        .setHintContentIntentLaunchesActivity(true)
+                        .addPage(chatHistoryForWearV1);
+
+        // 3. Set up main Intent for notification
+        Intent notifyIntent = new Intent(this, MessagingMainActivity.class);
+
+        PendingIntent mainPendingIntent =
+                PendingIntent.getActivity(
+                        this,
+                        0,
+                        notifyIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                );
+
+
+        // 4. Set up a RemoteInput Action, so users can input (keyboard, drawing, voice) directly
+        // from the notification without entering the app.
+        String replyLabel = getString(R.string.reply_label);
+        RemoteInput remoteInput = new RemoteInput.Builder(MessagingIntentService.EXTRA_REPLY)
+                .setLabel(replyLabel)
+                .build();
+
+        Intent replyIntent = new Intent(this, MessagingIntentService.class);
+        replyIntent.setAction(MessagingIntentService.ACTION_REPLY);
+        PendingIntent replyActionPendingIntent = PendingIntent.getService(this, 0, replyIntent, 0);
+
+        // Enable action to appear inline on Wear 2.0 (24+). This means it will appear over the
+        // lower portion of the Notification for easy action (only possible for one action).
+        final NotificationCompat.Action.WearableExtender inlineActionForWear2_0 =
+                new NotificationCompat.Action.WearableExtender()
+                        .setHintDisplayActionInline(true)
+                        .setHintLaunchesActivity(false);
+
+        NotificationCompat.Action replyAction =
+                new NotificationCompat.Action.Builder(
+                        R.drawable.ic_reply_white_18dp,
+                        replyLabel,
+                        replyActionPendingIntent)
+                        .addRemoteInput(remoteInput)
+                        // Allows system to generate replies by context of conversation
+                        .setAllowGeneratedReplies(true)
+                        // Add WearableExtender to enable inline actions
+                        .extend(inlineActionForWear2_0)
+                        .build();
+
+
+        // 5. Build and issue the notification
+        NotificationCompat.Builder notificationCompatBuilder =
+                new NotificationCompat.Builder(getApplicationContext());
+
+        GlobalNotificationBuilder.setNotificationCompatBuilderInstance(notificationCompatBuilder);
+
+        // Builds and issues notification
+        notificationCompatBuilder
+                .setStyle(messagingStyle)
+                .setContentTitle(contentTitle)
+                .setContentText(messagingStyleCommsAppData.getContentText())
+                .setSmallIcon(R.drawable.ic_launcher)
+                .setLargeIcon(BitmapFactory.decodeResource(
+                        getResources(),
+                        R.drawable.ic_person_black_48dp))
+                .setContentIntent(mainPendingIntent)
+                .setColor(getResources().getColor(R.color.colorPrimary))
+                .setSubText(Integer.toString(messagingStyleCommsAppData.getNumberOfNewMessages()))
+                .addAction(replyAction)
+                .setCategory(Notification.CATEGORY_MESSAGE)
+                .setPriority(Notification.PRIORITY_HIGH)
+                .setVisibility(Notification.VISIBILITY_PRIVATE)
+                .extend(wearableExtenderForWearVersion1);
+
+        for (String name : messagingStyleCommsAppData.getParticipants()) {
+            notificationCompatBuilder.addPerson(name);
+        }
+
+        return notificationCompatBuilder;
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/MessagingMainActivity.java b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/MessagingMainActivity.java
new file mode 100644
index 000000000..5454c797d
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/handlers/MessagingMainActivity.java
@@ -0,0 +1,47 @@
+/*
+Copyright 2016 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.
+ */
+package com.example.android.wearable.wear.wearnotifications.handlers;
+
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Bundle;
+
+import com.example.android.wearable.wear.wearnotifications.R;
+import com.example.android.wearable.wear.wearnotifications.StandaloneMainActivity;
+
+/**
+ * Template class meant to include functionality for your Messaging App. (This project's main focus
+ * is on Notification Styles.)
+ */
+public class MessagingMainActivity extends Activity {
+
+    private static final String TAG = "MessagingMainActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_messaging_main);
+
+        // Cancel Notification
+        NotificationManager notificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+
+        notificationManager.cancel(StandaloneMainActivity.NOTIFICATION_ID);
+
+        // TODO: Handle and display message/conversation from your database
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/mock/MockDatabase.java b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/mock/MockDatabase.java
new file mode 100644
index 000000000..b552f6d3a
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/src/com.example.android.wearable.wear.wearnotifications/mock/MockDatabase.java
@@ -0,0 +1,400 @@
+package com.example.android.wearable.wear.wearnotifications.mock;
+
+import android.support.v4.app.NotificationCompat.MessagingStyle;
+
+import com.example.android.wearable.wear.wearnotifications.R;
+
+import java.util.ArrayList;
+
+/**
+ * Mock data for each of the Notification Style Demos.
+ */
+public final class MockDatabase {
+
+    public static BigTextStyleReminderAppData getBigTextStyleData() {
+        return BigTextStyleReminderAppData.getInstance();
+    }
+
+    public static BigPictureStyleSocialAppData getBigPictureStyleData() {
+        return BigPictureStyleSocialAppData.getInstance();
+    }
+
+    public static InboxStyleEmailAppData getInboxStyleData() {
+        return InboxStyleEmailAppData.getInstance();
+    }
+
+    public static MessagingStyleCommsAppData getMessagingStyleData() {
+        return MessagingStyleCommsAppData.getInstance();
+    }
+
+    /**
+     * Represents data needed for BigTextStyle Notification.
+     */
+    public static class BigTextStyleReminderAppData {
+
+        private static BigTextStyleReminderAppData sInstance = null;
+
+        // Standard notification values
+        private String mContentTitle;
+        private String mContentText;
+
+        // Style notification values
+        private String mBigContentTitle;
+        private String mBigText;
+        private String mSummaryText;
+
+
+        public static BigTextStyleReminderAppData getInstance() {
+            if (sInstance == null) {
+                sInstance = getSync();
+            }
+
+            return sInstance;
+        }
+
+        private static synchronized BigTextStyleReminderAppData getSync() {
+            if (sInstance == null) {
+                sInstance = new BigTextStyleReminderAppData();
+            }
+
+            return sInstance;
+        }
+
+        private BigTextStyleReminderAppData() {
+            // Standard Notification values
+            // Title for API <16 (4.0 and below) devices
+            mContentTitle = "Don't forget to...";
+            // Content for API <24 (4.0 and below) devices
+            mContentText = "Feed Dogs and check garage!";
+
+            // BigText Style Notification values
+            mBigContentTitle = "Don't forget to...";
+            mBigText = "... feed the dogs before you leave for work, and check the garage to "
+                            + "make sure the door is closed.";
+            mSummaryText = "Dogs and Garage";
+        }
+        public String getContentTitle() {
+            return mContentTitle;
+        }
+
+        public String getContentText() {
+            return mContentText;
+        }
+
+        public String getBigContentTitle() {
+            return mBigContentTitle;
+        }
+
+        public String getBigText() {
+            return mBigText;
+        }
+
+        public String getSummaryText() {
+            return mSummaryText;
+        }
+
+        @Override
+        public String toString() {
+            return getBigContentTitle() + getBigText();
+        }
+    }
+
+    /**
+     * Represents data needed for BigPictureStyle Notification.
+     */
+    public static class BigPictureStyleSocialAppData {
+        private static BigPictureStyleSocialAppData sInstance = null;
+
+        // Standard notification values
+        private String mContentTitle;
+        private String mContentText;
+
+        // Style notification values
+        private int mBigImage;
+        private String mBigContentTitle;
+        private String mSummaryText;
+
+        private CharSequence[] mPossiblePostResponses;
+
+        private ArrayList<String> mParticipants;
+
+
+        public static BigPictureStyleSocialAppData getInstance() {
+            if (sInstance == null) {
+                sInstance = getSync();
+            }
+            return sInstance;
+        }
+
+        private static synchronized BigPictureStyleSocialAppData getSync() {
+            if (sInstance == null) {
+                sInstance = new BigPictureStyleSocialAppData();
+            }
+
+            return sInstance;
+        }
+
+        private BigPictureStyleSocialAppData() {
+            // Standard Notification values
+            // Title/Content for API <16 (4.0 and below) devices
+            mContentTitle = "Bob's Post";
+            mContentText = "[Picture] Like my shot of Earth?";
+
+            // Style notification values
+            mBigImage = R.drawable.earth;
+            mBigContentTitle = "Bob's Post";
+            mSummaryText = "Like my shot of Earth?";
+
+            // This would be possible responses based on the contents of the post
+            mPossiblePostResponses = new CharSequence[]{"Yes", "No", "Maybe?"};
+
+            mParticipants = new ArrayList<>();
+            mParticipants.add("Bob Smith");
+        }
+
+        public String getContentTitle() {
+            return mContentTitle;
+        }
+
+        public String getContentText() {
+            return mContentText;
+        }
+
+        public int getBigImage() {
+            return mBigImage;
+        }
+
+        public String getBigContentTitle() {
+            return mBigContentTitle;
+        }
+
+        public String getSummaryText() {
+            return mSummaryText;
+        }
+
+        public CharSequence[] getPossiblePostResponses() {
+            return mPossiblePostResponses;
+        }
+
+        public ArrayList<String> getParticipants() {
+            return mParticipants;
+        }
+
+        @Override
+        public String toString() {
+            return getContentTitle() + " - " + getContentText();
+        }
+    }
+
+    /**
+     * Represents data needed for InboxStyle Notification.
+     */
+    public static class InboxStyleEmailAppData {
+        private static InboxStyleEmailAppData sInstance = null;
+
+        // Standard notification values
+        private String mContentTitle;
+        private String mContentText;
+        private int mNumberOfNewEmails;
+
+        // Style notification values
+        private String mBigContentTitle;
+        private String mSummaryText;
+        private ArrayList<String> mIndividualEmailSummary;
+
+        private ArrayList<String> mParticipants;
+
+        public static InboxStyleEmailAppData getInstance() {
+            if (sInstance == null) {
+                sInstance = getSync();
+            }
+            return sInstance;
+        }
+
+        private static synchronized InboxStyleEmailAppData getSync() {
+            if (sInstance == null) {
+                sInstance = new InboxStyleEmailAppData();
+            }
+
+            return sInstance;
+        }
+
+        private InboxStyleEmailAppData() {
+            // Standard Notification values
+            // Title/Content for API <16 (4.0 and below) devices
+            mContentTitle = "5 new emails";
+            mContentText = "from Jane, Jay, Alex +2 more";
+            mNumberOfNewEmails = 5;
+
+            // Style notification values
+            mBigContentTitle = "5 new emails from Jane, Jay, Alex +2";
+            mSummaryText = "New emails";
+
+            // Add each summary line of the new emails, you can add up to 5
+            mIndividualEmailSummary = new ArrayList<>();
+            mIndividualEmailSummary.add("Jane Faab  -   Launch Party is here...");
+            mIndividualEmailSummary.add("Jay Walker -   There's a turtle on the server!");
+            mIndividualEmailSummary.add("Alex Chang -   Check this out...");
+            mIndividualEmailSummary.add("Jane Johns -   Check in code?");
+            mIndividualEmailSummary.add("John Smith -   Movies later....");
+
+            // If the phone is in "Do not disturb mode, the user will still be notified if
+            // the user(s) is starred as a favorite.
+            mParticipants = new ArrayList<>();
+            mParticipants.add("Jane Faab");
+            mParticipants.add("Jay Walker");
+            mParticipants.add("Alex Chang");
+            mParticipants.add("Jane Johns");
+            mParticipants.add("John Smith");
+        }
+
+        public String getContentTitle() {
+            return mContentTitle;
+        }
+
+        public String getContentText() {
+            return mContentText;
+        }
+
+        public int getNumberOfNewEmails() {
+            return mNumberOfNewEmails;
+        }
+
+        public String getBigContentTitle() {
+            return mBigContentTitle;
+        }
+
+        public String getSummaryText() {
+            return mSummaryText;
+        }
+
+        public ArrayList<String> getIndividualEmailSummary() {
+            return mIndividualEmailSummary;
+        }
+
+        public ArrayList<String> getParticipants() {
+            return mParticipants;
+        }
+
+        @Override
+        public String toString() {
+            return getContentTitle() + " " + getContentText();
+        }
+    }
+
+    /**
+     * Represents data needed for MessagingStyle Notification.
+     */
+    public static class MessagingStyleCommsAppData {
+
+        private static MessagingStyleCommsAppData sInstance = null;
+
+        // Standard notification values
+        private String mContentTitle;
+        private String mContentText;
+
+        // Style notification values
+        private ArrayList<MessagingStyle.Message> mMessages;
+        // Basically, String of all mMessages
+        private String mFullConversation;
+        // Name preferred when replying to chat
+        private String mReplayName;
+        private int mNumberOfNewMessages;
+        private ArrayList<String> mParticipants;
+
+        public static MessagingStyleCommsAppData getInstance() {
+            if (sInstance == null) {
+                sInstance = getSync();
+            }
+            return sInstance;
+        }
+
+        private static synchronized MessagingStyleCommsAppData getSync() {
+            if (sInstance == null) {
+                sInstance = new MessagingStyleCommsAppData();
+            }
+
+            return sInstance;
+        }
+
+        private MessagingStyleCommsAppData() {
+            // Standard notification values
+            // Content for API <24 (M and below) devices
+            mContentTitle = "2 Messages w/ Famous McFamously";
+            mContentText = "Dude! ... You know I am a Pesce-pescetarian. :P";
+
+            // Style notification values
+
+            // For each message, you need the timestamp, in this case, we are using arbitrary ones.
+            long currentTime = System.currentTimeMillis();
+
+            mMessages = new ArrayList<>();
+            mMessages.add(new MessagingStyle.Message(
+                    "What are you doing tonight?", currentTime - 4000, "Famous"));
+            mMessages.add(new MessagingStyle.Message(
+                    "I don't know, dinner maybe?", currentTime - 3000, null));
+            mMessages.add(new MessagingStyle.Message(
+                    "Sounds good.", currentTime - 2000, "Famous"));
+            mMessages.add(new MessagingStyle.Message(
+                    "How about BBQ?", currentTime - 1000, null));
+            // Last two are the newest message (2) from friend
+            mMessages.add(new MessagingStyle.Message(
+                    "Dude!", currentTime, "Famous"));
+            mMessages.add(new MessagingStyle.Message(
+                    "You know I am a Pesce-pescetarian. :P", currentTime, "Famous"));
+
+
+            // String version of the mMessages above
+            mFullConversation = "Famous: What are you doing tonight?\n\n"
+                    + "Me: I don't know, dinner maybe?\n\n"
+                    + "Famous: Sounds good.\n\n"
+                    + "Me: How about BBQ?\n\n"
+                    + "Famous: Dude!\n\n"
+                    + "Famous: You know I am a Pesce-pescetarian. :P\n\n";
+
+            mNumberOfNewMessages = 2;
+
+            // Name preferred when replying to chat
+            mReplayName = "Me";
+
+            // If the phone is in "Do not disturb mode, the user will still be notified if
+            // the user(s) is starred as a favorite.
+            mParticipants = new ArrayList<>();
+            mParticipants.add("Famous McFamously");
+
+        }
+
+        public String getContentTitle() {
+            return mContentTitle;
+        }
+
+        public String getContentText() {
+            return mContentText;
+        }
+
+        public ArrayList<MessagingStyle.Message> getMessages() {
+            return mMessages;
+        }
+
+        public String getFullConversation() {
+            return mFullConversation;
+        }
+
+        public String getReplayName() {
+            return mReplayName;
+        }
+
+        public int getNumberOfNewMessages() {
+            return mNumberOfNewMessages;
+        }
+
+        public ArrayList<String> getParticipants() {
+            return mParticipants;
+        }
+
+        @Override
+        public String toString() {
+            return getFullConversation();
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/_index.jd b/samples/browseable/WearNotifications/_index.jd
new file mode 100644
index 000000000..1a89c1e82
--- /dev/null
+++ b/samples/browseable/WearNotifications/_index.jd
@@ -0,0 +1,14 @@
+
+page.tags="Wear Notifications"
+sample.group=Wearable
+@jd:body
+
+<p>
+            
+            Sample demonstrates best practices for Notification Styles that support Android
+            phone/tablets and Android Wear. The phone app demonstrates best practices if you do not
+            have a dedicated Android Wear app for Notifications. While the Android Wear app
+            demonstrates best practices for a standalone Wear Notification experience without
+            the Notifications showing on the phone/tablet.
+            
+        </p>
diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template
index d72f3340d..5d623074d 100644
--- a/sdk/build_tools_source.prop_template
+++ b/sdk/build_tools_source.prop_template
@@ -1,4 +1,3 @@
 Pkg.UserSrc=false
-#Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
-Pkg.Revision=24.0.1
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
 
diff --git a/sdk/plat_tools_source.prop_template b/sdk/plat_tools_source.prop_template
index 7912856a7..5d623074d 100644
--- a/sdk/plat_tools_source.prop_template
+++ b/sdk/plat_tools_source.prop_template
@@ -1,3 +1,3 @@
 Pkg.UserSrc=false
-#Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
-Pkg.Revision=24.0.1
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
+
diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template
index 44ace7361..530324627 100644
--- a/sdk/platform_source.prop_template
+++ b/sdk/platform_source.prop_template
@@ -2,7 +2,7 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
 Platform.Version=${PLATFORM_VERSION}
 Platform.CodeName=
-Pkg.Revision=2
+Pkg.Revision=1
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 #AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 Layoutlib.Api=16
diff --git a/sys-img/images_arm64-v8a_source.prop_template b/sys-img/images_arm64-v8a_source.prop_template
index 7c31deff7..1a18cf874 100644
--- a/sys-img/images_arm64-v8a_source.prop_template
+++ b/sys-img/images_arm64-v8a_source.prop_template
@@ -1,6 +1,6 @@
 Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
-Pkg.Revision=4
+Pkg.Revision=1
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 SystemImage.Abi=${TARGET_CPU_ABI}
diff --git a/sys-img/images_armeabi-v7a_source.prop_template b/sys-img/images_armeabi-v7a_source.prop_template
index 36fd33ecd..9c7a332a5 100644
--- a/sys-img/images_armeabi-v7a_source.prop_template
+++ b/sys-img/images_armeabi-v7a_source.prop_template
@@ -1,6 +1,6 @@
 Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
-Pkg.Revision=4
+Pkg.Revision=1
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 SystemImage.Abi=armeabi-v7a
diff --git a/sys-img/images_armeabi_source.prop_template b/sys-img/images_armeabi_source.prop_template
index fec88366a..91e9d212f 100644
--- a/sys-img/images_armeabi_source.prop_template
+++ b/sys-img/images_armeabi_source.prop_template
@@ -1,6 +1,6 @@
 Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
-Pkg.Revision=4
+Pkg.Revision=1
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 SystemImage.Abi=armeabi
diff --git a/sys-img/images_x86_64_source.prop_template b/sys-img/images_x86_64_source.prop_template
index 7c31deff7..1a18cf874 100644
--- a/sys-img/images_x86_64_source.prop_template
+++ b/sys-img/images_x86_64_source.prop_template
@@ -1,6 +1,6 @@
 Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
-Pkg.Revision=4
+Pkg.Revision=1
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 SystemImage.Abi=${TARGET_CPU_ABI}
diff --git a/sys-img/images_x86_source.prop_template b/sys-img/images_x86_source.prop_template
index 7c31deff7..1a18cf874 100644
--- a/sys-img/images_x86_source.prop_template
+++ b/sys-img/images_x86_source.prop_template
@@ -1,6 +1,6 @@
 Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
-Pkg.Revision=4
+Pkg.Revision=1
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 SystemImage.Abi=${TARGET_CPU_ABI}