LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '11b32f038486390d91aafb56c6204666267db89f':
  Clean up samples (gradle files and Compat stuff in wearable code).
This commit is contained in:
Andy Wickham
2014-06-24 21:00:23 +00:00
committed by Android Git Automerger
parent b3ae91650a 11b32f0384
commit ad2f26b93b
74 changed files with 97 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/wearable/AgendaData/Application/build.gradle
View File

@@ -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')
}
}

2
samples/wearable/AgendaData/Application/src/main/AndroidManifest.xml
View File

@@ -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" />

3
samples/wearable/AgendaData/Wearable/build.gradle
View File

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

2
samples/wearable/AgendaData/Wearable/src/main/AndroidManifest.xml
View File

@@ -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"

4
samples/wearable/DataLayer/Application/build.gradle
View File

@@ -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')
}
}

1
samples/wearable/DataLayer/Application/src/main/AndroidManifest.xml
View File

@@ -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

9
samples/wearable/DataLayer/Wearable/build.gradle
View File

@@ -1,12 +1,12 @@
apply plugin: 'android'
android {
compileSdkVersion 19
compileSdkVersion 20
buildToolsVersion '20'
defaultConfig {
minSdkVersion 19
targetSdkVersion 19
minSdkVersion 20
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.android.support:support-v13:20.0.+"
compile 'com.google.android.gms:play-services-wearable:+'
}

2
samples/wearable/DataLayer/Wearable/src/main/AndroidManifest.xml
View File

@@ -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"

6
samples/wearable/DelayedConfirmation/Application/build.gradle
View File

@@ -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')
}
}

2
samples/wearable/DelayedConfirmation/Application/src/main/AndroidManifest.xml
View File

@@ -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"

3
samples/wearable/DelayedConfirmation/Wearable/build.gradle
View File

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

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

@@ -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();
}

24
samples/wearable/ElizaChat/Application/build.gradle Normal file
View File

@@ -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.+"
}

4
samples/wearable/ElizaChat/proguard-rules.txt → samples/wearable/ElizaChat/Application/proguard-rules.txt
View File

@@ -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
#}

14
samples/wearable/ElizaChat/Application/project.properties Normal file
View File

@@ -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

2
samples/wearable/ElizaChat/src/main/AndroidManifest.xml → samples/wearable/ElizaChat/Application/src/main/AndroidManifest.xml
View File

@@ -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"

0
samples/wearable/ElizaChat/src/main/java/com/example/android/wearable/elizachat/ElizaResponder.java → samples/wearable/ElizaChat/Application/src/main/java/com/example/android/wearable/elizachat/ElizaResponder.java
View File

3
samples/wearable/ElizaChat/src/main/java/com/example/android/wearable/elizachat/MainActivity.java → samples/wearable/ElizaChat/Application/src/main/java/com/example/android/wearable/elizachat/MainActivity.java
View File

@@ -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;

2
samples/wearable/ElizaChat/src/main/java/com/example/android/wearable/elizachat/ResponderService.java → samples/wearable/ElizaChat/Application/src/main/java/com/example/android/wearable/elizachat/ResponderService.java
View File

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

0
samples/wearable/ElizaChat/src/main/res/drawable-hdpi/ic_full_reply.png → samples/wearable/ElizaChat/Application/src/main/res/drawable-hdpi/ic_full_reply.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
samples/wearable/ElizaChat/src/main/res/drawable-mdpi/ic_full_reply.png → samples/wearable/ElizaChat/Application/src/main/res/drawable-mdpi/ic_full_reply.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
samples/wearable/ElizaChat/src/main/res/drawable-nodpi/bg_eliza.png → samples/wearable/ElizaChat/Application/src/main/res/drawable-nodpi/bg_eliza.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 366 KiB

After

Width:  |  Height:  |  Size: 366 KiB

0
samples/wearable/ElizaChat/src/main/res/drawable-xhdpi/ic_full_reply.png → samples/wearable/ElizaChat/Application/src/main/res/drawable-xhdpi/ic_full_reply.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
samples/wearable/ElizaChat/src/main/res/layout/activity_main.xml → samples/wearable/ElizaChat/Application/src/main/res/layout/activity_main.xml
View File

0
samples/wearable/ElizaChat/src/main/res/menu/main.xml → samples/wearable/ElizaChat/Application/src/main/res/menu/main.xml
View File

0
samples/wearable/ElizaChat/src/main/res/mipmap-hdpi/ic_app_eliza.png → samples/wearable/ElizaChat/Application/src/main/res/mipmap-hdpi/ic_app_eliza.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

0
samples/wearable/ElizaChat/src/main/res/mipmap-mdpi/ic_app_eliza.png → samples/wearable/ElizaChat/Application/src/main/res/mipmap-mdpi/ic_app_eliza.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

0
samples/wearable/ElizaChat/src/main/res/mipmap-xhdpi/ic_app_eliza.png → samples/wearable/ElizaChat/Application/src/main/res/mipmap-xhdpi/ic_app_eliza.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
samples/wearable/ElizaChat/src/main/res/mipmap-xxhdpi/ic_app_eliza.png → samples/wearable/ElizaChat/Application/src/main/res/mipmap-xxhdpi/ic_app_eliza.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
samples/wearable/ElizaChat/src/main/res/mipmap-xxxhdpi/ic_app_eliza.png → samples/wearable/ElizaChat/Application/src/main/res/mipmap-xxxhdpi/ic_app_eliza.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
samples/wearable/ElizaChat/src/main/res/values/dimens.xml → samples/wearable/ElizaChat/Application/src/main/res/values/dimens.xml
View File

