am 11b32f03: Clean up samples (gradle files and Compat stuff in wearable code).

* commit '11b32f038486390d91aafb56c6204666267db89f':
  Clean up samples (gradle files and Compat stuff in wearable code).

samples/wearable/AgendaData/Application/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 20
+    compileSdkVersion 18
     buildToolsVersion '20'
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 20
+        targetSdkVersion 19
         versionCode 1
         versionName "1.0"
     }
@@ -23,4 +23,4 @@ dependencies {
     compile 'com.google.android.gms:play-services:5.0.+@aar'
     compile "com.android.support:support-v4:20.0.+"
     wearApp project(':Wearable')
-}
+}

samples/wearable/AgendaData/Application/src/main/AndroidManifest.xml

@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.example.android.wearable.agendadata">
 
-    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="20" />
-
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
 

samples/wearable/AgendaData/Wearable/build.gradle

@@ -20,7 +20,6 @@ android {
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services:5.+@aar'
+    compile 'com.google.android.gms:play-services-wearable:+'
-    compile "com.android.support:support-v4:20.0.+"
     compile "com.google.android.support:wearable:1.0.+"
 }

samples/wearable/AgendaData/Wearable/src/main/AndroidManifest.xml

@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.agendadata" >
 
-    <uses-sdk android:minSdkVersion="20" android:targetSdkVersion="20" />
-
     <application
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"

samples/wearable/DataLayer/Application/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion 18
     buildToolsVersion '20'
 
     defaultConfig {
@@ -23,4 +23,4 @@ dependencies {
     compile 'com.google.android.gms:play-services:5.0.+@aar'
     compile "com.android.support:support-v4:20.0.+"
     wearApp project(':Wearable')
-}
+}

samples/wearable/DataLayer/Application/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.datalayer" >
 
-    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="19" />
     <uses-feature android:name="android.hardware.camera" android:required="false" />
 
     <application

samples/wearable/DataLayer/Wearable/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion 20
     buildToolsVersion '20'
 
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion 20
-        targetSdkVersion 19
+        targetSdkVersion 20
         versionCode 1
         versionName "1.0"
     }
@@ -20,6 +20,5 @@ android {
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services:5.0.+@aar'
+    compile 'com.google.android.gms:play-services-wearable:+'
-    compile "com.android.support:support-v13:20.0.+"
 }

samples/wearable/DataLayer/Wearable/src/main/AndroidManifest.xml

@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.datalayer" >
 
-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="19" />
-
     <application
             android:allowBackup="true"
             android:icon="@drawable/ic_launcher"

samples/wearable/DelayedConfirmation/Application/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 20
+    compileSdkVersion 18
     buildToolsVersion '20'
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 20
+        targetSdkVersion 19
         versionCode 1
         versionName "1.0"
     }
@@ -22,4 +22,4 @@ android {
 dependencies {
     compile 'com.google.android.gms:play-services:5.0.+@aar'
     wearApp project(':Wearable')
-}
+}

samples/wearable/DelayedConfirmation/Application/src/main/AndroidManifest.xml

@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.delayedconfirmation" >
 
-    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="20" />
-
     <application
             android:allowBackup="true"
             android:icon="@drawable/ic_launcher"

samples/wearable/DelayedConfirmation/Wearable/build.gradle

@@ -20,7 +20,6 @@ android {
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services:5.0.+@aar'
+    compile 'com.google.android.gms:play-services-wearable:+'
-    compile "com.android.support:support-v13:20.0.+"
     compile "com.google.android.support:wearable:1.0.+"
 }

samples/wearable/DelayedConfirmation/Wearable/src/main/java/com/example/android/wearable/delayedconfirmation/MainActivity.java

@@ -2,9 +2,8 @@ package com.example.android.wearable.delayedconfirmation;
 
 import android.app.Activity;
 import android.app.Notification;
+import android.app.NotificationManager;
 import android.os.Bundle;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
 import android.support.wearable.view.DelayedConfirmationView;
 import android.util.Log;
 import android.view.View;
