Merge "Updates read me to focus more on teaching Wear 2.0 analog watch face." into oc-dev

2 files changed, 29 insertions, 8 deletions

diff --git a/wearable/wear/WatchFace/screenshots/analog-watch-side-config-all.png b/wearable/wear/WatchFace/screenshots/analog-watch-side-config-all.png
new file mode 100644
index 00000000..a8df49b6
--- /dev/null
+++ b/wearable/wear/WatchFace/screenshots/analog-watch-side-config-all.png
diff --git a/wearable/wear/WatchFace/template-params.xml b/wearable/wear/WatchFace/template-params.xml
index 5644c526..b95995c6 100644
--- a/wearable/wear/WatchFace/template-params.xml
+++ b/wearable/wear/WatchFace/template-params.xml
@@ -56,6 +56,7 @@ Wear 2.0 watch faces.
         <icon>screenshots/icon-web.png</icon>
         <screenshots>
             <img>screenshots/analog-face.png</img>
+            <img>screenshots/analog-watch-side-config-all.png</img>
             <img>screenshots/analog-watch-side-config-1.png</img>
             <img>screenshots/analog-watch-side-config-2.png</img>
             <img>screenshots/digital-face.png</img>
@@ -86,14 +87,34 @@ Wear 2.0 watch faces.
 
         <intro>
 <![CDATA[
-This sample demonstrates how to create watch faces for android wear and includes a phone app
-and a wearable app. The wearable app has a variety of watch faces including analog, digital,
-opengl, interactive, etc. It also includes a watch-side configuration example.
-The phone app includes a phone-side configuration example.
-
-The analog watch face demonstrates best practices for using complications in Wear 2.0. It also
-includes a configuration Activity for configuring the watch face styles and complications. We
-recommend you follow this UX pattern for your own watch faces.
+This sample demonstrates how to create watch faces for Android Wear.
+
+The analog watch face covers best practices for Wear 2.0 including complications and a new
+configuration Activity for configuring both the watch face styles and the complications themselves.
+We recommend you reuse the configuration code and follow the UX patterns in your watch face's
+configuration activity. You can see a preview in the screenshots section of the README.
+
+The analog watch face has three main classes:
+
+- AnalogComplicationWatchFaceService.java (watchface folder) - Renders the watch face and active
+complications.
+
+- AnalogComplicationConfigActivity.java (config folder) - Allows user to adjust watch face settings
+(arm and background colors) and watch face complications.
+
+- AnalogComplicationConfigData.java (models folder) - Populates the configuration screen in the
+previous step by returning a list of items. Each item represents something you can customize on the
+watch face. Items include a preview of the watch face (where you can pick your complications),
+marker color, background color, unread notifications, and background image complication. You can
+extend this and add your own.
+
+
+We include several older watch faces to show best practices for Wear 1.0. If you are targeting
+older devices, you may want to review those watch faces (digital, opengl, and interactive).
+
+The digital watch face includes a watch-side and phone-side configuration example.
+
+This sample includes both a phone app and a wearable app.
 
 Because watch face apps do not have a default Activity in their project, you will need to set your
 Configurations to "Do not launch Activity" for both the Wear and Application modules. If you are