From ce49912f76eb0e000f7a691adfcbb3530d147648 Mon Sep 17 00:00:00 2001
From: MRSa <mrsa@myad.jp>
Date: Sat, 17 Mar 2018 22:40:09 +0900
Subject: [PATCH] =?utf8?q?=E3=83=AD=E3=83=83=E3=82=AF=E3=82=A2=E3=83=83?=
 =?utf8?q?=E3=83=97=E3=81=99=E3=82=8B=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92?=
 =?utf8?q?=E6=94=B9=E4=BF=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../joggingtimer/stopwatch/MainActivity.java        | 14 +++++++++++++-
 .../stopwatch/WearableActivityController.java       | 21 +++------------------
 2 files changed, 16 insertions(+), 19 deletions(-)

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 87150c8..538fd19 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
@@ -164,7 +164,7 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
     {
         super.onExitAmbient();
         Log.v(TAG, "onExitAmbient()");
-        updateTimerLabel();
+        //updateTimerLabel();
     }
 
     /**
@@ -624,6 +624,18 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
      *
      */
     @Override
+    public boolean dispatchKeyEvent(KeyEvent event)
+    {
+        Log.v(TAG, "dispatchKeyEvent() : " + event.getAction() + " (" + event.getKeyCode() + ")");
+
+        return (super.dispatchKeyEvent(event));
+    }
+
+    /*
+     *
+     *
+     */
+    @Override
     public boolean onKeyDown(int keyCode, KeyEvent event)
     {
         Log.v(TAG, "onKeyDown() : " + event.getAction() + " (" + event.getKeyCode() + ")" + keyCode);
diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/WearableActivityController.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/WearableActivityController.java
index 9a65c12..913eebc 100644
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/WearableActivityController.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/WearableActivityController.java
@@ -4,7 +4,6 @@ import android.Manifest;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
-import android.os.PowerManager;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.support.v4.app.ActivityCompat;
@@ -22,7 +21,6 @@ import net.osdn.gokigen.joggingtimer.storage.contract.TimeEntryData;
 
 import java.util.ArrayList;
 
-import static android.content.Context.POWER_SERVICE;
 import static android.content.Context.VIBRATOR_SERVICE;
 
 /**
@@ -43,7 +41,7 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
     private long recordingIndexId = -1;
 
     private Vibrator vibrator = null;
-    private PowerManager powerManager = null;
+    //private PowerManager powerManager = null;
 
 
     WearableActivityController()
@@ -89,8 +87,8 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
         // バイブレータをつかまえる
         vibrator = (Vibrator) activity.getSystemService(VIBRATOR_SERVICE);
 
-        // パワーマネージャをつかまえる
-        powerManager = (PowerManager) activity.getSystemService(POWER_SERVICE);
+        //// パワーマネージャをつかまえる
+        //powerManager = (PowerManager) activity.getSystemService(POWER_SERVICE);
     }
 
     /**
@@ -210,20 +208,7 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
     public void exitApplication(WearableActivity activity)
     {
         Log.v(TAG, "exitApplication()");
-
-        // パワーマネージャを確認し、interactive modeではない場合は、ライブビューも止めず、カメラの電源も切らない
-        if ((powerManager != null)&&(!powerManager.isInteractive()))
-        {
-            Log.v(TAG, "not interactive, keep database.");
-            return;
-        }
-
         closeDatabase();
-
-
-        //finish();
-        //finishAndRemoveTask();
-        //android.os.Process.killProcess(android.os.Process.myPid());
     }
 
     @Override
-- 
2.11.0