@@ -70,12 +69,12 @@ public class MainActivity extends Activity implements
     @Override
     public void onTimerSelected(View v) {
         v.setPressed(true);
-        Notification notification = new NotificationCompat.Builder(this)
+        Notification notification = new Notification.Builder(this)
                 .setSmallIcon(R.drawable.ic_launcher)
                 .setContentTitle(getString(R.string.notification_title))
                 .setContentText(getString(R.string.notification_timer_selected))
                 .build();
-        NotificationManagerCompat.from(this).notify(0, notification);
+        ((NotificationManager) getSystemService(NOTIFICATION_SERVICE)).notify(0, notification);
         sendMessageToCompanion(TIMER_SELECTED_PATH);
         // Prevent onTimerFinished from being heard.
         ((DelayedConfirmationView) v).setListener(null);
@@ -84,12 +83,12 @@ public class MainActivity extends Activity implements
 
     @Override
     public void onTimerFinished(View v) {
-        Notification notification = new NotificationCompat.Builder(this)
+        Notification notification = new Notification.Builder(this)
                 .setSmallIcon(R.drawable.ic_launcher)
                 .setContentTitle(getString(R.string.notification_title))
                 .setContentText(getString(R.string.notification_timer_finished))
                 .build();
-        NotificationManagerCompat.from(this).notify(0, notification);
+        ((NotificationManager) getSystemService(NOTIFICATION_SERVICE)).notify(0, notification);
         sendMessageToCompanion(TIMER_FINISHED_PATH);
         finish();
     }

samples/wearable/ElizaChat/Application/build.gradle

@@ -0,0 +1,24 @@
+apply plugin: 'android'
+
+android {
+    compileSdkVersion 18
+    buildToolsVersion '20'
+
+    defaultConfig {
+        minSdkVersion 18
+        targetSdkVersion 19
+        versionCode 1
+        versionName "1.0"
+    }
+
+    buildTypes {
+        release {
+            runProguard false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
+
+dependencies {
+    compile "com.android.support:support-v4:20.0.+"
+}

samples/wearable/ElizaChat/Application/proguard-rules.txt

@@ -17,6 +17,4 @@
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
-#}
+#}
--dontwarn android.support.wearable.view.DelayedConfirmationView
--dontwarn android.support.wearable.view.CircledImageView

samples/wearable/ElizaChat/Application/project.properties

@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-19

samples/wearable/ElizaChat/Application/src/main/AndroidManifest.xml

@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.wearable.elizachat" >
 
-    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="19"/>
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_app_eliza"

samples/wearable/ElizaChat/Application/src/main/java/com/example/android/wearable/elizachat/MainActivity.java

@@ -1,13 +1,10 @@
 package com.example.android.wearable.elizachat;
 
 import android.app.Activity;
-import android.app.Notification;
-import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;

samples/wearable/ElizaChat/Application/src/main/java/com/example/android/wearable/elizachat/ResponderService.java

@@ -129,4 +129,4 @@ public class ResponderService extends Service {
         mBroadcastManager = null;
         super.onDestroy();
     }
-}
+}

samples/wearable/ElizaChat/build.gradle

@@ -1,5 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         mavenCentral()
@@ -13,29 +11,4 @@ allprojects {
     repositories {
         mavenCentral()
     }
-}
-
-apply plugin: 'android'
-
-android {
-    compileSdkVersion 19
-    buildToolsVersion '20'
-
-    defaultConfig {
-        minSdkVersion 18
-        targetSdkVersion 19
-        versionCode 1
-        versionName "1.0"
-    }
-
-    buildTypes {
-        release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-}
-
-dependencies {
-    compile "com.android.support:support-v4:20.0.+"
 }

samples/wearable/ElizaChat/settings.gradle

@@ -0,0 +1 @@
+include 'Application'

samples/wearable/EmbeddedApp/Application/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion 18
     buildToolsVersion '20'
 
     defaultConfig {

samples/wearable/FindMyPhone/Application/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 20
+    compileSdkVersion 18
     buildToolsVersion '20'
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 20
+        targetSdkVersion 19
         versionCode 1
         versionName "1.0"
     }
@@ -23,4 +23,4 @@ dependencies {
     compile 'com.google.android.gms:play-services:5.0.+@aar'
     compile "com.android.support:support-v4:20.0.+"
     wearApp project(':Wearable')
-}
+}

samples/wearable/FindMyPhone/Application/src/main/AndroidManifest.xml

@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.example.android.wearable.findphone">
 
-    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="20" />
-
     <application
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"

samples/wearable/FindMyPhone/Wearable/build.gradle

@@ -20,7 +20,6 @@ android {
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services:5.+@aar'
+    compile 'com.google.android.gms:play-services-wearable:+'
-    compile "com.android.support:support-v13:20.0.+"
     compile "com.google.android.support:wearable:1.0.+"
 }

samples/wearable/FindMyPhone/Wearable/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.wearable.findphone" >
 
-    <uses-sdk android:minSdkVersion="20" android:targetSdkVersion="20" />
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application

samples/wearable/FindMyPhone/build.gradle

@@ -1,5 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         mavenCentral()

samples/wearable/Flashlight/Wearable/build.gradle

@@ -20,6 +20,5 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:support-v13:20.0.+"
     compile "com.google.android.support:wearable:1.0.+"
 }

samples/wearable/Flashlight/Wearable/src/main/AndroidManifest.xml

@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.example.android.wearable.flashlight" >
 
-    <uses-sdk android:minSdkVersion="20" android:targetSdkVersion="20" />
-
     <application
             android:label="@string/app_name"
             android:icon="@drawable/ic_launcher"

samples/wearable/Flashlight/build.gradle

@@ -1,5 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         mavenCentral()

samples/wearable/Geofencing/Application/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 20
+    compileSdkVersion 18
     buildToolsVersion '20'
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 20
+        targetSdkVersion 19
         versionCode 1
         versionName "1.0"
     }
