Merge pull request google#1 from google/master

update repo

.travis.yml

@@ -16,19 +16,19 @@ language: android
 
 android:
   components:
-    - build-tools-20.0.0
-    - andorid-19
+    - build-tools-21.1.1
     - android-20
+    - android-21
     - extra-google-m2repository
     - extra-android-m2repository
-    - sys-img-armeabi-v7a-android-20
+    - sys-img-armeabi-v7a-android-21
 
 notifications:
   email: false
 
 env:
   matrix:
-    - ANDROID_TARGET=android-19  ANDROID_ABI=armeabi-v7a
+    - ANDROID_TARGET=android-21  ANDROID_ABI=armeabi-v7a
 
 before_install:
   - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI

README.md

@@ -9,16 +9,11 @@ This project is the Android app for the conference. The app supports devices
 running Android 4.0+, and is optimized for phones and tablets of all shapes
 and sizes. It also contains an Android Wear integration.
 
-<h2>Android L Developer Preview</h2>
+<h2>Android 5.0 and Material Design</h2>
 
 ![Screenshot](art/hero.png)
 
-We have updated the I/O app with [material design](http://www.google.com/design/spec) and the [Android L Developer Preview](http://developer.android.com/preview/index.html)! For a quick preview of the new tactile surfaces, animated touch feedback, bold use of color, and refreshed iconography by checking out this [teaser video](https://www.youtube.com/watch?v=mCgteBXYxQc) or download the preview APK below.
-
-<a href="../../raw/master/binaries/iosched-lpreview.apk"><b>Download the I/O app APK for Android L Preview</b></a>
-
-To run this APK, you will need a device set up with the Android L Preview system image. For
-more information, please refer to the [Android L Developer Preview page](http://developer.android.com/preview/index.html).
+We have updated the I/O app with [material design](http://www.google.com/design/spec) and the Android 5.0 SDK! For a quick preview of the new tactile surfaces, animated touch feedback, bold use of color, and refreshed iconography, check out this [teaser video](https://www.youtube.com/watch?v=mCgteBXYxQc).
 
 <h2>Source</h2>
 

Wearable/build.gradle

@@ -36,16 +36,16 @@ android {
     }
     signingConfigs {
         debug {
-            storeFile file("../android/debug.keystore")
-            storePassword "android"
-            keyAlias "androiddebugkey"
-            keyPassword "android"
+            storeFile file(iosched14_android_debugkey_storefile)
+            storePassword iosched14_android_debugkey_storePassword
+            keyAlias iosched14_android_debugkey_keyAlias
+            keyPassword iosched14_android_debugkey_keyPassword
         }
         release {
-            storeFile file("../android/debug.keystore")
-            storePassword "android"
-            keyAlias "androiddebugkey"
-            keyPassword "android"
+            storeFile file(iosched14_android_releasekey_storefile)
+            storePassword iosched14_android_releasekey_storePassword
+            keyAlias iosched14_android_releasekey_keyAlias
+            keyPassword iosched14_android_releasekey_keyPassword
         }
     }
 
@@ -65,8 +65,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v13:+'
+    compile 'com.android.support:support-v13:21.+'
     compile 'com.google.android.support:wearable:+'
-    compile 'com.google.android.gms:play-services-wearable:+'
+    compile 'com.google.android.gms:play-services-wearable:6.1.+'
 } 
 

android/build.gradle

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-lpreview = hasProperty('lpreview')
-
 apply plugin: 'com.android.application'
 
 repositories {
@@ -26,15 +24,12 @@ repositories {
 }
 
 android {
-    compileSdkVersion lpreview ? "android-L" : 19
-    buildToolsVersion "20.0.0"
-
-    productFlavors { lpreview ? lpreview{} : classic{} }
+    compileSdkVersion 21
+    buildToolsVersion "21.1.1"
 
-    defaultConfig lpreview ? {} : {
-        // Non-L-preview configuration
+    defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 19
+        targetSdkVersion 21
     }
 
     signingConfigs {
@@ -58,7 +53,7 @@ android {
             signingConfig signingConfigs.debug
         }
         release {
-            runProguard true
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), file('proguard-project.txt')
             signingConfig signingConfigs.release
         }
@@ -75,10 +70,10 @@ android {
 
 dependencies {
     wearApp project(':Wearable')
-    compile 'com.google.android.gms:play-services:5+' 
-    compile 'com.android.support:support-v13:20.+'
-    compile 'com.android.support:support-v4:20.+'
-    compile 'com.google.android.apps.dashclock:dashclock-api:+'
+    compile 'com.google.android.gms:play-services:6.1.+'
+    compile 'com.android.support:support-v13:21.+'
+    compile 'com.android.support:appcompat-v7:21.+'
+    compile 'com.android.support:cardview-v7:21.+'
     compile 'com.google.code.gson:gson:2.+'
     compile('com.google.api-client:google-api-client:1.+') {
         exclude group: 'xpp3', module: 'shared'