Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2

Android 7.1.2 Release 2 (N2G47E)

# gpg: Signature made Mon 03 Apr 2017 01:41:41 AM CDT
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key

13 files changed, 248 insertions, 177 deletions

diff --git a/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_n_white_48dp.png b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_n_white_48dp.png
new file mode 100644
index 000000000..33eceae3f
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/drawable-hdpi/ic_n_white_48dp.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
index c52cd05dc..f9de46cc6 100644
--- a/samples/browseable/WearNotifications/Wearable/res/layout/activity_big_picture_main.xml
+++ b/samples/browseable/WearNotifications/Wearable/res/layout/activity_big_picture_main.xml
@@ -1,28 +1,28 @@
 <?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.
--->
+  ~ Copyright 2016 Google Inc.
+  ~
+  ~ 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"
+    android:paddingBottom="@dimen/activity_notification_details_bottom_padding"
+    android:paddingLeft="@dimen/activity_notification_details_right_padding"
+    android:paddingRight="@dimen/activity_notification_details_left_padding"
+    android:paddingTop="@dimen/activity_notification_details_top_padding"
     tools:context=".handlers.BigPictureSocialMainActivity">
 
     <TextView
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
index 946942682..29d9ba6e4 100644
--- a/samples/browseable/WearNotifications/Wearable/res/layout/activity_big_text_main.xml
+++ b/samples/browseable/WearNotifications/Wearable/res/layout/activity_big_text_main.xml
@@ -1,28 +1,28 @@
 <?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.
--->
+  ~ Copyright 2016 Google Inc.
+  ~
+  ~ 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"
+    android:paddingBottom="@dimen/activity_notification_details_bottom_padding"
+    android:paddingLeft="@dimen/activity_notification_details_right_padding"
+    android:paddingRight="@dimen/activity_notification_details_left_padding"
+    android:paddingTop="@dimen/activity_notification_details_top_padding"
     tools:context=".handlers.BigTextMainActivity">
 
     <TextView
diff --git a/samples/browseable/WearNotifications/Wearable/res/layout/activity_inbox_main.xml b/samples/browseable/WearNotifications/Wearable/res/layout/activity_inbox_main.xml
index 3123ecba8..0925af569 100644
--- a/samples/browseable/WearNotifications/Wearable/res/layout/activity_inbox_main.xml
+++ b/samples/browseable/WearNotifications/Wearable/res/layout/activity_inbox_main.xml
@@ -1,28 +1,28 @@
 <?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.
--->
+  ~ Copyright 2016 Google Inc.
+  ~
+  ~ 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"
+    android:paddingBottom="@dimen/activity_notification_details_bottom_padding"
+    android:paddingLeft="@dimen/activity_notification_details_right_padding"
+    android:paddingRight="@dimen/activity_notification_details_left_padding"
+    android:paddingTop="@dimen/activity_notification_details_top_padding"
     tools:context=".handlers.InboxMainActivity">
 
     <TextView
diff --git a/samples/browseable/WearNotifications/Wearable/res/layout/activity_main.xml b/samples/browseable/WearNotifications/Wearable/res/layout/activity_main.xml
index 467b461c9..5dc46fdd4 100644
--- a/samples/browseable/WearNotifications/Wearable/res/layout/activity_main.xml
+++ b/samples/browseable/WearNotifications/Wearable/res/layout/activity_main.xml
@@ -1,53 +1,40 @@
 <?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
+  ~ Copyright 2016 Google Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/mainRelativeLayout"
+    android:id="@+id/mainFrameLayout"
     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.support.wearable.view.WearableRecyclerView
+        android:id="@+id/recycler_view"
         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"
-    -->
+        android:layout_height="match_parent"
+        android:scrollbars="vertical" />
 
-    <Spinner
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/spinner"
-        android:layout_below="@+id/spinnerHeadertextView"/>
-
-    <Button
+    <TextView
+        android:id="@+id/header_text_view"
         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
+        android:textAlignment="center"
+        android:paddingTop="@dimen/activity_main_text_header_spacing"
+        android:paddingBottom="@dimen/activity_main_text_header_spacing"
+        android:background="@color/grey"
+        android:text="@string/floating_text"/>
+</FrameLayout>
\ 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
index 0a710d0dd..f33696576 100644
--- a/samples/browseable/WearNotifications/Wearable/res/layout/activity_messaging_main.xml
+++ b/samples/browseable/WearNotifications/Wearable/res/layout/activity_messaging_main.xml
@@ -1,28 +1,28 @@
 <?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.