@@ -23,4 +23,4 @@ dependencies {
     compile 'com.google.android.gms:play-services:5.0.+@aar'
     compile "com.android.support:support-v4:20.0.+"
     wearApp project(':Wearable')
-}
+}

samples/wearable/Geofencing/Application/src/main/AndroidManifest.xml

@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.example.android.wearable.geofencing">
 
-    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="20"/>
-
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
     <application

samples/wearable/Geofencing/Wearable/build.gradle

@@ -20,7 +20,6 @@ android {
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services:5.+@aar'
+    compile 'com.google.android.gms:play-services-wearable:+'
-    compile "com.android.support:support-v4:20.0.+"
     compile "com.google.android.support:wearable:1.0.+"
 }

samples/wearable/Geofencing/Wearable/src/main/AndroidManifest.xml

@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.geofencing" >
 
-    <uses-sdk android:minSdkVersion="20" android:targetSdkVersion="20" />
-
     <application
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"

samples/wearable/GridViewPager/Wearable/build.gradle

@@ -20,6 +20,5 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:support-v13:20.0.+"
     compile "com.google.android.support:wearable:1.0.+"
 }

samples/wearable/GridViewPager/Wearable/src/main/AndroidManifest.xml

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.gridviewpager"
+    package="com.example.android.wearable.gridviewpager" >
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="20"
-        android:targetSdkVersion="20" />
 
     <application
         android:allowBackup="true"

samples/wearable/JumpingJack/Wearable/build.gradle

@@ -28,7 +28,6 @@ android {
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services:5.0.+@aar'
+    compile 'com.google.android.gms:play-services-wearable:+'
-    compile "com.android.support:support-v13:20.0.+"
     compile "com.google.android.support:wearable:1.0.+"
 }

samples/wearable/JumpingJack/build.gradle

@@ -1,5 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         mavenCentral()

samples/wearable/Notifications/Application/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion 18
     buildToolsVersion '20'
 
     defaultConfig {
@@ -22,4 +22,4 @@ android {
 dependencies {
     compile "com.android.support:support-v4:20.0.+"
     wearApp project(':Wearable')
-}
+}

samples/wearable/Notifications/Application/src/main/AndroidManifest.xml

@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.support.wearable.notifications" >
 
-    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="19"/>
-
     <application
             android:allowBackup="true"
             android:icon="@mipmap/ic_launcher"

samples/wearable/Notifications/Wearable/build.gradle

@@ -20,6 +20,5 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:support-v13:20.0.+"
     compile "com.google.android.support:wearable:1.0.+"
 }

samples/wearable/Notifications/Wearable/src/main/AndroidManifest.xml

@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.support.wearable.notifications" >
 
-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="19"/>
-
     <application
             android:allowBackup="true"
             android:icon="@mipmap/ic_launcher"

samples/wearable/Notifications/Wearable/src/main/java/com/example/android/support/wearable/notifications/MainActivity.java

@@ -2,10 +2,10 @@ package com.example.android.support.wearable.notifications;
 
 import android.app.Activity;
 import android.app.Notification;
+import android.app.NotificationManager;
 import android.app.RemoteInput;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.NotificationManagerCompat;
 import android.support.wearable.view.WearableListView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -46,7 +46,8 @@ public class MainActivity extends Activity implements WearableListView.ClickList
     private void updateNotification(int presetIndex) {
         NotificationPreset preset = NotificationPresets.PRESETS[presetIndex];
         Notification notif = preset.buildNotification(this);
-        NotificationManagerCompat.from(this).notify(SAMPLE_NOTIFICATION_ID, notif);
+        ((NotificationManager) getSystemService(NOTIFICATION_SERVICE))
+                .notify(SAMPLE_NOTIFICATION_ID, notif);
         finish();
     }
 