0
samples/wearable/ElizaChat/src/main/res/values/strings.xml → samples/wearable/ElizaChat/Application/src/main/res/values/strings.xml
View File

0
samples/wearable/ElizaChat/src/main/res/values/styles.xml → samples/wearable/ElizaChat/Application/src/main/res/values/styles.xml
View File

27
samples/wearable/ElizaChat/build.gradle
View File

@@ -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.+"
}

1
samples/wearable/ElizaChat/settings.gradle Normal file
View File

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

2
samples/wearable/EmbeddedApp/Application/build.gradle
View File

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

6
samples/wearable/FindMyPhone/Application/build.gradle
View File

@@ -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')
}
}

2
samples/wearable/FindMyPhone/Application/src/main/AndroidManifest.xml
View File

@@ -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"

3
samples/wearable/FindMyPhone/Wearable/build.gradle
View File

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

1
samples/wearable/FindMyPhone/Wearable/src/main/AndroidManifest.xml
View File

@@ -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

2
samples/wearable/FindMyPhone/build.gradle
View File

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

1
samples/wearable/Flashlight/Wearable/build.gradle
View File

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

2
samples/wearable/Flashlight/Wearable/src/main/AndroidManifest.xml
View File

@@ -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"

2
samples/wearable/Flashlight/build.gradle
View File

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

6
samples/wearable/Geofencing/Application/build.gradle
View File

@@ -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')
}
}

2
samples/wearable/Geofencing/Application/src/main/AndroidManifest.xml
View File

@@ -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

3
samples/wearable/Geofencing/Wearable/build.gradle
View File

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

2
samples/wearable/Geofencing/Wearable/src/main/AndroidManifest.xml
View File

@@ -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"

1
samples/wearable/GridViewPager/Wearable/build.gradle
View File

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

8
samples/wearable/GridViewPager/Wearable/src/main/AndroidManifest.xml
View File

@@ -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"
android:versionCode="1"
android:versionName="1.0" >
<uses-sdk
android:minSdkVersion="20"
android:targetSdkVersion="20" />
package="com.example.android.wearable.gridviewpager" >
<application
android:allowBackup="true"

3
samples/wearable/JumpingJack/Wearable/build.gradle
View File

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

2
samples/wearable/JumpingJack/build.gradle
View File

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

4
samples/wearable/Notifications/Application/build.gradle
View File

@@ -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')
}
}

2
samples/wearable/Notifications/Application/src/main/AndroidManifest.xml
View File

@@ -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"

1
samples/wearable/Notifications/Wearable/build.gradle
View File

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

2
samples/wearable/Notifications/Wearable/src/main/AndroidManifest.xml
View File

@@ -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"

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

@@ -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();
}

4
samples/wearable/Quiz/Application/build.gradle
View File

@@ -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"
}

2
samples/wearable/Quiz/Application/src/main/AndroidManifest.xml
View File

@@ -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"

3
samples/wearable/Quiz/Wearable/build.gradle
View File

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

4
samples/wearable/Quiz/Wearable/src/main/AndroidManifest.xml
View File

@@ -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"

2
samples/wearable/Quiz/build.gradle
View File

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

2
samples/wearable/RecipeAssistant/Application/build.gradle
View File

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

6
samples/wearable/RecipeAssistant/Application/src/main/AndroidManifest.xml
View File

@@ -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"
android:versionCode="1"
android:versionName="1.0" >
<uses-sdk android:minSdkVersion="18" android:targetSdkVersion="19" />
package="com.example.android.wearable.recipeassistant" >
<application
android:allowBackup="true"

2
samples/wearable/RecipeAssistant/build.gradle
View File

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

1
samples/wearable/SkeletonWearableApp/Wearable/build.gradle
View File

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

2
samples/wearable/SynchronizedNotifications/Application/build.gradle
View File

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

2
samples/wearable/Timer/Wearable/build.gradle
View File

@@ -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.+"
}

9
samples/wearable/Timer/Wearable/src/main/AndroidManifest.xml
View File

@@ -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">
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
android:theme="@android:style/Theme.DeviceDefault.Light"
android:allowBackup="true">
<!-- Timer components -->
<activity android:name=".SetTimerActivity">

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

@@ -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
implements AdapterView.OnItemClickListener, GoogleApiClient.ConnectionCallbacks,
GoogleApiClient.OnConnectionFailedListener {
public class SetTimerActivity extends Activity implements AdapterView.OnItemClickListener {
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) {
}
}

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

@@ -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
implements GoogleApiClient.ConnectionCallbacks,
GoogleApiClient.OnConnectionFailedListener {
public class TimerNotificationService extends IntentService {
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);
Notification notif = new NotificationCompat.Builder(this)
NotificationManager notifyMgr =
((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) {
}
}

2
samples/wearable/Timer/build.gradle
View File

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

1
samples/wearable/WatchViewStub/Wearable/build.gradle
View File

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

2
samples/wearable/WatchViewStub/Wearable/src/main/AndroidManifest.xml
View File

@@ -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"