Merge "Add missing already_scanning string" into lmp-mr1-dev
diff --git a/wearable/wear/Geofencing/Application/src/main/java/com/example/android/wearable/geofencing/MainActivity.java b/wearable/wear/Geofencing/Application/src/main/java/com/example/android/wearable/geofencing/MainActivity.java
index 350c9c5..7564e6c 100644
--- a/wearable/wear/Geofencing/Application/src/main/java/com/example/android/wearable/geofencing/MainActivity.java
+++ b/wearable/wear/Geofencing/Application/src/main/java/com/example/android/wearable/geofencing/MainActivity.java
@@ -37,7 +37,7 @@
import android.widget.Toast;
import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GooglePlayServicesClient.ConnectionCallbacks;
+import com.google.android.gms.common.api.GoogleApiClient.ConnectionCallbacks;
import com.google.android.gms.common.GooglePlayServicesUtil;
import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener;
@@ -48,7 +48,7 @@
import java.util.List;
public class MainActivity extends Activity implements ConnectionCallbacks,
- OnConnectionFailedListener, GoogleApiClient.ConnectionCallbacks {
+ OnConnectionFailedListener {
// Internal List of Geofence objects. In a real app, these might be provided by an API based on
// locations within the user's proximity.
@@ -143,10 +143,6 @@
}
}
- @Override
- public void onDisconnected() {
- }
-
/**
* Once the connection is available, send a request to add the Geofences.
*/
diff --git a/wearable/wear/Geofencing/template-params.xml b/wearable/wear/Geofencing/template-params.xml
index 6e66ecc..66bfcc0 100644
--- a/wearable/wear/Geofencing/template-params.xml
+++ b/wearable/wear/Geofencing/template-params.xml
@@ -23,7 +23,7 @@
<package>com.example.android.wearable.geofencing</package>
<minSdk>18</minSdk>
- <dependency>com.google.android.gms:play-services-location:6.5.+</dependency>
+ <dependency>com.google.android.gms:play-services-location:7.3.0</dependency>
<wearable>
<has_handheld_app>true</has_handheld_app>