samples/wearable/Quiz/Application/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 20
+    compileSdkVersion 18
     buildToolsVersion '20'
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 20
+        targetSdkVersion 19
         versionCode 1
         versionName "1.0"
     }

samples/wearable/Quiz/Application/src/main/AndroidManifest.xml

@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.quiz" >
 
-    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="19"/>
-
     <application
             android:allowBackup="true"
             android:icon="@drawable/ic_launcher"

samples/wearable/Quiz/Wearable/build.gradle

@@ -20,7 +20,6 @@ android {
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services:5.0.+@aar'
+    compile 'com.google.android.gms:play-services-wearable:+'
-    compile "com.android.support:support-v13:20.0.+"
     compile "com.google.android.support:wearable:1.0.+"
 }

samples/wearable/Quiz/Wearable/src/main/AndroidManifest.xml

@@ -2,10 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.wearable.quiz" >
 
-    <uses-sdk
-        android:minSdkVersion="20"
-        android:targetSdkVersion="20" />
-
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"

samples/wearable/Quiz/build.gradle

@@ -1,5 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         mavenCentral()

samples/wearable/RecipeAssistant/Application/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion 18
     buildToolsVersion '20'
 
     defaultConfig {

samples/wearable/RecipeAssistant/Application/src/main/AndroidManifest.xml

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.recipeassistant"
+    package="com.example.android.wearable.recipeassistant" >
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="19" />
 
     <application
         android:allowBackup="true"

samples/wearable/RecipeAssistant/build.gradle

@@ -1,5 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         mavenCentral()

samples/wearable/SkeletonWearableApp/Wearable/build.gradle

@@ -20,6 +20,5 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:support-v13:20.0.+"
     compile "com.google.android.support:wearable:1.0.+"
 }

samples/wearable/SynchronizedNotifications/Application/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion 18
     buildToolsVersion '20'
     defaultConfig {
         minSdkVersion 18

samples/wearable/Timer/Wearable/build.gradle

@@ -20,7 +20,5 @@ android {
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services:5.+@aar'
-    compile "com.android.support:support-v4:20.0.+"
     compile "com.google.android.support:wearable:1.0.+"
 }

samples/wearable/Timer/Wearable/src/main/AndroidManifest.xml

@@ -17,16 +17,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.timer" >
 
-    <uses-sdk android:minSdkVersion="20" android:targetSdkVersion="20" />
-
     <application
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
-            android:theme="@android:style/Theme.DeviceDefault.Light">
+            android:theme="@android:style/Theme.DeviceDefault.Light"
-
+            android:allowBackup="true">
-        <meta-data
-                android:name="com.google.android.gms.version"
-                android:value="@integer/google_play_services_version" />
 
         <!-- Timer components -->
         <activity android:name=".SetTimerActivity">

samples/wearable/Timer/Wearable/src/main/java/com/example/android/wearable/timer/SetTimerActivity.java

@@ -19,14 +19,13 @@ package com.example.android.wearable.timer;
 import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.Notification;
+import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.provider.AlarmClock;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
@@ -35,21 +34,15 @@ import android.widget.ListView;
 
 import com.example.android.wearable.timer.util.Constants;
 import com.example.android.wearable.timer.util.TimerFormat;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.wearable.Wearable;
 
 /** This class sets a timer. */
-public class SetTimerActivity extends Activity
+public class SetTimerActivity extends Activity implements AdapterView.OnItemClickListener {
-        implements AdapterView.OnItemClickListener, GoogleApiClient.ConnectionCallbacks,
-        GoogleApiClient.OnConnectionFailedListener {
 
     public static final int NUMBER_OF_TIMES = 10;
     public static final String TAG = "SetTimerActivity";
 
     private ListViewItem[] mTimeOptions = new ListViewItem[NUMBER_OF_TIMES];
     private ListView mListView;
-    private GoogleApiClient mGoogleApiClient;
 
 
     @Override
@@ -82,24 +75,6 @@ public class SetTimerActivity extends Activity
                 android.R.layout.simple_list_item_1, mTimeOptions);
         mListView.setAdapter(arrayAdapter);
         mListView.setOnItemClickListener(this);
-
-        mGoogleApiClient = new GoogleApiClient.Builder(this)
-                .addApi(Wearable.API)
-                .addConnectionCallbacks(this)
-                .addOnConnectionFailedListener(this)
-                .build();
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        mGoogleApiClient.connect();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        mGoogleApiClient.disconnect();
     }
 
     /**
@@ -107,7 +82,8 @@ public class SetTimerActivity extends Activity
      * milliseconds.
      */
     private void setupTimer(long duration) {
-        NotificationManagerCompat notifyMgr = NotificationManagerCompat.from(this);
+        NotificationManager notifyMgr =
+                ((NotificationManager) getSystemService(NOTIFICATION_SERVICE));
 
         // Delete dataItem and cancel a potential old countdown.
         cancelCountdown(notifyMgr);
@@ -165,7 +141,7 @@ public class SetTimerActivity extends Activity
                 .getService(this, 0, deleteIntent, PendingIntent.FLAG_UPDATE_CURRENT);
 
         // Create countdown notification using a chronometer style.
-        return new NotificationCompat.Builder(this)
+        return new Notification.Builder(this)
                 .setSmallIcon(R.drawable.ic_cc_alarm)
                 .setContentTitle(getString(R.string.timer_time_left))
                 .setContentText(TimerFormat.getTimeString(duration))
@@ -185,7 +161,7 @@ public class SetTimerActivity extends Activity
      *
      * @param notifyMgr the notification manager.
      */
-    private void cancelCountdown(NotificationManagerCompat notifyMgr) {
+    private void cancelCountdown(NotificationManager notifyMgr) {
         notifyMgr.cancel(Constants.NOTIFICATION_TIMER_EXPIRED);
     }
 
@@ -208,15 +184,4 @@ public class SetTimerActivity extends Activity
         }
     }
 
-    @Override
-    public void onConnected(Bundle connectionHint) {
-    }
-
-    @Override
-    public void onConnectionSuspended(int cause) {
-    }
-
-    @Override
-    public void onConnectionFailed(ConnectionResult result) {
-    }
 }

