Skip to content

Commit 27ed63d

Browse files
committed
Merge pull request #32 from prprhyt/master
完全にプロセスが終了しない問題を解決
2 parents 2c0b43a + 4df83c0 commit 27ed63d

4 files changed

Lines changed: 4 additions & 2 deletions

File tree

wear/src/main/java/jagsc/org/abc2016springclient/MainActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ public void onClick(View v){
159159
@Override
160160
public void onClick(DialogInterface dialog, int which) {
161161
MainActivity.this.moveTaskToBack(true);
162+
android.os.Process.killProcess(android.os.Process.myPid());
162163
}
163164
});
164165
alertdialog.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {

wear/src/main/java/jagsc/org/abc2016springclient/WearPlayingActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ public void onClick(View v){//デバッグ用
121121
@Override
122122
public void onClick(DialogInterface dialog, int which) {
123123
WearPlayingActivity.this.moveTaskToBack(true);
124+
android.os.Process.killProcess(android.os.Process.myPid());
124125
}
125126
});
126127
alertdialog.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {

wear/src/main/res/layout/activity_playing_wear.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:orientation="vertical" android:layout_width="match_parent"
4-
android:layout_height="match_parent">
4+
android:layout_height="match_parent" android:keepScreenOn="true">
55

66
<GridLayout
77
android:layout_width="match_parent"

wear/src/main/res/layout/activity_title_wear.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:orientation="vertical" android:layout_width="match_parent"
4-
android:layout_height="match_parent">
4+
android:layout_height="match_parent" android:keepScreenOn="true">
55

66
<ImageView
77
android:layout_width="match_parent"

0 commit comments

Comments
 (0)