--->
+  ~ Copyright 2016 Google Inc.
+  ~
+  ~ 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"
+    android:paddingBottom="@dimen/activity_notification_details_bottom_padding"
+    android:paddingLeft="@dimen/activity_notification_details_right_padding"
+    android:paddingRight="@dimen/activity_notification_details_left_padding"
+    android:paddingTop="@dimen/activity_notification_details_top_padding"
     tools:context=".handlers.MessagingMainActivity">
 
     <TextView
diff --git a/samples/browseable/WearNotifications/Wearable/res/layout/recycler_row_item.xml b/samples/browseable/WearNotifications/Wearable/res/layout/recycler_row_item.xml
new file mode 100644
index 000000000..60c577ed0
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/layout/recycler_row_item.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Google Inc.
+  ~
+  ~ 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:layout_gravity="center"
+    android:paddingTop="@dimen/recycler_row_padding"
+    android:paddingBottom="@dimen/recycler_row_padding"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:src="@drawable/ic_n_white_48dp"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:textSize="@dimen/recycler_row_text_size"
+        android:id="@+id/textView"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/res/values-round/dimens.xml b/samples/browseable/WearNotifications/Wearable/res/values-round/dimens.xml
index 0bfb8a0d8..d7a0e57e2 100644
--- a/samples/browseable/WearNotifications/Wearable/res/values-round/dimens.xml
+++ b/samples/browseable/WearNotifications/Wearable/res/values-round/dimens.xml
@@ -1,22 +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.
--->
+  ~ Copyright 2016 Google Inc.
+  ~
+  ~ 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>
+    <dimen name="recycler_row_text_size">20sp</dimen>
+
+    <dimen name="activity_notification_details_top_padding">36dp</dimen>
+    <dimen name="activity_notification_details_bottom_padding">22dp</dimen>
+    <dimen name="activity_notification_details_right_padding">36dp</dimen>
+    <dimen name="activity_notification_details_left_padding">22dp</dimen>
 </resources>
diff --git a/samples/browseable/WearNotifications/Wearable/res/values-round/strings.xml b/samples/browseable/WearNotifications/Wearable/res/values-round/strings.xml
new file mode 100644
index 000000000..b8eb69e45
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/values-round/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Google Inc.
+  ~
+  ~ 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="floating_text">Pick\nNotification Style</string>
+</resources>
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/res/values/colors.xml b/samples/browseable/WearNotifications/Wearable/res/values/colors.xml
index 752b74fc3..e1632c558 100644
--- a/samples/browseable/WearNotifications/Wearable/res/values/colors.xml
+++ b/samples/browseable/WearNotifications/Wearable/res/values/colors.xml
@@ -1,19 +1,19 @@
 <?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.
--->
+  ~ Copyright 2016 Google Inc.
+  ~
+  ~ 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>
diff --git a/samples/browseable/WearNotifications/Wearable/res/values/dimens.xml b/samples/browseable/WearNotifications/Wearable/res/values/dimens.xml
index 05a0801db..e6d1996ea 100644
--- a/samples/browseable/WearNotifications/Wearable/res/values/dimens.xml
+++ b/samples/browseable/WearNotifications/Wearable/res/values/dimens.xml
@@ -1,22 +1,27 @@
 <?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
+  ~ Copyright 2016 Google Inc.
+  ~
+  ~ 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_main_text_header_spacing">5dp</dimen>
 
-     http://www.apache.org/licenses/LICENSE-2.0
+    <dimen name="recycler_row_padding">5dp</dimen>
+    <dimen name="recycler_row_text_size">14sp</dimen>
 
- 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>
+    <dimen name="activity_notification_details_top_padding">5dp</dimen>
+    <dimen name="activity_notification_details_bottom_padding">5dp</dimen>
+    <dimen name="activity_notification_details_right_padding">5dp</dimen>
+    <dimen name="activity_notification_details_left_padding">5dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/res/values/strings.xml b/samples/browseable/WearNotifications/Wearable/res/values/strings.xml
index ee3edc2d0..8ea45fead 100644
--- a/samples/browseable/WearNotifications/Wearable/res/values/strings.xml
+++ b/samples/browseable/WearNotifications/Wearable/res/values/strings.xml
@@ -1,18 +1,19 @@
+<?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.
--->
+  ~ Copyright 2016 Google Inc.
+  ~
+  ~ 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>
 
@@ -40,5 +41,6 @@
         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>
+    <string name="floating_text">Pick Notification Style</string>
 
 </resources>
\ No newline at end of file
diff --git a/samples/browseable/WearNotifications/Wearable/res/values/styles.xml b/samples/browseable/WearNotifications/Wearable/res/values/styles.xml
new file mode 100644
index 000000000..1d68f7309
--- /dev/null
+++ b/samples/browseable/WearNotifications/Wearable/res/values/styles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Google Inc.
+  ~
+  ~ 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.NoActionBar" />
+</resources>
\ No newline at end of file