Added Find/Replace to editor Menu... not all devices have physical "Search" buttons... :")

Robbie Matthews · Robbie Matthews · commit 252d879ee880 · 2012-03-22T00:46:48.000+11:00
diff --git a/android/ScriptingLayerForAndroid/AndroidManifest.xml b/android/ScriptingLayerForAndroid/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest
   xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.googlecode.android_scripting"
-  android:installLocation="auto" android:versionCode="404" android:versionName="5x04">
+  android:installLocation="auto" android:versionCode="405" android:versionName="5x05">
     <uses-permission android:name="android.permission.RECEIVE_SMS"></uses-permission>
     <uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS"></uses-permission>
   <application
diff --git a/android/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptEditor.java b/android/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptEditor.java
@@ -92,7 +92,7 @@ public class ScriptEditor extends Activity implements OnClickListener {
   private CheckBox mSearchStart;
 
   private static enum MenuId {
-    SAVE, SAVE_AND_RUN, PREFERENCES, API_BROWSER, HELP, SHARE, GOTO;
+    SAVE, SAVE_AND_RUN, PREFERENCES, API_BROWSER, HELP, SHARE, GOTO, SEARCH;
     public int getId() {
       return ordinal() + Menu.FIRST;
     }
@@ -185,6 +185,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
     menu.add(0, MenuId.HELP.getId(), 0, "Help").setIcon(android.R.drawable.ic_menu_help);
     menu.add(0, MenuId.SHARE.getId(), 0, "Share").setIcon(android.R.drawable.ic_menu_share);
     menu.add(0, MenuId.GOTO.getId(), 0, "GoTo").setIcon(android.R.drawable.ic_menu_directions);
+    menu.add(0, MenuId.SEARCH.getId(), 0, "Find").setIcon(android.R.drawable.ic_menu_search);
     return true;
   }
 
@@ -226,6 +227,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
       startActivity(Intent.createChooser(intent, "Send Script to:"));
     } else if (item.getItemId() == MenuId.GOTO.getId()) {
       showDialog(DIALOG_LINE);
+    } else if (item.getItemId() == MenuId.SEARCH.getId()) {
+      showDialog(DIALOG_FIND_REPLACE);
     }
     return super.onOptionsItemSelected(item);
   }

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public class ScriptEditor extends Activity implements OnClickListener {`
`92`	`92`	`private CheckBox mSearchStart;`
`93`	`93`
`94`	`94`	`private static enum MenuId {`
`95`		`- SAVE, SAVE_AND_RUN, PREFERENCES, API_BROWSER, HELP, SHARE, GOTO;`
	`95`	`+ SAVE, SAVE_AND_RUN, PREFERENCES, API_BROWSER, HELP, SHARE, GOTO, SEARCH;`
`96`	`96`	`public int getId() {`
`97`	`97`	`return ordinal() + Menu.FIRST;`
`98`	`98`	`}`
`@@ -185,6 +185,7 @@ public boolean onCreateOptionsMenu(Menu menu) {`
`185`	`185`	`menu.add(0, MenuId.HELP.getId(), 0, "Help").setIcon(android.R.drawable.ic_menu_help);`
`186`	`186`	`menu.add(0, MenuId.SHARE.getId(), 0, "Share").setIcon(android.R.drawable.ic_menu_share);`
`187`	`187`	`menu.add(0, MenuId.GOTO.getId(), 0, "GoTo").setIcon(android.R.drawable.ic_menu_directions);`
	`188`	`+ menu.add(0, MenuId.SEARCH.getId(), 0, "Find").setIcon(android.R.drawable.ic_menu_search);`
`188`	`189`	`return true;`
`189`	`190`	`}`
`190`	`191`
`@@ -226,6 +227,8 @@ public boolean onOptionsItemSelected(MenuItem item) {`
`226`	`227`	`startActivity(Intent.createChooser(intent, "Send Script to:"));`
`227`	`228`	`} else if (item.getItemId() == MenuId.GOTO.getId()) {`
`228`	`229`	`showDialog(DIALOG_LINE);`
	`230`	`+ } else if (item.getItemId() == MenuId.SEARCH.getId()) {`
	`231`	`+ showDialog(DIALOG_FIND_REPLACE);`
`229`	`232`	`}`
`230`	`233`	`return super.onOptionsItemSelected(item);`
`231`	`234`	`}`