aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Walker <jewalker@google.com>2016-09-27 16:44:09 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-27 16:44:09 +0000
commit8b5452e976755bcda205aa6981cb673577b8437e (patch)
tree061b46be6cd00aade42f1adccc5b1ab6c2960285
parentf6c100f86341db7b6436ab16ebf01ec1523bb58c (diff)
parent226e7796e147b2fce7e8d82e0c93a67e58222be2 (diff)
downloadandroid-8b5452e976755bcda205aa6981cb673577b8437e.tar.gz
Add sample project description and screenshots. am: 8e7fe174a6
am: 226e7796e1 Change-Id: Ib1d25d0708101b9ca86f5bb55c21aaf7fb740c7f
-rw-r--r--wearable/wear/WearNotifications/Application/src/main/AndroidManifest.xml2
-rw-r--r--wearable/wear/WearNotifications/Application/src/main/res/values/styles.xml4
-rw-r--r--wearable/wear/WearNotifications/screenshots/icon-web.pngbin0 -> 2153 bytes
-rw-r--r--wearable/wear/WearNotifications/screenshots/mobile-1.pngbin0 -> 68488 bytes
-rw-r--r--wearable/wear/WearNotifications/screenshots/mobile-2.pngbin0 -> 149645 bytes
-rw-r--r--wearable/wear/WearNotifications/screenshots/wear-1.pngbin0 -> 22695 bytes
-rw-r--r--wearable/wear/WearNotifications/screenshots/wear-2.pngbin0 -> 13934 bytes
-rw-r--r--wearable/wear/WearNotifications/template-params.xml67
8 files changed, 53 insertions, 20 deletions
diff --git a/wearable/wear/WearNotifications/Application/src/main/AndroidManifest.xml b/wearable/wear/WearNotifications/Application/src/main/AndroidManifest.xml
index f6d0db80..20c44cc1 100644
--- a/wearable/wear/WearNotifications/Application/src/main/AndroidManifest.xml
+++ b/wearable/wear/WearNotifications/Application/src/main/AndroidManifest.xml
@@ -24,7 +24,7 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppThemeOverride">
<activity android:name=".MainActivity">
<intent-filter>
diff --git a/wearable/wear/WearNotifications/Application/src/main/res/values/styles.xml b/wearable/wear/WearNotifications/Application/src/main/res/values/styles.xml
index 5fff39c0..6ea59e04 100644
--- a/wearable/wear/WearNotifications/Application/src/main/res/values/styles.xml
+++ b/wearable/wear/WearNotifications/Application/src/main/res/values/styles.xml
@@ -16,8 +16,6 @@
-->
<resources>
-<!--
-TODO: Fix in template
--->
+ <style name="AppThemeOverride" parent="Theme.AppCompat.Light" />
</resources> \ No newline at end of file
diff --git a/wearable/wear/WearNotifications/screenshots/icon-web.png b/wearable/wear/WearNotifications/screenshots/icon-web.png
new file mode 100644
index 00000000..77c9929c
--- /dev/null
+++ b/wearable/wear/WearNotifications/screenshots/icon-web.png
Binary files differ
diff --git a/wearable/wear/WearNotifications/screenshots/mobile-1.png b/wearable/wear/WearNotifications/screenshots/mobile-1.png
new file mode 100644
index 00000000..0adca49d
--- /dev/null
+++ b/wearable/wear/WearNotifications/screenshots/mobile-1.png
Binary files differ
diff --git a/wearable/wear/WearNotifications/screenshots/mobile-2.png b/wearable/wear/WearNotifications/screenshots/mobile-2.png
new file mode 100644
index 00000000..6573f516
--- /dev/null
+++ b/wearable/wear/WearNotifications/screenshots/mobile-2.png
Binary files differ
diff --git a/wearable/wear/WearNotifications/screenshots/wear-1.png b/wearable/wear/WearNotifications/screenshots/wear-1.png
new file mode 100644
index 00000000..eaf38d15
--- /dev/null
+++ b/wearable/wear/WearNotifications/screenshots/wear-1.png
Binary files differ
diff --git a/wearable/wear/WearNotifications/screenshots/wear-2.png b/wearable/wear/WearNotifications/screenshots/wear-2.png
new file mode 100644
index 00000000..74946d51
--- /dev/null
+++ b/wearable/wear/WearNotifications/screenshots/wear-2.png
Binary files differ
diff --git a/wearable/wear/WearNotifications/template-params.xml b/wearable/wear/WearNotifications/template-params.xml
index e7e496de..e5f64dfb 100644
--- a/wearable/wear/WearNotifications/template-params.xml
+++ b/wearable/wear/WearNotifications/template-params.xml
@@ -33,11 +33,7 @@
<dependency_wearable>com.android.support:appcompat-v7:24.0.0</dependency_wearable>
<dependency_wearable>com.android.support:design:24.0.0</dependency_wearable>
-
-
-
<provided_dependency_wearable>com.google.android.wearable:wearable:1.0.0</provided_dependency_wearable>
-
<preview_wearable_support_dependency>com.google.android.support:wearable:2.0.0-alpha3</preview_wearable_support_dependency>
@@ -61,7 +57,7 @@
<metadata>
<!-- Values: {DRAFT | PUBLISHED | INTERNAL | DEPRECATED | SUPERCEDED} -->
- <status>DRAFT</status>
+ <status>PUBLISHED</status>
<!-- See http://go/sample-categories for details on the next 4 fields. -->
<!-- Most samples just need to udpate the Categories field. This is a comma-
seperated list of topic tags. Unlike the old category system, samples
@@ -89,8 +85,10 @@
<icon>screenshots/icon-web.png</icon>
<!-- Path to screenshots. Use <img> tags for each. -->
<screenshots>
- <img>screenshots/1-main.png</img>
- <img>screenshots/2-settings.png</img>
+ <img>screenshots/mobile-1.png</img>
+ <img>screenshots/mobile-2.png</img>
+ <img>screenshots/wear-1.png</img>
+ <img>screenshots/wear-2.png</img>
</screenshots>
<!-- List of APIs that this sample should be cross-referenced under. Use <android>
for fully-qualified Framework class names ("android:" namespace).
@@ -98,7 +96,16 @@
Use <ext> for custom namespaces, if needed. See "Samples Index API" documentation
for more details. -->
<api_refs>
- <android>android.app.ActionBar</android>
+ <android>android.app.Notification</android>
+ <android>android.support.v4.app.NotificationCompat.BigPictureStyle</android>
+ <android>android.support.v4.app.NotificationCompat.BigTextStyle</android>
+ <android>android.support.v4.app.NotificationCompat.InboxStyle</android>
+ <android>android.support.v4.app.NotificationCompat.MessagingStyle</android>
+ <android>android.support.v4.app.NotificationManagerCompat</android>
+ <android>android.support.v4.app.RemoteInput</android>
+ <android>android.support.v4.app.TaskStackBuilder</android>
+ <android>android.support.v7.app.AppCompatActivity</android>
+ <android>android.support.v7.app.NotificationCompat</android>
</api_refs>
<!-- 1-3 line description of the sample here.
@@ -106,21 +113,49 @@
Avoid simply rearranging the sample's title. What does this sample actually
accomplish, and how does it do it? -->
<description>
- Sample demonstrates Notification Styles (Inbox, BigPicture, BigText, and Messaging)
- examples and best practices for those Notifications.
+ Sample demonstrates best practices for using NotificationStyle Notifications (Inbox,
+ BigPicture, BigText, and Messaging) for both Mobile apps and native/local Android Wear
+ apps. It also covers Notifications on Wear 1.+ and Wear 2.0.
</description>
<!-- Multi-paragraph introduction to sample, from an educational point-of-view.
Makrdown formatting allowed. This will be used to generate a mini-article for the
sample on DAC. -->
<intro>
- TODO (jewalker): Finish long intro breaking out phone app vs wear app..
+ Steps for trying out the sample:
+ * Compile and install the mobile app onto your mobile device or emulator (for mobile
+ scenario).
+ * Compile and install the wearable app onto your Wear device or emulator (for Wear
+ scenario).
+
+ This sample demonstrate best practices for using [NotificationStyle][1]
+ [Notifications][2] for two scenarios:
+
+ 1. Launching Notifications from a Mobile app WITHOUT a native Android Wear app.
+ Notifications appear both on mobile and Wear (bridged to appear like a local/native
+ Wear app).
+
+ 2. Launching Notifications from a Native/Local Android Wear app. Notifications only
+ appear on Wear device.
+
+ The Mobile and Wear apps demonstrate [BigTextStyle][3], [BigPictureStyle][4],
+ [InboxStyle][5], and [MessagingStyle][6] Notifications.
+
+ Although there are two apps (Mobile and Wear) running, each should be looked at as a
+ separate experience. That is, neither app uses nor relies on the other.
+
+ They are packaged together simply to show both scenarios in one easy sample.
+
+ Both apps also cover the Notifications being displayed on Wear 1.+ and/or Wear 2.0 and
+ using some of the new features of Wear 2.0 (inline actions).
- Multi-paragraph introduction to sample, from an educational point-of-view.
- *Markdown* formatting allowed. See [Markdown Documentation][1]
- for details.
+ [1]: https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Style.html
+ [2]: https://developer.android.com/reference/android/support/v4/app/NotificationCompat.html
+ [3]: https://developer.android.com/reference/android/support/v4/app/NotificationCompat.BigTextStyle.html
+ [4]: https://developer.android.com/reference/android/support/v4/app/NotificationCompat.BigPictureStyle.html
+ [5]: https://developer.android.com/reference/android/support/v4/app/NotificationCompat.InboxStyle.html
+ [6]: https://developer.android.com/reference/android/support/v4/app/NotificationCompat.MessagingStyle.html
- [1]: http://daringfireball.net/projects/markdown/syntax
</intro>
</metadata>
-</sample>
+</sample> \ No newline at end of file