Import some local fixes

Change-Id: I408707a9b5474aa40755fd041169ac8503df9817

8 files changed, 35 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index 540819e..e2d90ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ language: android
 
 android:
   components:
-    - build-tools-21.1.1
+    - build-tools-21.1.2
     - android-20
     - android-21
     - extra-google-m2repository
diff --git a/Wearable/build.gradle b/Wearable/build.gradle
index 05a05a8..4b9d9bd 100644
--- a/Wearable/build.gradle
+++ b/Wearable/build.gradle
@@ -25,7 +25,7 @@ repositories {
 
 android {
     compileSdkVersion 20
-    buildToolsVersion "20.0.0"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         applicationId "com.google.samples.apps.iosched"
diff --git a/Wearable/src/main/java/com/google/samples/apps/iosched/iowear/utils/Utils.java b/Wearable/src/main/java/com/google/samples/apps/iosched/iowear/utils/Utils.java
index 8ab1ef1..91b7803 100644
--- a/Wearable/src/main/java/com/google/samples/apps/iosched/iowear/utils/Utils.java
+++ b/Wearable/src/main/java/com/google/samples/apps/iosched/iowear/utils/Utils.java
@@ -104,7 +104,7 @@ public class Utils {
      */
     public static final void LOGD(String TAG, String message) {
         if (Log.isLoggable(TAG, Log.DEBUG)) {
-            LOGD(TAG, message);
+            Log.d(TAG, message);
         }
     }
 
diff --git a/android/build.gradle b/android/build.gradle
index 737c141..f4e6d5a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -25,7 +25,7 @@ repositories {
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 14
diff --git a/android/src/main/java/com/google/samples/apps/iosched/ui/BaseActivity.java b/android/src/main/java/com/google/samples/apps/iosched/ui/BaseActivity.java
index e052865..d1b6714 100644
--- a/android/src/main/java/com/google/samples/apps/iosched/ui/BaseActivity.java
+++ b/android/src/main/java/com/google/samples/apps/iosched/ui/BaseActivity.java
@@ -1361,6 +1361,10 @@ public abstract class BaseActivity extends ActionBarActivity implements
         ImageView iconView = (ImageView) view.findViewById(R.id.icon);
         TextView titleView = (TextView) view.findViewById(R.id.title);
 
+        if (selected) {
+            view.setBackgroundResource(R.drawable.selected_navdrawer_item_background);
+        }
+
         // configure its appearance according to whether or not it's selected
         titleView.setTextColor(selected ?
                 getResources().getColor(R.color.navdrawer_text_color_selected) :
@@ -1383,7 +1387,7 @@ public abstract class BaseActivity extends ActionBarActivity implements
 
         } else {
             // Get the correct GCM key for the user. GCM key is a somewhat non-standard
-            // approach we use in this app. For more about this, check GCM.MD.
+            // approach we use in this app. For more about this, check GCM.TXT.
             final String gcmKey = AccountUtils.hasActiveAccount(this) ?
                     AccountUtils.getGcmKey(this, AccountUtils.getActiveAccountName(this)) : null;
             // Device is already registered on GCM, needs to check if it is
diff --git a/android/src/main/res/drawable/selected_navdrawer_item_background.xml b/android/src/main/res/drawable/selected_navdrawer_item_background.xml
new file mode 100644
index 0000000..88a1670
--- /dev/null
+++ b/android/src/main/res/drawable/selected_navdrawer_item_background.xml
@@ -0,0 +1,23 @@
+<!--
+  Copyright 2014 Google Inc. All rights reserved.
+
+  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.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#12000000" />
+        </shape>
+    </item>
+    <item android:drawable="?android:selectableItemBackground" />
+</layer-list>
\ No newline at end of file
diff --git a/doc/BUILDING.md b/doc/BUILDING.md
index 8f96633..7100240 100644
--- a/doc/BUILDING.md
+++ b/doc/BUILDING.md
@@ -48,7 +48,7 @@ This is a Gradle-based project that works best with [Android Studio].
        - Tools > Android SDK Platform-tools (rev 21 or above)
        - Tools > Android SDK Tools (rev 23.0.5 or above)
        - Tools > Android SDK Build-tools version 20
-       - Tools > Android SDK Build-tools version 21 (rev 21.0.2 or above)
+       - Tools > Android SDK Build-tools version 21 (rev 21.1.2 or above)
        - Android 4.4W2 > SDK Platform (API 20)
        - Android 5.0 > SDK Platform (API 21)
        - Extras > Android Support Repository
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 137e0e6..2877ca1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Jun 07 00:06:01 EDT 2014
+#Tue Dec 02 14:11:25 EST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip