From d664c8400542b9a67bdbfb0183691edbb6dd35af Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwf@cs.jhu.edu>
Date: Sat, 17 Sep 2016 15:45:37 -0400
Subject: [PATCH] Code quality warnings, small fixes

---
 app/build.gradle                                              | 2 +-
 app/src/main/res/layout/activity_main.xml                     | 4 ++--
 build.gradle                                                  | 2 +-
 .../java/com/acmetensortoys/watchviz/vizlib/AudioCanvas.java  | 1 -
 .../com/acmetensortoys/watchviz/vizlib/AudioProvider.java     | 1 -
 .../java/com/acmetensortoys/watchviz/vizlib/Rendering.java    | 2 +-
 .../com/acmetensortoys/watchviz/vizlib/rendering/Grid.java    | 4 ++--
 .../acmetensortoys/watchviz/vizlib/rendering/WholeMax.java    | 2 +-
 8 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ed0441b..a7b6dc2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,7 +25,7 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.google.android.support:wearable:2.0.0-alpha1'
-    compile 'com.google.android.gms:play-services-wearable:9.0.2'
+    // compile 'com.google.android.gms:play-services-wearable:9.2.1'
     compile project(':vizlib')
 }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ff46946..4f28a6c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,8 +6,8 @@
     android:layout_height="match_parent"
     tools:context="com.acmetensortoys.watchviz.MainActivity"
     tools:deviceIds="wear"
-    android:id="@+id/outermost"
-    android:background="@color/blue">
+    android:id="@+id/outermost">
+    <!-- Possible overdraw warning if this is added?  android:background="@color/blue" -->
 
     <!-- Argh.  Oh boy did I lose a lot of time to this.  The GridViewPager
     needs to be the first child in the tree so that it gets drawn first.
diff --git a/build.gradle b/build.gradle
index aff4f41..77ce66e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/AudioCanvas.java b/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/AudioCanvas.java
index fee43b5..00a29d6 100644
--- a/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/AudioCanvas.java
+++ b/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/AudioCanvas.java
@@ -70,7 +70,6 @@ public class AudioCanvas implements Renderer {
             @Override
             public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
                 Log.d("shc:"+debug1, "Surface Changed:"+format+":"+width+":"+height);
-                ;
             }
             @Override
             public void surfaceDestroyed(SurfaceHolder holder) {
diff --git a/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/AudioProvider.java b/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/AudioProvider.java
index 6771c72..cbd7e98 100644
--- a/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/AudioProvider.java
+++ b/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/AudioProvider.java
@@ -100,7 +100,6 @@ public class AudioProvider {
                     audioSourceThread.join();
                 } catch (InterruptedException ie) {
                     Log.w("AudioProvider", "join interrupted");
-                    ;
                 } finally {
                     audioSourceThread = null;
                 }
diff --git a/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/Rendering.java b/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/Rendering.java
index dadefe8..66b4dba 100644
--- a/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/Rendering.java
+++ b/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/Rendering.java
@@ -6,5 +6,5 @@ import android.graphics.Canvas;
 public abstract class Rendering {
     public Rendering(SharedPreferences lsp, SharedPreferences gsp) {}
     abstract public void render(Canvas c, float[] audio, float[] fft);
-    public void onClick() { ; }
+    public void onClick() { }
 }
\ No newline at end of file
diff --git a/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/rendering/Grid.java b/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/rendering/Grid.java
index 89dd120..ad25435 100644
--- a/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/rendering/Grid.java
+++ b/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/rendering/Grid.java
@@ -21,7 +21,7 @@ public final class Grid extends Rendering {
     // to six seconds, which seems fine.
     private Avg meta = new Avg(7);
 
-    // Need to hold on to this explicitly because the SharedPreference object only hold
+    // Need to hold on to this explicitly because the SharedPreference object only holds
     // on to it weakly.  That's great, thanks and all, but it's somewhat unexpected.
     private SharedPreferences.OnSharedPreferenceChangeListener ospcl
             = new SharedPreferences.OnSharedPreferenceChangeListener() {
@@ -92,4 +92,4 @@ public final class Grid extends Rendering {
 
         meta.update(thisFrameSum/64);
     }
-};
+}
diff --git a/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/rendering/WholeMax.java b/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/rendering/WholeMax.java
index eb4df80..39efb66 100644
--- a/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/rendering/WholeMax.java
+++ b/vizlib/src/main/java/com/acmetensortoys/watchviz/vizlib/rendering/WholeMax.java
@@ -50,4 +50,4 @@ public final class WholeMax extends Rendering {
             cv.drawText(String.format(Locale.US, "%1$8.1E @ %2$d", msamp, mix), 30, 30, dbp);
         }
     }
-};
\ No newline at end of file
+}
\ No newline at end of file
-- 
2.50.1