diff --git a/docs/html/wear/preview/features/complications.jd b/docs/html/wear/preview/features/complications.jd index 155f7335e8ef6..a0157de10ffea 100644 --- a/docs/html/wear/preview/features/complications.jd +++ b/docs/html/wear/preview/features/complications.jd @@ -1,46 +1,52 @@ page.title=Watch Face Complications meta.keywords="wear-preview" page.tags="wear-preview" -page.image=images/cards/card-n-sdk_2x.png - +page.image=/wear/preview/images/complications-main-image.png @jd:body
-
    +

    In this document

    +
    1. - Adding Complications to a Watch Face + Adding + Complications to a Watch Face
    2. - Exposing Data to Complications + Exposing Data to + Complications
    3. - Using Complication Types + Using Complication Types
    4. - Using Fields for Complication Data + Using Fields for + Complication Data
    5. - API Additions + API Additions
      6. -
    +
+

See Also

+
    +
  1. Watch + Face sample app with complications
    2. +

- A complication is a feature of a watch face beyond hours and - minutes. For example, a battery indicator is a complication. + A complication is any feature in a watch face that displays more than hours and + minutes. For example, a battery indicator is a complication. The + Complications API is for both watch faces and data provider apps.

-

- The Complications API is for both watch faces and data provider apps. -

+
+ Complications +

Watch faces can display extra information without needing code for @@ -49,6 +55,36 @@ page.image=images/cards/card-n-sdk_2x.png API.

+

+ Along with reviewing this page, download the Android Wear 2.0 Preview + Reference (see the Complications API additions) and review the Javadoc for complications. +

+ +

+ Apps that provide data to watch faces for complications are called + "complication data providers." These apps are not responsible for controlling + how their data is rendered on the watch face. + This allows a watch face to integrate the data naturally with the + watch face design. + The consuming watch faces are responsible for drawing + the complications. +

+ +

+ Watch faces can receive complication data of + various types (e.g. small text + data or icon data) and then display it. +

+ +

+ As indicated in the diagram below, Android Wear mediates the flow of data + from providers to watch faces. +

+ + + +

For creating or modifying watch faces, see Adding complications to a watch @@ -60,33 +96,6 @@ page.image=images/cards/card-n-sdk_2x.png "#exposing_data_to_complications">Exposing data to complications.

-

- Along with reviewing this page, download the Android Wear 2.0 Preview - Reference and review the API additions in - the Javadoc for complications. -

- -

- Apps that provide data to watch faces for complications are called - "complication data providers." These apps lack control over how their - data is rendered. The consuming watch faces are responsible for drawing - the complications. -

- -

- As indicated in the diagram below, Android Wear mediates the flow of data - from providers to watch faces. -

- - Complications data flow - -

- Through this process, watch faces can receive complication data of - various types (e.g. small text - data or icon data) and then display it. -

-

Adding Complications to a Watch Face

@@ -205,15 +214,17 @@ android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST

The service's manifest entry should also include an android:icon attribute. The provided icon should be a - single-color white icon. This icon should represent the provider and will - be shown in the provider chooser. + single-color white icon. Vector drawables are recommended for the icons. + An icon should represent the provider and will be shown in the provider + chooser.

Include metadata to specify the supported types, update period, and configuration action, if required; for details, download the Android Wear 2.0 Preview Reference and see the keys listed for the - ComplicationProviderService class (in the Javadoc). + ComplicationProviderService class (in the Javadoc; see + API Additions).

@@ -266,11 +277,7 @@ android.support.wearable.complications.UPDATE_PERIOD_SECONDS

Then create the configuration activity with an intent filter for that action. The configuration activity must reside in the same package as the - provider. -

- -

- The configuration activity must return RESULT_OK or + provider. The configuration activity must return RESULT_OK or RESULT_CANCELED, to tell the system whether the provider should be set.

@@ -281,14 +288,15 @@ android.support.wearable.complications.UPDATE_PERIOD_SECONDS

- For details, download the Android Wear 2.0 Preview Reference, containing - the Javadoc, and see the following in the - ComplicationProviderService class: + For details, download the Android Wear 2.0 Preview Reference (see + API Additions), containing the Javadoc, and + see the following in the ComplicationProviderService class: 

 METADATA_KEY_PROVIDER_CONFIG_ACTION
-
+ +

Using Complication Types

@@ -340,6 +348,16 @@ METADATA_KEY_PROVIDER_CONFIG_ACTION gauges can be shown without including text.

+

+ Examples of Complication Types +

+ +

+ The following shows examples of complication types: +

+ + +

