diff options
12 files changed, 50 insertions, 134 deletions
diff --git a/connectivity/bluetooth/BluetoothChat/Application/src/main/java/com/example/android/bluetoothchat/BluetoothChatService.java b/connectivity/bluetooth/BluetoothChat/Application/src/main/java/com/example/android/bluetoothchat/BluetoothChatService.java index b88b160d..a1e7cc01 100644 --- a/connectivity/bluetooth/BluetoothChat/Application/src/main/java/com/example/android/bluetoothchat/BluetoothChatService.java +++ b/connectivity/bluetooth/BluetoothChat/Application/src/main/java/com/example/android/bluetoothchat/BluetoothChatService.java @@ -473,7 +473,7 @@ public class BluetoothChatService { int bytes; // Keep listening to the InputStream while connected - while (true) { + while (mState == STATE_CONNECTED) { try { // Read from the InputStream bytes = mmInStream.read(buffer); diff --git a/ui/views/NavigationDrawer/README.md b/ui/views/NavigationDrawer/README.md index 093ef667..ce9cfe2c 100644 --- a/ui/views/NavigationDrawer/README.md +++ b/ui/views/NavigationDrawer/README.md @@ -8,8 +8,8 @@ support library. Pre-requisites -------------- -- Android SDK v21 -- Android Build Tools v23.0.0 +- Android SDK v23 +- Android Build Tools v23.0.2 - Android Support Repository Getting Started diff --git a/ui/views/NavigationDrawer/template-params.xml b/ui/views/NavigationDrawer/template-params.xml index 559f32e4..e85b0ddd 100644 --- a/ui/views/NavigationDrawer/template-params.xml +++ b/ui/views/NavigationDrawer/template-params.xml @@ -26,13 +26,13 @@ <!-- change minSdk if needed--> <minSdk>21</minSdk> - <compileSdkVersion>21</compileSdkVersion> + <compileSdkVersion>23</compileSdkVersion> - <dependency>com.android.support:support-v13:21.0.2</dependency> - <dependency>com.android.support:appcompat-v7:21.0.2</dependency> - <dependency>com.android.support:recyclerview-v7:21.0.2</dependency> - <dependency>com.android.support:cardview-v7:21.0.2</dependency> + <dependency>com.android.support:support-v13:23.1.1</dependency> + <dependency>com.android.support:appcompat-v7:23.1.1</dependency> + <dependency>com.android.support:recyclerview-v7:23.1.1</dependency> + <dependency>com.android.support:cardview-v7:23.1.1</dependency> <strings> <intro> diff --git a/wearable/wear/AgendaData/template-params.xml b/wearable/wear/AgendaData/template-params.xml index e5bdd228..a6b48821 100644 --- a/wearable/wear/AgendaData/template-params.xml +++ b/wearable/wear/AgendaData/template-params.xml @@ -26,7 +26,7 @@ <targetSdkVersion>23</targetSdkVersion> <targetSdkVersionWear>22</targetSdkVersionWear> - <dependency>com.android.support:design:23.1.0</dependency> + <dependency>com.android.support:design:23.1.1</dependency> <wearable> <has_handheld_app>true</has_handheld_app> diff --git a/wearable/wear/Geofencing/template-params.xml b/wearable/wear/Geofencing/template-params.xml index cd576131..354e55ce 100644 --- a/wearable/wear/Geofencing/template-params.xml +++ b/wearable/wear/Geofencing/template-params.xml @@ -26,7 +26,7 @@ <targetSdkVersion>22</targetSdkVersion> <targetSdkVersionWear>22</targetSdkVersionWear> - <dependency>com.google.android.gms:play-services-location:8.3.0</dependency> + <dependency>com.google.android.gms:play-services-location</dependency> <wearable> <has_handheld_app>true</has_handheld_app> diff --git a/wearable/wear/RuntimePermissionsWear/Shared/.gitignore b/wearable/wear/RuntimePermissionsWear/Shared/.gitignore new file mode 100644 index 00000000..6eb878d4 --- /dev/null +++ b/wearable/wear/RuntimePermissionsWear/Shared/.gitignore @@ -0,0 +1,16 @@ +# Copyright 2013 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +src/template/ +src/common/ +build.gradle diff --git a/wearable/wear/RuntimePermissionsWear/Shared/build.gradle b/wearable/wear/RuntimePermissionsWear/Shared/build.gradle deleted file mode 100644 index daea9d01..00000000 --- a/wearable/wear/RuntimePermissionsWear/Shared/build.gradle +++ /dev/null @@ -1,52 +0,0 @@ - -buildscript { - repositories { - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' - } -} - -apply plugin: 'android-library' - -repositories { - jcenter() -} - - - -// The sample build uses multiple directories to -// keep boilerplate and common code separate from -// the main sample code. -List<String> dirs = [ - 'main', // main sample code; look here for the interesting stuff. - 'common', // components that are reused by multiple samples - 'template'] // boilerplate code that is generated by the sample template process - -android { - compileSdkVersion 23 - - buildToolsVersion "23.0.2" - - defaultConfig { - minSdkVersion 18 - targetSdkVersion 23 - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - - sourceSets { - main { - dirs.each { dir -> - java.srcDirs "src/${dir}/java" - res.srcDirs "src/${dir}/res" - } - } - - } -} diff --git a/wearable/wear/RuntimePermissionsWear/Wearable/.gitignore b/wearable/wear/RuntimePermissionsWear/Wearable/.gitignore new file mode 100644 index 00000000..6eb878d4 --- /dev/null +++ b/wearable/wear/RuntimePermissionsWear/Wearable/.gitignore @@ -0,0 +1,16 @@ +# Copyright 2013 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +src/template/ +src/common/ +build.gradle diff --git a/wearable/wear/RuntimePermissionsWear/Wearable/build.gradle b/wearable/wear/RuntimePermissionsWear/Wearable/build.gradle deleted file mode 100644 index 8048bbd3..00000000 --- a/wearable/wear/RuntimePermissionsWear/Wearable/build.gradle +++ /dev/null @@ -1,64 +0,0 @@ - -buildscript { - repositories { - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' - } -} - -apply plugin: 'com.android.application' - - - -repositories { - jcenter() -} - -dependencies { - compile 'com.google.android.gms:play-services-wearable:8.1.0' - compile 'com.android.support:support-v13:23.1.0' - compile 'com.google.android.support:wearable:1.3.0' - compile project(':Shared') -} - -// The sample build uses multiple directories to -// keep boilerplate and common code separate from -// the main sample code. -List<String> dirs = [ - 'main', // main sample code; look here for the interesting stuff. - 'common', // components that are reused by multiple samples - 'template'] // boilerplate code that is generated by the sample template process - -android { - compileSdkVersion 23 - - buildToolsVersion "23.0.2" - - defaultConfig { - versionCode 1 - versionName "1.0" - - targetSdkVersion 23 - - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - - sourceSets { - main { - dirs.each { dir -> - java.srcDirs "src/${dir}/java" - res.srcDirs "src/${dir}/res" - } - } - androidTest.setRoot('tests') - androidTest.java.srcDirs = ['tests/src'] - - } -} diff --git a/wearable/wear/RuntimePermissionsWear/template-params.xml b/wearable/wear/RuntimePermissionsWear/template-params.xml index 395097a5..9c2d4f6b 100644 --- a/wearable/wear/RuntimePermissionsWear/template-params.xml +++ b/wearable/wear/RuntimePermissionsWear/template-params.xml @@ -28,8 +28,8 @@ <has_handheld_app>true</has_handheld_app> </wearable> - <dependency>com.android.support:appcompat-v7:23.1.0</dependency> - <dependency>com.android.support:design:23.1.0</dependency> + <dependency>com.android.support:appcompat-v7:23.1.1</dependency> + <dependency>com.android.support:design:23.1.1</dependency> <provided_dependency_wearable>com.google.android.wearable:wearable:1.0.0</provided_dependency_wearable> <strings> diff --git a/wearable/wear/SpeedTracker/template-params.xml b/wearable/wear/SpeedTracker/template-params.xml index 0817916d..982e1b09 100644 --- a/wearable/wear/SpeedTracker/template-params.xml +++ b/wearable/wear/SpeedTracker/template-params.xml @@ -30,10 +30,10 @@ <has_handheld_app>true</has_handheld_app> </wearable> - <dependency>com.android.support:design:23.0.1</dependency> + <dependency>com.android.support:design:23.1.1</dependency> - <dependency>com.google.android.gms:play-services-location:8.3.0</dependency> - <dependency_wearable>com.google.android.gms:play-services-location:8.3.0</dependency_wearable> + <dependency>com.google.android.gms:play-services-location</dependency> + <dependency_wearable>com.google.android.gms:play-services-location</dependency_wearable> <strings> <intro> diff --git a/wearable/wear/WatchFace/template-params.xml b/wearable/wear/WatchFace/template-params.xml index 15df71a3..e339fe26 100644 --- a/wearable/wear/WatchFace/template-params.xml +++ b/wearable/wear/WatchFace/template-params.xml @@ -26,10 +26,10 @@ <targetSdkVersion>23</targetSdkVersion> <targetSdkVersionWear>23</targetSdkVersionWear> - <dependency_wearable>com.android.support:palette-v7:23.1.0</dependency_wearable> + <dependency_wearable>com.android.support:palette-v7:23.1.1</dependency_wearable> <dependency>com.google.android.support:wearable:1.3.0</dependency> - <dependency>com.google.android.gms:play-services-fitness:8.3.0</dependency> - <dependency_wearable>com.google.android.gms:play-services-fitness:8.3.0</dependency_wearable> + <dependency>com.google.android.gms:play-services-fitness</dependency> + <dependency_wearable>com.google.android.gms:play-services-fitness</dependency_wearable> <wearable> <has_handheld_app>true</has_handheld_app> |