Code quality warnings, small fixes

diff --git a/app/build.gradle b/app/build.gradle
index ed0441bf0d5cb015a218f37c335d69a5b41937cf..a7b6dc26aeab56e490536e1ae34e72164cbddf5a 100644 (file)
--- 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 ff469469fd676337a230dbb9ce04b7cb86ee551f..4f28a6cb6673ef599b1cde3f25606662965836b7 100644 (file)
--- 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 aff4f415e95080b78852dc945e3e1ac5e5687cb0..77ce66ea36eed3ec5c10abb7b2618ed4748e0081 100644 (file)
--- 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 fee43b59204888de14dc4610198564b1fad350da..00a29d655c2c102051afc192a7e1305cb440304f 100644 (file)
--- 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 6771c727152c1f685ea6bc444200e61ff4348a45..cbd7e98cedc6ef69ef540d17ca7e9505809e638d 100644 (file)
--- 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 dadefe85835a34a92cbd66b229af95801824e3b9..66b4dbad6e5bbcb816e7fe8e1e403c3eca187764 100644 (file)
--- 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 89dd120b85bf9fab962a0b3beb62ca95482947d7..ad254352b3f80f3b1e1b7eb2bf25c902aed058b9 100644 (file)
--- 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 eb4df80a17cb644473be6a8c5310bd90393cf988..39efb66860ae2ff92e7db401f233c283f3fd1888 100644 (file)
--- 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