Types and fields @@ -352,16 +370,16 @@ METADATA_KEY_PROVIDER_CONFIG_ACTION - - - - @@ -374,7 +392,8 @@ METADATA_KEY_PROVIDER_CONFIG_ACTION Short text - - - - - - - - - - - - - - + + + + + + + + + + + + + +
+ Type + Required fields + Optional fields + Notes
- IconShort title + Icon
+ Short title 		Exactly one of Icon/Short title is expected to be shown if either or @@ -382,37 +401,6 @@ METADATA_KEY_PROVIDER_CONFIG_ACTION
- LONG_TEXT - - Long text - - Long titleIcon*Small image - - Title is expected to be shown if provided. -
- RANGED_VALUE - - ValueMin valueMax value - - IconShort textShort title - - Optional fields are not guaranteed to be displayed. Uses include for - numerical data within bounds, such as for a percentage. -
ICON @@ -428,6 +416,42 @@ METADATA_KEY_PROVIDER_CONFIG_ACTION
+ RANGED_VALUE + + Value
+ Min value
+ Max value + 		+ Icon
+ Short text
+ Short title + 		+ Optional fields are not guaranteed to be displayed. +
+ LONG_TEXT + + Long text + + Long title
+ Icon
+ Small image + 		+ Title is expected to be shown if provided. +
SMALL_IMAGE @@ -467,16 +491,16 @@ METADATA_KEY_PROVIDER_CONFIG_ACTION - - - - @@ -514,16 +538,6 @@ METADATA_KEY_PROVIDER_CONFIG_ACTION
+ Type + Required fields + Optional fields + Notes
-

- Examples of Complication Types -

-

- The following shows examples of complication types: -

- - Complication types -

Using Fields for Complication Data

@@ -543,10 +557,10 @@ METADATA_KEY_PROVIDER_CONFIG_ACTION - - @@ -561,13 +575,23 @@ METADATA_KEY_PROVIDER_CONFIG_ACTION + + + + + @@ -586,7 +610,7 @@ METADATA_KEY_PROVIDER_CONFIG_ACTION Long title @@ -596,7 +620,7 @@ METADATA_KEY_PROVIDER_CONFIG_ACTION Value @@ -608,7 +632,7 @@ METADATA_KEY_PROVIDER_CONFIG_ACTION @@ -619,28 +643,18 @@ METADATA_KEY_PROVIDER_CONFIG_ACTION - - - - - @@ -649,7 +663,7 @@ METADATA_KEY_PROVIDER_CONFIG_ACTION Large image @@ -681,8 +695,10 @@ METADATA_KEY_PROVIDER_CONFIG_ACTION

- The Complications API includes the following new classes in the Wearable - Support Library: + The Complications API includes new classes in the Wearable Support + Library. For more information, download the + Android Wear 2.0 Preview Reference.

    diff --git a/docs/html/wear/preview/images/complication-type-exs.png b/docs/html/wear/preview/images/complication-type-exs.png index d6fe8908d025a..6e2287c11a0fb 100644 Binary files a/docs/html/wear/preview/images/complication-type-exs.png and b/docs/html/wear/preview/images/complication-type-exs.png differ diff --git a/docs/html/wear/preview/images/complications-data-flow.png b/docs/html/wear/preview/images/complications-data-flow.png index 7fa43f2704ffa..2415535b6f171 100644 Binary files a/docs/html/wear/preview/images/complications-data-flow.png and b/docs/html/wear/preview/images/complications-data-flow.png differ diff --git a/docs/html/wear/preview/images/complications-main-image.png b/docs/html/wear/preview/images/complications-main-image.png new file mode 100644 index 0000000000000..dd37b25a289a9 Binary files /dev/null and b/docs/html/wear/preview/images/complications-main-image.png differ diff --git a/docs/html/wear/preview/program.jd b/docs/html/wear/preview/program.jd index 49a5d011cf82a..a130663f6f917 100644 --- a/docs/html/wear/preview/program.jd +++ b/docs/html/wear/preview/program.jd @@ -35,7 +35,7 @@ page.image=images/cards/card-n-sdk_2x.png

    - We’ll provide monthly updates during the preview, so you'll be + We'll provide frequent updates during the preview, so you'll be testing against the latest platform changes.

    @@ -126,7 +126,7 @@ page.image=images/cards/card-n-sdk_2x.png

    The first three milestones provide an early test and development - environment to helps you identify compatibility issues in your current + environment to help you identify compatibility issues in your current apps and plan migration or feature work needed to target the new platform. This is the priority period in which to give us your feedback on features and APIs and file compatibility issues — for all of these,

+ Field + Description
+ Icon + + A single-color image representing the data or the source of the data. + Must be tintable. Vector drawables are recommended for this field. +
Short title - Descriptive field for small complications.Should not exceed 7 - characters.May only be meaningful in combination with Short + Descriptive field for small complications. Should not exceed 7 + characters. May only be meaningful in combination with Short text.
- Descriptive field for large, text-based complications.May only be + Descriptive field for large, text-based complications. May only be meaningful in combination with Long text.
- A numerical (float) representation of the data.Expected to be + A numerical (float) representation of the data. Expected to be depicted relative to the bounds the Min value and Max value fields (but not required to be between those bounds). The lower bound for the range within which Value should be - depicted.Only meaningful in combination with Value and + depicted. Only meaningful in combination with Value and Max value.
The upper bound for the range within which value should be - depicted.Only meaningful in combination with Value and + depicted. Only meaningful in combination with Value and Min value.
- Icon - - A single-color image representing the data or the source of the - data.Must be tintable. -
Small image - A small image to represent the data or the source of the data.May be - full color.Not expected to fill the entire watch face. + A small image to represent the data or the source of the data. May be + full color. Not expected to fill the entire watch face.
- An image with sufficient resolution to fill the watch face.May be + An image with sufficient resolution to fill the watch face. May be full color.