samples/wearable/Timer/Wearable/src/main/java/com/example/android/wearable/timer/TimerNotificationService.java

@@ -19,27 +19,18 @@ package com.example.android.wearable.timer;
 import android.app.AlarmManager;
 import android.app.IntentService;
 import android.app.Notification;
+import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
 import android.util.Log;
 
 import com.example.android.wearable.timer.util.Constants;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.wearable.Wearable;
-
-import java.util.concurrent.TimeUnit;
 
 /**
  * Service class that manages notifications of the timer.
  */
-public class TimerNotificationService extends IntentService
+public class TimerNotificationService extends IntentService {
-        implements GoogleApiClient.ConnectionCallbacks,
-        GoogleApiClient.OnConnectionFailedListener {
 
     public static final String TAG = "TimerNotificationSvc";
 
@@ -94,7 +85,8 @@ public class TimerNotificationService extends IntentService
     }
 
     private void cancelCountdownNotification() {
-        NotificationManagerCompat notifyMgr = NotificationManagerCompat.from(this);
+        NotificationManager notifyMgr =
+                ((NotificationManager) getSystemService(NOTIFICATION_SERVICE));
         notifyMgr.cancel(Constants.NOTIFICATION_TIMER_COUNTDOWN);
     }
 
@@ -109,8 +101,9 @@ public class TimerNotificationService extends IntentService
                 .getService(this, 0, restartIntent, PendingIntent.FLAG_UPDATE_CURRENT);
 
         // Create notification that timer has expired.
-        NotificationManagerCompat notifyMgr = NotificationManagerCompat.from(this);
+        NotificationManager notifyMgr =
-        Notification notif = new NotificationCompat.Builder(this)
+                ((NotificationManager) getSystemService(NOTIFICATION_SERVICE));
+        Notification notif = new Notification.Builder(this)
                 .setSmallIcon(R.drawable.ic_cc_alarm)
                 .setContentTitle(getString(R.string.timer_done))
                 .setContentText(getString(R.string.timer_done))
@@ -123,15 +116,4 @@ public class TimerNotificationService extends IntentService
         notifyMgr.notify(Constants.NOTIFICATION_TIMER_EXPIRED, notif);
     }
 
-    @Override
-    public void onConnected(Bundle connectionHint) {
-    }
-
-    @Override
-    public void onConnectionSuspended(int cause) {
-    }
-
-    @Override
-    public void onConnectionFailed(ConnectionResult result) {
-    }
 }

samples/wearable/Timer/build.gradle

@@ -1,5 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         mavenCentral()

samples/wearable/WatchViewStub/Wearable/build.gradle

@@ -20,6 +20,5 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:support-v13:20.0.+"
     compile "com.google.android.support:wearable:1.0.+"
 }

samples/wearable/WatchViewStub/Wearable/src/main/AndroidManifest.xml

@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.google.wearable.watchviewstub" >
 
-    <uses-sdk android:minSdkVersion="20" android:targetSdkVersion="20" />
-
     <application
             android:allowBackup="true"
             android:icon="@drawable/ic_launcher"