From 8e10a2f122a82f5e1f985f1ad243da0fc2e8e566 Mon Sep 17 00:00:00 2001 From: MRSa Date: Fri, 2 Mar 2018 00:31:48 +0900 Subject: [PATCH] =?utf8?q?=E3=83=9C=E3=82=A4=E3=82=B9=E3=82=B3=E3=83=9E?= =?utf8?q?=E3=83=B3=E3=83=89=E3=81=A7=E3=82=B9=E3=83=88=E3=83=83=E3=83=97?= =?utf8?q?=E3=82=A6=E3=82=A9=E3=83=83=E3=83=81=E8=B5=B7=E5=8B=95=E3=81=A7?= =?utf8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= =?utf8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- wear/src/main/AndroidManifest.xml | 25 +++++++++++++++++++++- .../osdn/gokigen/joggingtimer/MainActivity.java | 21 +++++++++++++++++- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml index 3ce1159..0727ae4 100644 --- a/wear/src/main/AndroidManifest.xml +++ b/wear/src/main/AndroidManifest.xml @@ -12,6 +12,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" + android:fullBackupContent="true" android:theme="@android:style/Theme.DeviceDefault"> - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/MainActivity.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/MainActivity.java index ca8c59e..a5f88d9 100644 --- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/MainActivity.java +++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/MainActivity.java @@ -1,5 +1,6 @@ package net.osdn.gokigen.joggingtimer; +import android.content.Intent; import android.graphics.Color; import android.os.Bundle; import android.support.wearable.activity.WearableActivity; @@ -69,7 +70,16 @@ public class MainActivity extends WearableActivity implements IClickCallback, My protected void onResume() { super.onResume(); - Log.v(TAG, "onResume()"); + + // インテントを取得する + Intent intent = getIntent(); + String action = intent.getAction(); + Log.v(TAG, "onResume() : " + action); + if ((action != null)&&(action.equals("com.google.android.wearable.action.STOPWATCH"))) + { + // start a timer! + startTimer(); + } } /** @@ -240,6 +250,15 @@ public class MainActivity extends WearableActivity implements IClickCallback, My @Override public void clickedBtn1() { + startTimer(); + } + + /** + * + * + */ + private void startTimer() + { ITimerCounter timerCounter = counter; if (timerCounter != null) { -- 2.11.0