From: MRSa <mrsa@myad.jp>
Date: Thu, 26 Jul 2018 14:58:31 +0000 (+0900)
Subject: LAPボタンのチャタリング防止をハードボタンでも適用するようにした。
X-Git-Url: http://git.osdn.net/view?p=gokigen%2FJoggingTimer.git;a=commitdiff_plain;h=d395519a8cc934b6d90d44bea85a7956f91d1ff4

LAPボタンのチャタリング防止をハードボタンでも適用するようにした。
roundのスクロールバー表示を調整。
---

diff --git a/build.gradle b/build.gradle
index 1a3d812..43c0708 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/mobile/build.gradle b/mobile/build.gradle
index b6729b3..8fe3353 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    buildToolsVersion "28.0.0"
     defaultConfig {
         applicationId "net.osdn.gokigen.joggingtimer"
         minSdkVersion 14  // 14
         targetSdkVersion 27
-        versionCode 100022
-        versionName "1.0.2"
+        versionCode 100032
+        versionName "1.0.3"
     }
     buildTypes {
         release {
diff --git a/wear/build.gradle b/wear/build.gradle
index 9496093..8eb2230 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    buildToolsVersion "28.0.0"
     defaultConfig {
         applicationId "net.osdn.gokigen.joggingtimer"
         minSdkVersion 23
         targetSdkVersion 27
-        versionCode 100021
-        versionName "1.0.2"
+        versionCode 100031
+        versionName "1.0.3"
     }
     buildTypes {
         release {
@@ -21,7 +21,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.google.android.support:wearable:2.3.0'
-    implementation 'com.google.android.gms:play-services-wearable:15.0.0'
+    implementation 'com.google.android.gms:play-services-wearable:15.0.1'
     implementation 'com.android.support:percent:27.1.1'
     implementation 'com.android.support:support-v4:27.1.1'
     implementation 'com.android.support:recyclerview-v7:27.1.1'
diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/recordlist/ListActivity.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/recordlist/ListActivity.java
index ace7404..3b17ac5 100644
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/recordlist/ListActivity.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/recordlist/ListActivity.java
@@ -55,8 +55,8 @@ public class ListActivity extends WearableActivity implements IDetailLauncher, R
             summaryAdapter = new RecordSummaryAdapter();
             WearableLinearLayoutManager layoutManager = new WearableLinearLayoutManager(this);
 
-            //view.setCircularScrollingGestureEnabled(getResources().getConfiguration().isScreenRound());
-            view.setCircularScrollingGestureEnabled(false);
+            view.setCircularScrollingGestureEnabled(getResources().getConfiguration().isScreenRound());
+            //view.setCircularScrollingGestureEnabled(false);
 
             DividerItemDecoration dividerDecoration = new DividerItemDecoration(view.getContext(), layoutManager.getOrientation());
 
diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
index 0d44f46..36345f7 100644
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
@@ -303,7 +303,7 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
                 {
                     Log.v(TAG, "startTimer() LAP TIME");
                     long currentElapsedTime = timerCounter.getCurrentElapsedTime();
-                    // if (currentElapsedTime > 3000)  // チャタリング防止（ラップタイムとして、３秒以内は記録しないようにする）
+                    if (currentElapsedTime > 3000)  // チャタリング防止（ラップタイムとして、３秒以内は記録しないようにする）
                     {
                         currentLapCount++;
                         long lapTime = timerCounter.timeStamp();