add "Reboot after finish" and "Disable" functionHEADmaster

5 files changed, 38 insertions, 19 deletions

diff --git a/app/app-release.apk b/app/app-release.apk
index d0dd786..aa0420e 100644
--- a/app/app-release.apk
+++ b/app/app-release.apk
diff --git a/app/build.gradle b/app/build.gradle
index d09a4b6..789e3f8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "kh.android.freeformenabler"
         minSdkVersion 24
         targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/java/kh/android/freeformenabler/Main.java b/app/src/main/java/kh/android/freeformenabler/Main.java
index 078052d..f37df01 100644
--- a/app/src/main/java/kh/android/freeformenabler/Main.java
+++ b/app/src/main/java/kh/android/freeformenabler/Main.java
@@ -7,6 +7,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.widget.Switch;
 
 import eu.chainfire.libsuperuser.Shell;
 
@@ -24,29 +25,43 @@ public class Main extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        final Switch sw = new Switch(this);
+        sw.setText(R.string.action_reboot);
+        sw.setChecked(true);
+        sw.setPadding(50, 50, 50, 50);
         new AlertDialog.Builder(this)
                 .setTitle(R.string.app_name)
                 .setMessage(R.string.text)
+                .setView(sw)
                 .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
                         Shell.SU.run("settings put global enable_freeform_support 1");
-                        Shell.SU.run("reboot");
+                        if (sw.isChecked())
+                            Shell.SU.run("reboot");
+                    }
+                })
+                .setNegativeButton(R.string.action_disable, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        Shell.SU.run("settings put global enable_freeform_support 0");
+                        if (sw.isChecked())
+                            Shell.SU.run("reboot");
                     }
                 }).setOnDismissListener(new DialogInterface.OnDismissListener() {
-            @Override
-            public void onDismiss(DialogInterface dialogInterface) {
-                finish();
-            }
-        }).setNegativeButton("CODE", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-                try {
-                    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/liangyuteng0927/FreeFormEnabler")));
-                } catch (ActivityNotFoundException e) {
-                    e.printStackTrace();
-                }
-            }
-        }).show();
+                    @Override
+                    public void onDismiss(DialogInterface dialogInterface) {
+                        finish();
+                    }
+                }).setNeutralButton("CODE", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        try {
+                            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/liangyuteng0927/FreeFormEnabler")));
+                        } catch (ActivityNotFoundException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }).show();
     }
 }
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 91a8e3a..f13158e 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">FreeFormEnabler</string>
-    <string name="text">在最近任务列表，长按一个应用然后点击按钮进入自由窗口模式。设备将会在完成后重启.注意！这个功能是实验性的！一些（许多）应用会崩溃！\n来自 @liangyuteng0927</string>
+    <string name="text">在最近任务列表，长按一个应用然后点击按钮进入自由窗口模式。请在完成后重启以生效.注意！这个功能是实验性的！一些（许多）应用会崩溃！\n来自 @liangyuteng0927</string>
+    <string name="action_disable">禁用</string>
+    <string name="action_reboot">完成后重启</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0e684a3..20b555a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,6 @@
 <resources>
     <string name="app_name">FreeFormEnabler</string>
-    <string name="text">In recent apps screen, long click a app and click button to enter free form mode.Your phone will reboot after finish.NOTICE: This function is EXPERIMENTAL, some(may be lot of) apps will crash\nBy @liangyuteng0927</string>
+    <string name="text">In recent apps screen, long click a app and click button to enter free form mode. Please reboot device after finish to apply change.NOTICE: This function is EXPERIMENTAL, some(may be lot of) apps will crash\nBy @liangyuteng0927</string>
+    <string name="action_disable">Disable</string>
+    <string name="action_reboot">Reboot After Finish</string>
 </resources>