Part 2 - Updates wear samples for Wear 2.0 launch (fixes minor issues
too from using latest support library) .
Bug: 34789076
Change-Id: Id38df76c9a5028eb1befb2c7a779ebec778d9e06
diff --git a/wearable/wear/AgendaData/.gitignore b/wearable/wear/AgendaData/.gitignore
new file mode 100644
index 0000000..b90e756
--- /dev/null
+++ b/wearable/wear/AgendaData/.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/GridViewPager/.gitignore b/wearable/wear/GridViewPager/.gitignore
new file mode 100644
index 0000000..b90e756
--- /dev/null
+++ b/wearable/wear/GridViewPager/.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/JumpingJack/.gitignore b/wearable/wear/JumpingJack/.gitignore
new file mode 100644
index 0000000..b90e756
--- /dev/null
+++ b/wearable/wear/JumpingJack/.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/Notifications/.gitignore b/wearable/wear/Notifications/.gitignore
new file mode 100644
index 0000000..b90e756
--- /dev/null
+++ b/wearable/wear/Notifications/.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/RuntimePermissionsWear/.gitignore b/wearable/wear/RuntimePermissionsWear/.gitignore
new file mode 100644
index 0000000..b90e756
--- /dev/null
+++ b/wearable/wear/RuntimePermissionsWear/.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/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml
index e654253..385d3ce 100644
--- a/wearable/wear/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml
@@ -31,6 +31,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/RuntimePermissionsWear/template-params.xml b/wearable/wear/RuntimePermissionsWear/template-params.xml
index cdbeef7..878add5 100644
--- a/wearable/wear/RuntimePermissionsWear/template-params.xml
+++ b/wearable/wear/RuntimePermissionsWear/template-params.xml
@@ -21,8 +21,8 @@
<package>com.example.android.wearable.runtimepermissions</package>
<minSdk>18</minSdk>
- <targetSdkVersion>23</targetSdkVersion>
- <targetSdkVersionWear>23</targetSdkVersionWear>
+ <targetSdkVersion>25</targetSdkVersion>
+ <targetSdkVersionWear>25</targetSdkVersionWear>
<wearable>
<has_handheld_app>true</has_handheld_app>
@@ -30,7 +30,6 @@
<dependency>com.android.support:appcompat-v7:24.0.0</dependency>
<dependency>com.android.support:design:24.0.0</dependency>
- <provided_dependency_wearable>com.google.android.wearable:wearable:1.4.0</provided_dependency_wearable>
<strings>
<intro>
diff --git a/wearable/wear/SpeedTracker/.gitignore b/wearable/wear/SpeedTracker/.gitignore
new file mode 100644
index 0000000..b90e756
--- /dev/null
+++ b/wearable/wear/SpeedTracker/.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/SpeedTracker/Application/src/main/AndroidManifest.xml b/wearable/wear/SpeedTracker/Application/src/main/AndroidManifest.xml
index debd11d..bf86a10 100644
--- a/wearable/wear/SpeedTracker/Application/src/main/AndroidManifest.xml
+++ b/wearable/wear/SpeedTracker/Application/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
<uses-sdk
android:minSdkVersion="18"
- android:targetSdkVersion="23" />
+ android:targetSdkVersion="25" />
<!-- BEGIN_INCLUDE(manifest) -->
diff --git a/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java b/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java
index c645bdd..b915d26 100644
--- a/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java
+++ b/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java
@@ -18,7 +18,8 @@
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.MapFragment;
+import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.OnMapReadyCallback;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.LatLngBounds;
import com.google.android.gms.maps.model.PolylineOptions;
@@ -46,19 +47,21 @@
* deleted.
*/
public class PhoneMainActivity extends AppCompatActivity implements
- DatePickerDialog.OnDateSetListener {
+ DatePickerDialog.OnDateSetListener, OnMapReadyCallback {
private static final String TAG = "PhoneMainActivity";
private static final int BOUNDING_BOX_PADDING_PX = 50;
private TextView mSelectedDateText;
private GoogleMap mMap;
+ private SupportMapFragment mMapFragment;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main_activity);
mSelectedDateText = (TextView) findViewById(R.id.selected_date);
- mMap = ((MapFragment) getFragmentManager().findFragmentById(R.id.map)).getMap();
+ mMapFragment = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map);
+ mMapFragment.getMapAsync(this);
}
public void onClick(View view) {
@@ -132,4 +135,9 @@
}.execute(calendar);
}
+
+ @Override
+ public void onMapReady(GoogleMap googleMap) {
+ mMap = googleMap;
+ }
}
diff --git a/wearable/wear/SpeedTracker/Application/src/main/res/layout/main_activity.xml b/wearable/wear/SpeedTracker/Application/src/main/res/layout/main_activity.xml
index 17a8f6a..ef2480a 100644
--- a/wearable/wear/SpeedTracker/Application/src/main/res/layout/main_activity.xml
+++ b/wearable/wear/SpeedTracker/Application/src/main/res/layout/main_activity.xml
@@ -43,10 +43,10 @@
</RelativeLayout>
<fragment
+ class="com.google.android.gms.maps.SupportMapFragment"
android:id="@+id/map"
android:layout_below="@+id/top_container"
- android:layout_width="fill_parent"
- android:layout_height="match_parent"
- android:name="com.google.android.gms.maps.MapFragment"/>
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/wearable/wear/SpeedTracker/Wearable/src/main/AndroidManifest.xml b/wearable/wear/SpeedTracker/Wearable/src/main/AndroidManifest.xml
index e120686..feb2b81 100644
--- a/wearable/wear/SpeedTracker/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/SpeedTracker/Wearable/src/main/AndroidManifest.xml
@@ -24,7 +24,7 @@
<uses-sdk
android:minSdkVersion="20"
- android:targetSdkVersion="23" />
+ android:targetSdkVersion="25" />
<application
android:allowBackup="true"
@@ -32,6 +32,10 @@
android:label="@string/app_name"
android:theme="@android:style/Theme.DeviceDefault">
+ <meta-data
+ android:name="com.google.android.wearable.standalone"
+ android:value="false" />
+
<!--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/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java b/wearable/wear/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java
index 66550c6..20ded86 100644
--- a/wearable/wear/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java
+++ b/wearable/wear/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java
@@ -29,6 +29,7 @@
import com.google.android.gms.wearable.Wearable;
import android.Manifest;
+import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
@@ -326,6 +327,7 @@
}
}
+ @SuppressLint("MissingPermission")
@Override
public void onConnected(Bundle bundle) {
diff --git a/wearable/wear/SpeedTracker/template-params.xml b/wearable/wear/SpeedTracker/template-params.xml
index 4818e53..01ed08d 100644
--- a/wearable/wear/SpeedTracker/template-params.xml
+++ b/wearable/wear/SpeedTracker/template-params.xml
@@ -23,8 +23,8 @@
<package>com.example.android.wearable.speedtracker</package>
<minSdk>18</minSdk>
- <targetSdkVersion>23</targetSdkVersion>
- <targetSdkVersionWear>23</targetSdkVersionWear>
+ <targetSdkVersion>25</targetSdkVersion>
+ <targetSdkVersionWear>25</targetSdkVersionWear>
<wearable>
<has_handheld_app>true</has_handheld_app>
@@ -32,6 +32,7 @@
<dependency>com.android.support:design:24.0.0</dependency>
+ <dependency>com.google.android.gms:play-services-maps</dependency>
<dependency>com.google.android.gms:play-services-location</dependency>
<dependency_wearable>com.google.android.gms:play-services-location</dependency_wearable>
diff --git a/wearable/wear/SynchronizedNotifications/.gitignore b/wearable/wear/SynchronizedNotifications/.gitignore
new file mode 100644
index 0000000..b90e756
--- /dev/null
+++ b/wearable/wear/SynchronizedNotifications/.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/WatchFace/.gitignore b/wearable/wear/WatchFace/.gitignore
new file mode 100644
index 0000000..b90e756
--- /dev/null
+++ b/wearable/wear/WatchFace/.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/WatchFace/Application/src/main/AndroidManifest.xml b/wearable/wear/WatchFace/Application/src/main/AndroidManifest.xml
index d946cdb..4092097 100644
--- a/wearable/wear/WatchFace/Application/src/main/AndroidManifest.xml
+++ b/wearable/wear/WatchFace/Application/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="com.example.android.wearable.watchface" >
<uses-sdk android:minSdkVersion="18"
- android:targetSdkVersion="23" />
+ android:targetSdkVersion="25" />
<!-- Permissions required by the wearable app -->
<uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/wearable/wear/WatchFace/Wearable/src/main/AndroidManifest.xml b/wearable/wear/WatchFace/Wearable/src/main/AndroidManifest.xml
index 7dd5b69..09b914e 100644
--- a/wearable/wear/WatchFace/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/WatchFace/Wearable/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
<uses-sdk
android:minSdkVersion="21"
- android:targetSdkVersion="23"/>
+ android:targetSdkVersion="25"/>
<uses-feature android:name="android.hardware.type.watch"/>
@@ -35,14 +35,19 @@
<!-- Location permission used by FitDistanceWatchFaceService -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
- <android:uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <android:uses-permission android:name="android.permission.READ_PHONE_STATE"/>
- <android:uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name">
+
+ <meta-data
+ android:name="com.google.android.wearable.standalone"
+ android:value="true" />
+
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version"/>
diff --git a/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/DigitalWatchFaceService.java b/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/DigitalWatchFaceService.java
index 0a9eff2..f3f97fb 100644
--- a/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/DigitalWatchFaceService.java
+++ b/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/DigitalWatchFaceService.java
@@ -28,6 +28,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.support.v4.content.ContextCompat;
import android.support.wearable.watchface.CanvasWatchFaceService;
import android.support.wearable.watchface.WatchFaceService;
import android.support.wearable.watchface.WatchFaceStyle;
@@ -200,12 +201,15 @@
mBackgroundPaint = new Paint();
mBackgroundPaint.setColor(mInteractiveBackgroundColor);
- mDatePaint = createTextPaint(resources.getColor(R.color.digital_date));
+ mDatePaint = createTextPaint(
+ ContextCompat.getColor(getApplicationContext(), R.color.digital_date));
mHourPaint = createTextPaint(mInteractiveHourDigitsColor, BOLD_TYPEFACE);
mMinutePaint = createTextPaint(mInteractiveMinuteDigitsColor);
mSecondPaint = createTextPaint(mInteractiveSecondDigitsColor);
- mAmPmPaint = createTextPaint(resources.getColor(R.color.digital_am_pm));
- mColonPaint = createTextPaint(resources.getColor(R.color.digital_colons));
+ mAmPmPaint = createTextPaint(
+ ContextCompat.getColor(getApplicationContext(), R.color.digital_am_pm));
+ mColonPaint = createTextPaint(
+ ContextCompat.getColor(getApplicationContext(), R.color.digital_colons));
mCalendar = Calendar.getInstance();
mDate = new Date();
diff --git a/wearable/wear/WatchFace/template-params.xml b/wearable/wear/WatchFace/template-params.xml
index 87255ac..6798007 100644
--- a/wearable/wear/WatchFace/template-params.xml
+++ b/wearable/wear/WatchFace/template-params.xml
@@ -23,14 +23,14 @@
<package>com.example.android.wearable.watchface</package>
<minSdk>18</minSdk>
+ <minSdkVersionWear>22</minSdkVersionWear>
<targetSdkVersion>25</targetSdkVersion>
<targetSdkVersionWear>25</targetSdkVersionWear>
- <dependency>com.google.android.support:wearable:1.4.0</dependency>
+ <dependency>com.google.android.support:wearable:2.0.0</dependency>
<dependency>com.google.android.gms:play-services-fitness</dependency>
<dependency_wearable>com.android.support:palette-v7:25.1.0</dependency_wearable>
- <preview_wearable_support_dependency>com.google.android.support:wearable:2.0.0-beta2</preview_wearable_support_dependency>
<dependency_wearable>com.google.android.gms:play-services-fitness</dependency_wearable>
<wearable>
diff --git a/wearable/wear/WearHighBandwidthNetworking/Wearable/build.gradle b/wearable/wear/WearHighBandwidthNetworking/Wearable/build.gradle
index f57ba5e..f8586fb 100644
--- a/wearable/wear/WearHighBandwidthNetworking/Wearable/build.gradle
+++ b/wearable/wear/WearHighBandwidthNetworking/Wearable/build.gradle
@@ -15,14 +15,14 @@
dependencies {
+
+
compile 'com.google.android.gms:play-services-wearable:10.0.1'
-
- provided "com.google.android.wearable:wearable:1.0.0"
-
- compile 'com.google.android.gms:play-services-wearable:9.4.0'
compile 'com.android.support:support-v13:25.0.1'
- compile 'com.google.android.support:wearable:2.0.0-beta1'
+ 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
diff --git a/wearable/wear/WearHighBandwidthNetworking/Wearable/src/main/AndroidManifest.xml b/wearable/wear/WearHighBandwidthNetworking/Wearable/src/main/AndroidManifest.xml
index cde6118..bc25c0e 100644
--- a/wearable/wear/WearHighBandwidthNetworking/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/WearHighBandwidthNetworking/Wearable/src/main/AndroidManifest.xml
@@ -33,6 +33,10 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
+ <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/WearHighBandwidthNetworking/template-params.xml b/wearable/wear/WearHighBandwidthNetworking/template-params.xml
index 3bab8d6..4e80b4f 100644
--- a/wearable/wear/WearHighBandwidthNetworking/template-params.xml
+++ b/wearable/wear/WearHighBandwidthNetworking/template-params.xml
@@ -30,10 +30,6 @@
<!-- Include additional dependencies here.-->
<!-- dependency>com.google.android.gms:play-services:5.0.+</dependency -->
- <dependency_wearable>com.google.android.gms:play-services-wearable:10.0.1</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-beta1</preview_wearable_support_dependency>
-
<strings>
<intro>
<![CDATA[
diff --git a/wearable/wear/WearSpeakerSample/wear/build.gradle b/wearable/wear/WearSpeakerSample/wear/build.gradle
index 8d3e550..5a0264e 100644
--- a/wearable/wear/WearSpeakerSample/wear/build.gradle
+++ b/wearable/wear/WearSpeakerSample/wear/build.gradle
@@ -18,13 +18,13 @@
android {
- compileSdkVersion 23
- buildToolsVersion "23.0.1"
+ compileSdkVersion 25
+ buildToolsVersion "25.0.2"
defaultConfig {
applicationId "com.example.android.wearable.speaker"
- minSdkVersion 21
- targetSdkVersion 23
+ minSdkVersion 22
+ targetSdkVersion 25
versionCode 1
versionName "1.0"
}
@@ -37,8 +37,8 @@
}
dependencies {
- compile 'com.google.android.support:wearable:1.3.0'
- compile 'com.google.android.gms:play-services-wearable:8.3.0'
- compile 'com.android.support:appcompat-v7:23.1.0'
-
+ provided 'com.google.android.wearable:wearable:2.0.0'
+ compile 'com.google.android.support:wearable:2.0.0'
+ compile 'com.google.android.gms:play-services-wearable:10.0.1'
+ compile 'com.android.support:appcompat-v7:25.0.1'
}
diff --git a/wearable/wear/WearSpeakerSample/wear/src/main/AndroidManifest.xml b/wearable/wear/WearSpeakerSample/wear/src/main/AndroidManifest.xml
index 135d3e0..e8d9a29 100644
--- a/wearable/wear/WearSpeakerSample/wear/src/main/AndroidManifest.xml
+++ b/wearable/wear/WearSpeakerSample/wear/src/main/AndroidManifest.xml
@@ -26,6 +26,11 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@android:style/Theme.DeviceDefault" >
+
+ <meta-data
+ android:name="com.google.android.wearable.standalone"
+ android:value="true" />
+
<uses-library android:name="com.google.android.wearable" android:required="false" />
<activity
android:name=".MainActivity"
@@ -37,5 +42,4 @@
</intent-filter>
</activity>
</application>
-
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/wearable/wear/WearVerifyRemoteApp/Wearable/build.gradle b/wearable/wear/WearVerifyRemoteApp/Wearable/build.gradle
index 7574629..b5bd1a2 100644
--- a/wearable/wear/WearVerifyRemoteApp/Wearable/build.gradle
+++ b/wearable/wear/WearVerifyRemoteApp/Wearable/build.gradle
@@ -16,12 +16,13 @@
dependencies {
- 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:2.0.0-beta1'
+ provided 'com.google.android.wearable:wearable:2.0.0'
+
+ compile 'com.google.android.support:wearable:2.0.0'
}
@@ -34,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
@@ -44,7 +45,7 @@
minSdkVersion 23
- targetSdkVersion 24
+ targetSdkVersion 25
}
compileOptions {
diff --git a/wearable/wear/WearVerifyRemoteApp/Wearable/src/main/AndroidManifest.xml b/wearable/wear/WearVerifyRemoteApp/Wearable/src/main/AndroidManifest.xml
index d77cf5f..ee3f2dc 100644
--- a/wearable/wear/WearVerifyRemoteApp/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/WearVerifyRemoteApp/Wearable/src/main/AndroidManifest.xml
@@ -30,6 +30,10 @@
android:supportsRtl="true"
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/WearVerifyRemoteApp/template-params.xml b/wearable/wear/WearVerifyRemoteApp/template-params.xml
index 5dff63c..dbb7497 100644
--- a/wearable/wear/WearVerifyRemoteApp/template-params.xml
+++ b/wearable/wear/WearVerifyRemoteApp/template-params.xml
@@ -23,18 +23,14 @@
<!-- change minSdk if needed-->
<minSdk>23</minSdk>
<minSdkVersionWear>23</minSdkVersionWear>
- <targetSdkVersion>24</targetSdkVersion>
- <targetSdkVersionWear>24</targetSdkVersionWear>
+ <targetSdkVersion>25</targetSdkVersion>
+ <targetSdkVersionWear>25</targetSdkVersionWear>
<wearable>
<has_handheld_app>true</has_handheld_app>
</wearable>
- <dependency>com.google.android.support:wearable:2.0.0-beta1</dependency>
-
- <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-beta1</preview_wearable_support_dependency>
-
+ <dependency>com.google.android.support:wearable:2.0.0</dependency>
<!-- Include additional dependencies here.-->
<!-- dependency>com.google.android.gms:play-services:5.0.+</dependency -->
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml b/wearable/wear/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml
index fc086da..320396d 100644
--- a/wearable/wear/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml
@@ -25,8 +25,8 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="remove" />
<uses-sdk
- android:minSdkVersion="21"
- android:targetSdkVersion="22" />
+ android:minSdkVersion="22"
+ android:targetSdkVersion="25" />
<application
android:allowBackup="true"
@@ -34,6 +34,10 @@
android:label="@string/app_name"
android:theme="@android:style/Theme.DeviceDefault" >
+ <meta-data
+ android:name="com.google.android.wearable.standalone"
+ android:value="false" />
+
<activity
android:name=".ui.AttractionsActivity"
android:label="@string/app_name" />
diff --git a/wearable/wear/XYZTouristAttractions/template-params.xml b/wearable/wear/XYZTouristAttractions/template-params.xml
index bf2a37d..b6a412f 100644
--- a/wearable/wear/XYZTouristAttractions/template-params.xml
+++ b/wearable/wear/XYZTouristAttractions/template-params.xml
@@ -19,8 +19,8 @@
<group>Wearable</group>
<package>com.example.android.xyztouristattractions</package>
<minSdk>18</minSdk>
- <targetSdkVersion>23</targetSdkVersion>
- <targetSdkVersionWear>22</targetSdkVersionWear>
+ <targetSdkVersion>25</targetSdkVersion>
+ <targetSdkVersionWear>25</targetSdkVersionWear>
<wearable>
<has_handheld_app>true</has_handheld_app>
