Merge pull request #32 from prprhyt/master

完全にプロセスが終了しない問題を解決
jagsc · Mar 10, 2016 · 27ed63d · 27ed63d
2 parents 2c0b43a + 4df83c0
commit 27ed63d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/wear/src/main/java/jagsc/org/abc2016springclient/MainActivity.java b/wear/src/main/java/jagsc/org/abc2016springclient/MainActivity.java
@@ -159,6 +159,7 @@ public void onClick(View v){
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         MainActivity.this.moveTaskToBack(true);
+                        android.os.Process.killProcess(android.os.Process.myPid());
                     }
                 });
                 alertdialog.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {

diff --git a/wear/src/main/java/jagsc/org/abc2016springclient/WearPlayingActivity.java b/wear/src/main/java/jagsc/org/abc2016springclient/WearPlayingActivity.java
@@ -121,6 +121,7 @@ public void onClick(View v){//デバッグ用
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         WearPlayingActivity.this.moveTaskToBack(true);
+                        android.os.Process.killProcess(android.os.Process.myPid());
                     }
                 });
                 alertdialog.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {

diff --git a/wear/src/main/res/layout/activity_playing_wear.xml b/wear/src/main/res/layout/activity_playing_wear.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent" android:keepScreenOn="true">
 
     <GridLayout
         android:layout_width="match_parent"

diff --git a/wear/src/main/res/layout/activity_title_wear.xml b/wear/src/main/res/layout/activity_title_wear.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent" android:keepScreenOn="true">
 
     <ImageView
         android:layout_width="match_parent"