This commit is contained in:
hyb1996
2017-02-13 11:00:28 +08:00
parent c1e74e9464
commit 1f8632951f
10 changed files with 17 additions and 13 deletions

View File

@@ -44,6 +44,7 @@ public class EditActivity extends Editor920Activity {
public static void editFile(Context context, String name, String path) { public static void editFile(Context context, String name, String path) {
context.startActivity(new Intent(context, EditActivity.class) context.startActivity(new Intent(context, EditActivity.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra("path", path) .putExtra("path", path)
.putExtra("name", name)); .putExtra("name", name));
} }

View File

@@ -43,6 +43,6 @@ public class ImportIntentActivity extends BaseActivity {
private void startMainActivity() { private void startMainActivity() {
startActivity(new Intent(this, MainActivity.class) startActivity(new Intent(this, MainActivity.class)
.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)); .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK));
} }
} }

View File

@@ -150,7 +150,7 @@ public class MainActivity extends BaseActivity implements FileChooserDialog.File
@ViewBinding.Click(R.id.setting) @ViewBinding.Click(R.id.setting)
private void startSettingActivity() { private void startSettingActivity() {
startActivity(new Intent(this, SettingsActivity.class)); startActivity(new Intent(this, SettingsActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
} }
@ViewBinding.Click(R.id.exit) @ViewBinding.Click(R.id.exit)

View File

@@ -75,7 +75,7 @@ public class SettingsActivity extends BaseActivity {
.entry(getString(R.string.text_about), new Runnable() { .entry(getString(R.string.text_about), new Runnable() {
@Override @Override
public void run() { public void run() {
startActivity(new Intent(getActivity(), AboutActivity.class)); startActivity(new Intent(getActivity(), AboutActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
} }
}) })
.entry(getString(R.string.text_licenses), new Runnable() { .entry(getString(R.string.text_licenses), new Runnable() {

View File

@@ -47,7 +47,7 @@ public class Droid {
}; };
private static Droid instance = new Droid(); private static Droid instance = new Droid();
protected Droid() { private Droid() {
} }
public static Droid getInstance() { public static Droid getInstance() {
@@ -64,14 +64,15 @@ public class Droid {
runScript(FileUtils.readString(file), listener, RunningConfig.getDefault()); runScript(FileUtils.readString(file), listener, RunningConfig.getDefault());
} }
private void runScript(String script) {
runScript(script, null, RunningConfig.getDefault());
}
public void runScriptFile(String path) { public void runScriptFile(String path) {
runScriptFile(new File(path)); runScriptFile(new File(path));
} }
private void runScript(String script) {
runScript(script, null, RunningConfig.getDefault());
}
public void runScript(final String script, OnRunFinishedListener listener, RunningConfig config) { public void runScript(final String script, OnRunFinishedListener listener, RunningConfig config) {
listener = listener == null ? DEFAULT_LISTENER : listener; listener = listener == null ? DEFAULT_LISTENER : listener;
if (config.runInNewThread) { if (config.runInNewThread) {

View File

@@ -55,7 +55,7 @@ public class DroidRuntime implements IDroidRuntime {
@Override @Override
public void launch(String packageName, String className) { public void launch(String packageName, String className) {
App.getApp().startActivity(new Intent().setClassName(packageName, className)); App.getApp().startActivity(new Intent().setClassName(packageName, className).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
} }
@Override @Override

View File

@@ -84,12 +84,12 @@ public class EditSideMenuFragment extends com.stardust.app.Fragment {
@ViewBinding.Click(R.id.syntax_and_api) @ViewBinding.Click(R.id.syntax_and_api)
private void startSyntaxHelpActivity() { private void startSyntaxHelpActivity() {
startActivity(new Intent(getContext(), DocumentActivity.class)); startActivity(new Intent(getContext(), DocumentActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
} }
@ViewBinding.Click(R.id.console) @ViewBinding.Click(R.id.console)
private void startConsoleActivity() { private void startConsoleActivity() {
startActivity(new Intent(getContext(), ConsoleActivity.class)); startActivity(new Intent(getContext(), ConsoleActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
} }
@ViewBinding.Check(R.id.sw_assist_service) @ViewBinding.Check(R.id.sw_assist_service)

View File

@@ -1,6 +1,7 @@
package com.stardust.scriptdroid.ui; package com.stardust.scriptdroid.ui;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.BitmapDrawable;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
@@ -59,6 +60,7 @@ public class ScriptFileOperationPopupMenu extends PopupWindow {
private void init() { private void init() {
setWidth(WindowManager.LayoutParams.WRAP_CONTENT); setWidth(WindowManager.LayoutParams.WRAP_CONTENT);
setHeight(WindowManager.LayoutParams.WRAP_CONTENT); setHeight(WindowManager.LayoutParams.WRAP_CONTENT);
setBackgroundDrawable(new BitmapDrawable());
setOutsideTouchable(true); setOutsideTouchable(true);
setAnimationStyle(-1); setAnimationStyle(-1);
initContentView(); initContentView();

View File

@@ -76,12 +76,12 @@ public class SlideMenuFragment extends Fragment {
@ViewBinding.Click(R.id.console) @ViewBinding.Click(R.id.console)
private void startConsoleActivity() { private void startConsoleActivity() {
startActivity(new Intent(getContext(), ConsoleActivity.class)); startActivity(new Intent(getContext(), ConsoleActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
} }
@ViewBinding.Click(R.id.syntax_and_api) @ViewBinding.Click(R.id.syntax_and_api)
private void startSyntaxHelpActivity() { private void startSyntaxHelpActivity() {
startActivity(new Intent(getContext(), DocumentActivity.class)); startActivity(new Intent(getContext(), DocumentActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
} }
@ViewBinding.Click(R.id.auto_operate_service) @ViewBinding.Click(R.id.auto_operate_service)

View File

@@ -20,7 +20,7 @@ public class AccessibilityServiceUtils {
if (Pref.isFirstGoToAccessibilitySetting()) { if (Pref.isFirstGoToAccessibilitySetting()) {
Toast.makeText(context, context.getString(R.string.text_please_choose) + context.getString(R.string.app_name), Toast.LENGTH_LONG).show(); Toast.makeText(context, context.getString(R.string.text_please_choose) + context.getString(R.string.app_name), Toast.LENGTH_LONG).show();
} }
context.startActivity(new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)); context.startActivity(new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
} }
public static boolean isAccessibilityServiceEnabled(Context context, Class<?> accessibilityService) { public static boolean isAccessibilityServiceEnabled(Context context, Class<?> accessibilityService) {