Updates watch face to use new support library classes.
Bug: 63932741
Test: Manually tested samples on physical devices.
Change-Id: Ib5113f969743583dd0169bee0fa5b665fabe2938
diff --git a/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/config/AnalogComplicationConfigActivity.java b/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/config/AnalogComplicationConfigActivity.java
index f2e4a16..19e469a 100644
--- a/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/config/AnalogComplicationConfigActivity.java
+++ b/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/config/AnalogComplicationConfigActivity.java
@@ -18,9 +18,10 @@
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.wear.widget.WearableRecyclerView;
import android.support.wearable.complications.ComplicationProviderInfo;
import android.support.wearable.complications.ProviderChooserIntent;
-import android.support.wearable.view.WearableRecyclerView;
import android.util.Log;
import com.example.android.wearable.watchface.R;
@@ -57,7 +58,9 @@
(WearableRecyclerView) findViewById(R.id.wearable_recycler_view);
// Aligns the first and last items on the list vertically centered on the screen.
- mWearableRecyclerView.setCenterEdgeItems(true);
+ mWearableRecyclerView.setEdgeItemsCenteringEnabled(true);
+
+ mWearableRecyclerView.setLayoutManager(new LinearLayoutManager(this));
// Improves performance because we know changes in content do not change the layout size of
// the RecyclerView.
diff --git a/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/config/ColorSelectionActivity.java b/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/config/ColorSelectionActivity.java
index cfe713f..3bbfeec 100644
--- a/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/config/ColorSelectionActivity.java
+++ b/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/config/ColorSelectionActivity.java
@@ -17,7 +17,8 @@
import android.app.Activity;
import android.os.Bundle;
-import android.support.wearable.view.WearableRecyclerView;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.wear.widget.WearableRecyclerView;
import com.example.android.wearable.watchface.R;
import com.example.android.wearable.watchface.model.AnalogComplicationConfigData;
@@ -54,7 +55,9 @@
(WearableRecyclerView) findViewById(R.id.wearable_recycler_view);
// Aligns the first and last items on the list vertically centered on the screen.
- mConfigAppearanceWearableRecyclerView.setCenterEdgeItems(true);
+ mConfigAppearanceWearableRecyclerView.setEdgeItemsCenteringEnabled(true);
+
+ mConfigAppearanceWearableRecyclerView.setLayoutManager(new LinearLayoutManager(this));
// Improves performance because we know changes in content do not change the layout size of
// the RecyclerView.
diff --git a/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/config/DigitalWatchFaceWearableConfigActivity.java b/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/config/DigitalWatchFaceWearableConfigActivity.java
index fd3a373..274a826 100644
--- a/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/config/DigitalWatchFaceWearableConfigActivity.java
+++ b/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/config/DigitalWatchFaceWearableConfigActivity.java
@@ -23,7 +23,7 @@
import android.graphics.Color;
import android.os.Bundle;
import android.support.v7.widget.RecyclerView;
-import android.support.wearable.view.BoxInsetLayout;
+import android.support.wear.widget.BoxInsetLayout;
import android.support.wearable.view.CircledImageView;
import android.support.wearable.view.WearableListView;
import android.util.Log;
diff --git a/wearable/wear/WatchFace/Wearable/src/main/res/layout/activity_analog_complication_config.xml b/wearable/wear/WatchFace/Wearable/src/main/res/layout/activity_analog_complication_config.xml
index 61beb90..dea517e 100644
--- a/wearable/wear/WatchFace/Wearable/src/main/res/layout/activity_analog_complication_config.xml
+++ b/wearable/wear/WatchFace/Wearable/src/main/res/layout/activity_analog_complication_config.xml
@@ -21,9 +21,8 @@
android:background="@color/dark_grey"
android:paddingStart="@dimen/activity_config_padding"
android:paddingEnd="@dimen/activity_config_padding">
- <android.support.wearable.view.WearableRecyclerView
+ <android.support.wear.widget.WearableRecyclerView
android:id="@+id/wearable_recycler_view"
android:layout_height="wrap_content"
- android:layout_width="match_parent">
- </android.support.wearable.view.WearableRecyclerView>
+ android:layout_width="match_parent" />
</FrameLayout>
\ No newline at end of file
diff --git a/wearable/wear/WatchFace/Wearable/src/main/res/layout/activity_color_selection_config.xml b/wearable/wear/WatchFace/Wearable/src/main/res/layout/activity_color_selection_config.xml
index fb7465f..8780ca3 100644
--- a/wearable/wear/WatchFace/Wearable/src/main/res/layout/activity_color_selection_config.xml
+++ b/wearable/wear/WatchFace/Wearable/src/main/res/layout/activity_color_selection_config.xml
@@ -23,9 +23,8 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
tools:context="com.example.android.wearable.watchface.config.ColorSelectionActivity">
- <android.support.wearable.view.WearableRecyclerView
+ <android.support.wear.widget.WearableRecyclerView
android:id="@+id/wearable_recycler_view"
android:layout_height="wrap_content"
- android:layout_width="match_parent">
- </android.support.wearable.view.WearableRecyclerView>
+ android:layout_width="match_parent" />
</FrameLayout>
\ No newline at end of file
diff --git a/wearable/wear/WatchFace/Wearable/src/main/res/layout/activity_digital_config.xml b/wearable/wear/WatchFace/Wearable/src/main/res/layout/activity_digital_config.xml
index 1672404..d432f82 100644
--- a/wearable/wear/WatchFace/Wearable/src/main/res/layout/activity_digital_config.xml
+++ b/wearable/wear/WatchFace/Wearable/src/main/res/layout/activity_digital_config.xml
@@ -13,7 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<android.support.wearable.view.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.wear.widget.BoxInsetLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/content"
android:layout_width="match_parent"
@@ -36,4 +37,4 @@
android:layout_height="match_parent"
android:background="@android:color/transparent"
app:layout_box="left|right"/>
-</android.support.wearable.view.BoxInsetLayout>
+</android.support.wear.widget.BoxInsetLayout>
diff --git a/wearable/wear/WatchFace/template-params.xml b/wearable/wear/WatchFace/template-params.xml
index b95995c..5069fd3 100644
--- a/wearable/wear/WatchFace/template-params.xml
+++ b/wearable/wear/WatchFace/template-params.xml
@@ -23,12 +23,16 @@
<package>com.example.android.wearable.watchface</package>
<minSdk>18</minSdk>
- <minSdkVersionWear>24</minSdkVersionWear>
<targetSdkVersion>25</targetSdkVersion>
- <targetSdkVersionWear>25</targetSdkVersionWear>
+
+ <minSdkVersionWear>24</minSdkVersionWear>
+ <compileSdkVersionWear>26</compileSdkVersionWear>
+ <targetSdkVersionWear>26</targetSdkVersionWear>
<dependency>com.google.android.support:wearable:2.0.3</dependency>
- <dependency_wearable>com.android.support:palette-v7:25.3.1</dependency_wearable>
+ <dependency_wearable>com.android.support:palette-v7:26.0.0</dependency_wearable>
+ <dependency_wearable>com.android.support:wear:26.0.0</dependency_wearable>
+
<wearable>
<has_handheld_app>true</has_handheld_app>
