move menu options around, rename build package folder

Author: codeanticode

mode/src/processing/mode/android/AndroidBuild.java

@@ -760,7 +760,7 @@ public File exportPackage(String keyStorePassword) throws Exception {
     if (signedPackage == null) return null;
 
     // Final export folder
-    File exportFolder = createExportFolder("build");
+    File exportFolder = createExportFolder("buildPackage");
     Util.copyDir(new File(projectFolder, getPathToAPK()), exportFolder);    
     return exportFolder;
   }

mode/src/processing/mode/android/AndroidEditor.java

@@ -120,6 +120,14 @@ public boolean handleSaveAs() {
 
 
   public JMenu buildFileMenu() {
+    String exportBundleTitle = AndroidToolbar.getTitle(AndroidToolbar.EXPORT_BUNDLE, false);
+    JMenuItem exportBundle = Toolkit.newJMenuItem(exportBundleTitle, 'B');
+    exportBundle.addActionListener(new ActionListener() {
+      public void actionPerformed(ActionEvent e) {
+        handleExportBundle();
+      }
+    });
+
     String exportPkgTitle = AndroidToolbar.getTitle(AndroidToolbar.EXPORT, false);
     JMenuItem exportPackage = Toolkit.newJMenuItem(exportPkgTitle, 'E');
     exportPackage.addActionListener(new ActionListener() {
@@ -136,15 +144,7 @@ public void actionPerformed(ActionEvent e) {
       }
     });
 
-    String exportBundleTitle = AndroidToolbar.getTitle(AndroidToolbar.EXPORT_BUNDLE, false);
-    JMenuItem exportBundle = Toolkit.newJMenuItem(exportBundleTitle, 'B');
-    exportBundle.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        handleExportBundle();
-      }
-    });
-
-    return buildFileMenu(new JMenuItem[] { exportPackage, exportProject, exportBundle});
+    return buildFileMenu(new JMenuItem[] { exportBundle, exportPackage, exportProject});
   }