Updates wear samples for Wear 2.0 launch (fixes minor issues too
from using latest support library) Part 1.
Bug: 34789076
Change-Id: If509d8ae21ae6a4489b715703553dfa245e3b59b
diff --git a/wearable/wear/AgendaData/Application/src/main/AndroidManifest.xml b/wearable/wear/AgendaData/Application/src/main/AndroidManifest.xml
index ad6cccd..083b223 100644
--- a/wearable/wear/AgendaData/Application/src/main/AndroidManifest.xml
+++ b/wearable/wear/AgendaData/Application/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="com.example.android.wearable.agendadata">
<uses-sdk android:minSdkVersion="18"
- android:targetSdkVersion="23" />
+ android:targetSdkVersion="25" />
<!-- BEGIN_INCLUDE(manifest) -->
diff --git a/wearable/wear/AgendaData/Wearable/src/main/AndroidManifest.xml b/wearable/wear/AgendaData/Wearable/src/main/AndroidManifest.xml
index 87bed70..f8bbdd8 100644
--- a/wearable/wear/AgendaData/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/AgendaData/Wearable/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="com.example.android.wearable.agendadata" >
<uses-sdk android:minSdkVersion="20"
- android:targetSdkVersion="23" />
+ android:targetSdkVersion="25" />
<uses-feature android:name="android.hardware.type.watch" />
@@ -28,6 +28,10 @@
>
<meta-data
+ android:name="com.google.android.wearable.standalone"
+ android:value="false" />
+
+ <meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
diff --git a/wearable/wear/AgendaData/template-params.xml b/wearable/wear/AgendaData/template-params.xml
index 0114403..55e7e58 100644
--- a/wearable/wear/AgendaData/template-params.xml
+++ b/wearable/wear/AgendaData/template-params.xml
@@ -23,8 +23,8 @@
<package>com.example.android.wearable.agendadata</package>
<minSdk>18</minSdk>
- <targetSdkVersion>23</targetSdkVersion>
- <targetSdkVersionWear>23</targetSdkVersionWear>
+ <targetSdkVersion>25</targetSdkVersion>
+ <targetSdkVersionWear>25</targetSdkVersionWear>
<dependency>com.android.support:design:24.0.0</dependency>
diff --git a/wearable/wear/AlwaysOn/.gitignore b/wearable/wear/AlwaysOn/.gitignore
new file mode 100644
index 0000000..b90e756
--- /dev/null
+++ b/wearable/wear/AlwaysOn/.gitignore
@@ -0,0 +1,33 @@
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Ignore gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+proguard-project.txt
+
+# Eclipse files
+.project
+.classpath
+.settings/
+
+# Android Studio/IDEA
+*.iml
+.idea
diff --git a/wearable/wear/AlwaysOn/Wearable/build.gradle b/wearable/wear/AlwaysOn/Wearable/build.gradle
index 832c265..f8586fb 100644
--- a/wearable/wear/AlwaysOn/Wearable/build.gradle
+++ b/wearable/wear/AlwaysOn/Wearable/build.gradle
@@ -15,14 +15,14 @@
dependencies {
- compile 'com.google.android.support:wearable:1.3.0'
- provided "com.google.android.wearable:wearable:1.0.0"
- compile 'com.google.android.gms:play-services-wearable:9.4.0'
+ compile 'com.google.android.gms:play-services-wearable:10.0.1'
compile 'com.android.support:support-v13:25.0.1'
- compile 'com.google.android.support:wearable:1.4.0'
+ provided 'com.google.android.wearable:wearable:2.0.0'
+
+ compile 'com.google.android.support:wearable:2.0.0'
}
@@ -35,9 +35,9 @@
'template'] // boilerplate code that is generated by the sample template process
android {
- compileSdkVersion 24
+ compileSdkVersion 25
- buildToolsVersion "24.0.2"
+ buildToolsVersion "25.0.2"
defaultConfig {
versionCode 1
@@ -45,7 +45,7 @@
minSdkVersion 24
- targetSdkVersion 22
+ targetSdkVersion 25
}
compileOptions {
diff --git a/wearable/wear/AlwaysOn/Wearable/src/main/AndroidManifest.xml b/wearable/wear/AlwaysOn/Wearable/src/main/AndroidManifest.xml
index 12c4b03..c105808 100644
--- a/wearable/wear/AlwaysOn/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/AlwaysOn/Wearable/src/main/AndroidManifest.xml
@@ -25,7 +25,12 @@
<application
android:allowBackup="false"
- android:label="@string/app_name">
+ android:label="@string/app_name"
+ android:theme="@android:style/Theme.DeviceDefault">
+
+ <meta-data
+ android:name="com.google.android.wearable.standalone"
+ android:value="true" />
<!--If you want your app to run on pre-22, then set required to false -->
<uses-library android:name="com.google.android.wearable" android:required="false" />
diff --git a/wearable/wear/AlwaysOn/template-params.xml b/wearable/wear/AlwaysOn/template-params.xml
index b3aac9a..ce70a8d 100644
--- a/wearable/wear/AlwaysOn/template-params.xml
+++ b/wearable/wear/AlwaysOn/template-params.xml
@@ -19,11 +19,7 @@
<group>Wearable</group>
<package>com.example.android.wearable.wear.alwayson</package>
- <dependency_wearable>com.google.android.support:wearable:1.3.0</dependency_wearable>
-
- <provided_dependency_wearable>com.google.android.wearable:wearable:1.0.0</provided_dependency_wearable>
-
- <targetSdkVersionWear>22</targetSdkVersionWear>
+ <targetSdkVersionWear>25</targetSdkVersionWear>
<strings>
<intro>
diff --git a/wearable/wear/DataLayer/Wearable/src/main/AndroidManifest.xml b/wearable/wear/DataLayer/Wearable/src/main/AndroidManifest.xml
index 6608bb7..2bc5f4c 100644
--- a/wearable/wear/DataLayer/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/DataLayer/Wearable/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="com.example.android.wearable.datalayer" >
<uses-sdk android:minSdkVersion="20"
- android:targetSdkVersion="23" />
+ android:targetSdkVersion="25" />
<uses-feature android:name="android.hardware.type.watch" />
@@ -29,6 +29,10 @@
android:theme="@android:style/Theme.DeviceDefault">
<meta-data
+ android:name="com.google.android.wearable.standalone"
+ android:value="false" />
+
+ <meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
diff --git a/wearable/wear/DataLayer/template-params.xml b/wearable/wear/DataLayer/template-params.xml
index 6df31f5..beeb26a 100644
--- a/wearable/wear/DataLayer/template-params.xml
+++ b/wearable/wear/DataLayer/template-params.xml
@@ -20,8 +20,8 @@
<package>com.example.android.wearable.datalayer</package>
<minSdk>18</minSdk>
- <targetSdkVersion>23</targetSdkVersion>
- <targetSdkVersionWear>22</targetSdkVersionWear>
+ <targetSdkVersion>25</targetSdkVersion>
+ <targetSdkVersionWear>25</targetSdkVersionWear>
<wearable>
<has_handheld_app>true</has_handheld_app>
diff --git a/wearable/wear/GridViewPager/Wearable/src/main/AndroidManifest.xml b/wearable/wear/GridViewPager/Wearable/src/main/AndroidManifest.xml
index e25cd63..bd6df94 100644
--- a/wearable/wear/GridViewPager/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/GridViewPager/Wearable/src/main/AndroidManifest.xml
@@ -27,6 +27,11 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@android:style/Theme.DeviceDefault.Light" >
+
+ <meta-data
+ android:name="com.google.android.wearable.standalone"
+ android:value="true" />
+
<activity
android:name="com.example.android.wearable.gridviewpager.MainActivity"
android:label="@string/app_name" >
diff --git a/wearable/wear/GridViewPager/template-params.xml b/wearable/wear/GridViewPager/template-params.xml
index 66e4bf4..9f5ac5c 100644
--- a/wearable/wear/GridViewPager/template-params.xml
+++ b/wearable/wear/GridViewPager/template-params.xml
@@ -22,7 +22,7 @@
<group>Wearable</group>
<package>com.example.android.wearable.gridviewpager</package>
- <targetSdkVersionWear>22</targetSdkVersionWear>
+ <targetSdkVersionWear>25</targetSdkVersionWear>
<strings>
<intro>
diff --git a/wearable/wear/JumpingJack/Wearable/src/main/AndroidManifest.xml b/wearable/wear/JumpingJack/Wearable/src/main/AndroidManifest.xml
index f6cf220..0e0475a 100644
--- a/wearable/wear/JumpingJack/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/JumpingJack/Wearable/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="com.example.android.wearable.jumpingjack">
<uses-sdk android:minSdkVersion="20"
- android:targetSdkVersion="22" />
+ android:targetSdkVersion="25" />
<uses-feature android:name="android.hardware.type.watch" />
@@ -29,6 +29,11 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@android:style/Theme.DeviceDefault.Light">
+
+ <meta-data
+ android:name="com.google.android.wearable.standalone"
+ android:value="true" />
+
<activity
android:name=".MainActivity"
android:label="@string/app_name">
diff --git a/wearable/wear/JumpingJack/template-params.xml b/wearable/wear/JumpingJack/template-params.xml
index 9512f32..d746b2c 100644
--- a/wearable/wear/JumpingJack/template-params.xml
+++ b/wearable/wear/JumpingJack/template-params.xml
@@ -22,7 +22,7 @@
<group>Wearable</group>
<package>com.example.android.wearable.jumpingjack</package>
- <targetSdkVersionWear>22</targetSdkVersionWear>
+ <targetSdkVersionWear>25</targetSdkVersionWear>
<strings>
<intro>
diff --git a/wearable/wear/WearNotifications/Wearable/src/main/AndroidManifest.xml b/wearable/wear/WearNotifications/Wearable/src/main/AndroidManifest.xml
index c97025d..2fdee0d 100644
--- a/wearable/wear/WearNotifications/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/WearNotifications/Wearable/src/main/AndroidManifest.xml
@@ -29,6 +29,9 @@
android:supportsRtl="true"
android:theme="@style/AppThemeOverride">
+ <!-- Let's Play Store know this app is standalone. -->
+ <meta-data android:name="com.google.android.wearable.standalone" android:value="true"/>
+
<!--
Important Note: Usually, you will want to disable bridging if you have a local/native
Android Wear app creating Notifications. In our case, we don't, as our sample shows both
diff --git a/wearable/wear/WearNotifications/Wearable/src/main/java/com/example/android/wearable/wear/wearnotifications/StandaloneMainActivity.java b/wearable/wear/WearNotifications/Wearable/src/main/java/com/example/android/wearable/wear/wearnotifications/StandaloneMainActivity.java
index 7e78fc3..95baa6d 100644
--- a/wearable/wear/WearNotifications/Wearable/src/main/java/com/example/android/wearable/wear/wearnotifications/StandaloneMainActivity.java
+++ b/wearable/wear/WearNotifications/Wearable/src/main/java/com/example/android/wearable/wear/wearnotifications/StandaloneMainActivity.java
@@ -92,6 +92,9 @@
mMainFrameLayout = (FrameLayout) findViewById(R.id.mainFrameLayout);
mWearableRecyclerView = (WearableRecyclerView) findViewById(R.id.recycler_view);
+ // Aligns the first and last items on the list vertically centered on the screen.
+ mWearableRecyclerView.setCenterEdgeItems(true);
+
// Customizes scrolling (zoom) and offsets of WearableRecyclerView's items
ScalingOffsettingHelper scalingOffsettingHelper = new ScalingOffsettingHelper();
mWearableRecyclerView.setOffsettingHelper(scalingOffsettingHelper);
diff --git a/wearable/wear/WearNotifications/template-params.xml b/wearable/wear/WearNotifications/template-params.xml
index 6a3ceb2..25d53b2 100644
--- a/wearable/wear/WearNotifications/template-params.xml
+++ b/wearable/wear/WearNotifications/template-params.xml
@@ -33,9 +33,6 @@
<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>
-
<!-- Include additional dependencies here.-->
<!-- dependency>com.google.android.gms:play-services:5.0.+</dependency -->
