XYZ Tourist Attractions sample - update for wearable support lib 1.2.0
Change-Id: I7e7f37d52a61d09364536a200b51b3f005619b4d
diff --git a/wearable/wear/XYZTouristAttractions/Application/src/main/AndroidManifest.xml b/wearable/wear/XYZTouristAttractions/Application/src/main/AndroidManifest.xml
index 5f330d5..76f0198 100644
--- a/wearable/wear/XYZTouristAttractions/Application/src/main/AndroidManifest.xml
+++ b/wearable/wear/XYZTouristAttractions/Application/src/main/AndroidManifest.xml
@@ -58,6 +58,10 @@
<meta-data android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
+ <meta-data
+ android:name="com.example.android.xyztouristattractions.config.GlideConfiguration"
+ android:value="GlideModule"/>
+
</application>
</manifest>
diff --git a/wearable/wear/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/config/GlideConfiguration.java b/wearable/wear/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/config/GlideConfiguration.java
new file mode 100644
index 0000000..77d6fc8
--- /dev/null
+++ b/wearable/wear/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/config/GlideConfiguration.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 Google Inc. All rights reserved.
+ *
+ * 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.xyztouristattractions.config;
+
+import android.content.Context;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.GlideBuilder;
+import com.bumptech.glide.load.DecodeFormat;
+import com.bumptech.glide.module.GlideModule;
+
+/**
+ * This allows global overriding of some default Glide configuration values.
+ * For additional information see the Glide docs:
+ * https://github.com/bumptech/glide/wiki/Configuration
+ */
+public class GlideConfiguration implements GlideModule {
+ @Override
+ public void applyOptions(Context context, GlideBuilder builder) {
+ // Set Glide decode format to the higher quality ARGB_8888 format
+ builder.setDecodeFormat(DecodeFormat.PREFER_ARGB_8888);
+ }
+
+ @Override
+ public void registerComponents(Context context, Glide glide) {
+
+ }
+}
diff --git a/wearable/wear/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/AttractionListActivity.java b/wearable/wear/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/AttractionListActivity.java
index 8d43112..8d2908c 100644
--- a/wearable/wear/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/AttractionListActivity.java
+++ b/wearable/wear/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/AttractionListActivity.java
@@ -16,9 +16,9 @@
package com.example.android.xyztouristattractions.ui;
-import android.app.AlertDialog;
import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.Toast;
@@ -31,7 +31,7 @@
* The main tourist attraction activity screen which contains a list of
* attractions sorted by distance.
*/
-public class AttractionListActivity extends ActionBarActivity {
+public class AttractionListActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/wearable/wear/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/DetailActivity.java b/wearable/wear/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/DetailActivity.java
index a83f480..3950785 100644
--- a/wearable/wear/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/DetailActivity.java
+++ b/wearable/wear/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/ui/DetailActivity.java
@@ -24,7 +24,7 @@
import android.os.Bundle;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.view.View;
import com.example.android.xyztouristattractions.R;
@@ -33,7 +33,7 @@
* The tourist attraction detail activity screen which contains the details of
* a single attraction.
*/
-public class DetailActivity extends ActionBarActivity {
+public class DetailActivity extends AppCompatActivity {
private static final String EXTRA_ATTRACTION = "attraction";
diff --git a/wearable/wear/XYZTouristAttractions/Application/src/main/res/values/colors.xml b/wearable/wear/XYZTouristAttractions/Application/src/main/res/values/colors.xml
index 142f548..2c16a5d 100644
--- a/wearable/wear/XYZTouristAttractions/Application/src/main/res/values/colors.xml
+++ b/wearable/wear/XYZTouristAttractions/Application/src/main/res/values/colors.xml
@@ -17,10 +17,6 @@
<resources>
- <color name="colorPrimary">#4e6cef</color>
- <color name="colorPrimaryDark">#2a36b1</color>
- <color name="colorAccent">#ff7043</color>
-
<color name="text_background">#90000000</color>
<color name="transparent_actionbar_background">#22000000</color>
<color name="lighter_gray">#ddd</color>
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/color/action_color.xml b/wearable/wear/XYZTouristAttractions/Shared/src/main/res/values/colors.xml
similarity index 73%
rename from wearable/wear/XYZTouristAttractions/Wearable/src/main/res/color/action_color.xml
rename to wearable/wear/XYZTouristAttractions/Shared/src/main/res/values/colors.xml
index 634d806..73c2b6c 100644
--- a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/color/action_color.xml
+++ b/wearable/wear/XYZTouristAttractions/Shared/src/main/res/values/colors.xml
@@ -15,11 +15,10 @@
limitations under the License.
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
- <item android:state_pressed="true"
- android:color="#ee3c4b90" /> <!-- pressed -->
+ <color name="colorPrimary">#4e6cef</color>
+ <color name="colorPrimaryDark">#2a36b1</color>
+ <color name="colorAccent">#ff7043</color>
- <item android:color="#ee5c6bc0" /> <!-- default -->
-
-</selector>
\ No newline at end of file
+</resources>
\ No newline at end of file
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsActivity.java b/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsActivity.java
index 464eb8a..64d28bc 100644
--- a/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsActivity.java
+++ b/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsActivity.java
@@ -84,6 +84,8 @@
mAdapter = new AttractionsGridPagerAdapter(this, mAttractions);
mAdapter.setOnChromeFadeListener(this);
mGridViewPager.setAdapter(mAdapter);
+ mDotsPageIndicator.setPager(mGridViewPager);
+ mDotsPageIndicator.setOnPageChangeListener(mAdapter);
topFrameLayout.setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() {
@Override
@@ -243,8 +245,6 @@
// Update UI based on the result of the background processing
mAdapter.setData(result);
mAdapter.notifyDataSetChanged();
- mDotsPageIndicator.setPager(mGridViewPager);
- mDotsPageIndicator.setOnPageChangeListener(mAdapter);
mProgressBar.setVisibility(View.GONE);
mDotsPageIndicator.setVisibility(View.VISIBLE);
mGridViewPager.setVisibility(View.VISIBLE);
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsGridPagerAdapter.java b/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsGridPagerAdapter.java
index 99737f4..97accde 100644
--- a/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsGridPagerAdapter.java
+++ b/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/ui/AttractionsGridPagerAdapter.java
@@ -25,11 +25,11 @@
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.support.wearable.activity.ConfirmationActivity;
+import android.support.wearable.view.ActionPage;
import android.support.wearable.view.CardFrame;
import android.support.wearable.view.CardScrollView;
import android.support.wearable.view.GridPagerAdapter;
import android.support.wearable.view.GridViewPager;
-import android.support.wearable.view.WatchViewStub;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.LayoutInflater;
@@ -97,7 +97,7 @@
}
@Override
- protected Object instantiateItem(ViewGroup container, int row, final int column) {
+ public Object instantiateItem(ViewGroup container, int row, final int column) {
if (mAttractions != null && mAttractions.size() > 0) {
final Attraction attraction = mAttractions.get(row);
switch (column) {
@@ -150,48 +150,30 @@
return cardScrollView;
case PAGER_NAVIGATE_ACTION_COLUMN:
// The navigate action
- final WatchViewStub navStub = (WatchViewStub) mLayoutInflater.inflate(
+ final ActionPage navActionPage = (ActionPage) mLayoutInflater.inflate(
R.layout.gridpager_action, container, false);
- navStub.setOnClickListener(getStartActionClickListener(
+ navActionPage.setOnClickListener(getStartActionClickListener(
attraction, Constants.START_NAVIGATION_PATH,
ConfirmationActivity.SUCCESS_ANIMATION));
+ navActionPage.setImageResource(R.drawable.ic_full_directions_walking);
+ navActionPage.setText(mContext.getString(R.string.action_navigate));
- navStub.setOnLayoutInflatedListener(
- new WatchViewStub.OnLayoutInflatedListener() {
- @Override
- public void onLayoutInflated(WatchViewStub watchViewStub) {
- ImageView imageView = (ImageView) navStub.findViewById(R.id.imageView);
- imageView.setImageResource(R.drawable.ic_full_directions_walking);
- TextView textView = (TextView) navStub.findViewById(R.id.textView);
- textView.setText(R.string.action_navigate);
- }
- });
-
- container.addView(navStub);
- return navStub;
+ container.addView(navActionPage);
+ return navActionPage;
case PAGER_OPEN_ACTION_COLUMN:
// The "open on device" action
- final WatchViewStub openStub = (WatchViewStub) mLayoutInflater.inflate(
+ final ActionPage openActionPage = (ActionPage) mLayoutInflater.inflate(
R.layout.gridpager_action, container, false);
- openStub.setOnClickListener(getStartActionClickListener(
+ openActionPage.setOnClickListener(getStartActionClickListener(
attraction, Constants.START_ATTRACTION_PATH,
ConfirmationActivity.OPEN_ON_PHONE_ANIMATION));
+ openActionPage.setImageResource(R.drawable.ic_full_openonphone);
+ openActionPage.setText(mContext.getString(R.string.action_open));
- openStub.setOnLayoutInflatedListener(
- new WatchViewStub.OnLayoutInflatedListener() {
- @Override
- public void onLayoutInflated(WatchViewStub watchViewStub) {
- ImageView imageView = (ImageView) openStub.findViewById(R.id.imageView);
- imageView.setImageResource(R.drawable.ic_full_open_on_device);
- TextView textView = (TextView) openStub.findViewById(R.id.textView);
- textView.setText(R.string.action_open);
- }
- });
-
- container.addView(openStub);
- return openStub;
+ container.addView(openActionPage);
+ return openActionPage;
}
}
return new View(mContext);
@@ -209,7 +191,7 @@
}
@Override
- protected void destroyItem(ViewGroup viewGroup, int row, int column, Object object) {
+ public void destroyItem(ViewGroup viewGroup, int row, int column, Object object) {
mDelayedHide.remove((View) object);
viewGroup.removeView((View)object);
}
@@ -242,6 +224,7 @@
private void startAction(Attraction attraction, String pathName, int confirmAnimationType) {
Intent intent = new Intent(mContext, ConfirmationActivity.class);
intent.putExtra(ConfirmationActivity.EXTRA_ANIMATION_TYPE, confirmAnimationType);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
mContext.startActivity(intent);
UtilityService.clearNotification(mContext);
@@ -270,8 +253,8 @@
}
public interface OnChromeFadeListener {
- abstract void onChromeFadeIn();
- abstract void onChromeFadeOut();
+ void onChromeFadeIn();
+ void onChromeFadeOut();
}
/**
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/drawable-hdpi/ic_full_open_on_device.png b/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/drawable-hdpi/ic_full_open_on_device.png
deleted file mode 100644
index 4e11601..0000000
--- a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/drawable-hdpi/ic_full_open_on_device.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/drawable-hdpi/ic_full_openonphone.png b/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/drawable-hdpi/ic_full_openonphone.png
new file mode 100644
index 0000000..8952486
--- /dev/null
+++ b/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/drawable-hdpi/ic_full_openonphone.png
Binary files differ
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/drawable-xhdpi/ic_full_open_on_device.png b/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/drawable-xhdpi/ic_full_open_on_device.png
deleted file mode 100644
index 2f6f056..0000000
--- a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/drawable-xhdpi/ic_full_open_on_device.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/drawable-xhdpi/ic_full_openonphone.png b/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/drawable-xhdpi/ic_full_openonphone.png
new file mode 100644
index 0000000..d10a19c
--- /dev/null
+++ b/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/drawable-xhdpi/ic_full_openonphone.png
Binary files differ
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/layout/activity_main.xml b/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/layout/activity_main.xml
index a4ef94b..27fce1f 100644
--- a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/layout/activity_main.xml
+++ b/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/layout/activity_main.xml
@@ -41,9 +41,6 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
app:dotFadeWhenIdle="false"
- app:dotFadeInDuration="0"
- app:dotFadeOutDuration="0"
- app:dotFadeOutDelay="0"
android:visibility="gone" />
<android.support.wearable.view.DismissOverlayView
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_action.xml b/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_action.xml
index 4b3bbaf..ac01509 100644
--- a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_action.xml
+++ b/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_action.xml
@@ -16,11 +16,14 @@
limitations under the License.
-->
-<android.support.wearable.view.WatchViewStub
+<android.support.wearable.view.ActionPage
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/actionpage"
android:layout_width="match_parent"
android:layout_height="match_parent"
- app:rectLayout="@layout/gridpager_action_square"
- app:roundLayout="@layout/gridpager_action_round"
- android:clickable="true" />
+ android:src="@drawable/ic_full_openonphone"
+ android:text="@string/action_open"
+ android:maxLines="1"
+ android:color="@color/colorPrimary"
+ app:rippleColor="@color/colorAccent" />
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_action_round.xml b/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_action_round.xml
deleted file mode 100644
index 70cec1a..0000000
--- a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_action_round.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- Copyright 2015 Google Inc. All rights reserved.
-
- 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:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <View
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="#7F000000"/>
-
- <android.support.wearable.view.CircledImageView
- android:id="@+id/circleImageView"
- android:layout_width="112dp"
- android:layout_height="112dp"
- android:layout_centerInParent="true"
- app:circle_radius="52dp"
- app:circle_radius_pressed="56dp"
- app:circle_color="@color/action_color">
-
- <ImageView
- android:id="@+id/imageView"
- android:layout_width="64dp"
- android:layout_height="64dp"
- android:layout_gravity="center"
- android:src="@drawable/ic_full_open_on_device"
- android:scaleType="centerCrop" />
-
- </android.support.wearable.view.CircledImageView>
-
- <TextView
- android:id="@+id/textView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- style="@style/ActionTextStyleRound"
- android:layout_below="@id/circleImageView"
- android:layout_centerHorizontal="true"
- android:gravity="center"
- tools:text="Navigate" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_action_square.xml b/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_action_square.xml
deleted file mode 100644
index 362671b..0000000
--- a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/layout/gridpager_action_square.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- Copyright 2015 Google Inc. All rights reserved.
-
- 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:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <View
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="#7F000000"/>
-
- <android.support.wearable.view.CircledImageView
- android:id="@+id/circleImageView"
- android:layout_width="112dp"
- android:layout_height="112dp"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="24dp"
- app:circle_radius="52dp"
- app:circle_radius_pressed="56dp"
- app:circle_color="@color/action_color">
-
- <ImageView
- android:id="@+id/imageView"
- android:layout_width="64dp"
- android:layout_height="64dp"
- android:layout_gravity="center"
- android:src="@drawable/ic_full_open_on_device"
- android:scaleType="centerCrop" />
-
- </android.support.wearable.view.CircledImageView>
-
- <TextView
- android:id="@+id/textView"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/ActionTextStyle"
- android:layout_below="@id/circleImageView"
- android:layout_marginBottom="12dp"
- android:layout_centerHorizontal="true"
- android:maxLines="2"
- android:gravity="center"
- tools:text="Navigate" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/values/styles.xml b/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/values/styles.xml
index cebe1c7..11b2d3d 100644
--- a/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/values/styles.xml
+++ b/wearable/wear/XYZTouristAttractions/Wearable/src/main/res/values/styles.xml
@@ -31,18 +31,4 @@
<item name="android:ellipsize">end</item>
</style>
- <style name="ActionTextStyle" parent="@android:style/TextAppearance.Large">
- <item name="android:fontFamily">sans-serif-condensed-light</item>
- <item name="android:textStyle">normal</item>
- <item name="android:textSize">18sp</item>
- <item name="android:maxLines">2</item>
- <item name="android:ellipsize">end</item>
- <item name="android:textColor">#FFFFFF</item>
- </style>
-
- <style name="ActionTextStyleRound" parent="ActionTextStyle">
- <item name="android:textSize">14sp</item>
- <item name="android:maxLines">1</item>
- </style>
-
</resources>
\ No newline at end of file
diff --git a/wearable/wear/XYZTouristAttractions/template-params.xml b/wearable/wear/XYZTouristAttractions/template-params.xml
index 0b64557..51882ac 100644
--- a/wearable/wear/XYZTouristAttractions/template-params.xml
+++ b/wearable/wear/XYZTouristAttractions/template-params.xml
@@ -24,11 +24,11 @@
<has_handheld_app>true</has_handheld_app>
</wearable>
- <dependency>com.android.support:appcompat-v7:21.0.3</dependency>
+ <dependency>com.android.support:appcompat-v7:22.1.1</dependency>
<dependency>com.google.android.gms:play-services-location:7.3.0</dependency>
<dependency>com.google.maps.android:android-maps-utils:0.3.2</dependency>
<dependency>com.github.bumptech.glide:glide:3.5.2</dependency>
- <dependency>com.android.support:recyclerview-v7:21.0.0</dependency>
+ <dependency>com.android.support:recyclerview-v7:22.1.1</dependency>
<dependency_wearable>com.google.android.gms:play-services-location:7.3.0</dependency_wearable>
<dependency_shared>com.google.android.gms:play-services-wearable:7.3.0</dependency_shared>
<dependency_shared>com.google.android.gms:play-services-location:7.3.0</dependency_shared>
@@ -96,6 +96,7 @@
<android>android.support.wearable.view.CardScrollView</android>
<android>android.support.wearable.view.GridPagerAdapter</android>
<android>android.support.wearable.view.WatchViewStub</android>
+ <android>android.support.wearable.view.ActionPage</android>
</api_refs>
<!-- 1-3 line description of the sample here.
