Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4cfc3d9 authored by frankpreel's avatar frankpreel
Browse files

Merge remote-tracking branch 'origin/release-1.4.0' into release-1.4.0

parents c567a082 1f1762b4

flash-scripts/windows/wait-e-reboot.bat

+0 −8
Original line number Diff line number Diff line
@@ -30,11 +30,3 @@ SET DEVICE_ID=%~1 
SET ADB_FOLDER_PATH=%~2

SET ADB_PATH="%ADB_FOLDER_PATH% adb"

echo "ADB path: %ADB_PATH%"
 
::IF "-z" "%DEVICE_ID%" (

::  exit "10"

::)

::IF REM UNKNOWN: {"type":"Pipeline","commands":[{"type":"Command","name":{"text":"!","type":"Word"},"suffix":[{"text":"\"$ADB_PATH\"","expansion":[{"loc":{"start":1,"end":9},"parameter":"ADB_PATH","type":"ParameterExpansion"}],"type":"Word"},{"text":"-s","type":"Word"},{"text":"\"$DEVICE_ID\"","expansion":[{"loc":{"start":1,"end":10},"parameter":"DEVICE_ID","type":"ParameterExpansion"}],"type":"Word"},{"text":"get-state","type":"Word"},{"type":"Redirect","op":{"text":">&","type":"greatand"},"file":{"text":"1","type":"Word"},"numberIo":{"text":"2","type":"io_number"}}]},{"type":"Command","name":{"text":"grep","type":"Word"},"suffix":[{"text":"recovery","type":"Word"}]}]} (

::  echo "Device not detected in recovery"

::  exit "101"

::)

::REM UNKNOWN: {"type":"While","clause":{"type":"CompoundList","commands":[{"type":"Command","name":{"text":"\"$ADB_PATH\"","expansion":[{"loc":{"start":1,"end":9},"parameter":"ADB_PATH","type":"ParameterExpansion"}],"type":"Word"},"suffix":[{"text":"-s","type":"Word"},{"text":"\"$DEVICE_ID\"","expansion":[{"loc":{"start":1,"end":10},"parameter":"DEVICE_ID","type":"ParameterExpansion"}],"type":"Word"},{"text":"get-state","type":"Word"},{"type":"Redirect","op":{"text":">","type":"great"},"file":{"text":"/dev/null","type":"Word"},"numberIo":{"text":"2","type":"io_number"}}]}]},"do":{"type":"CompoundList","commands":[{"type":"Command","name":{"text":"sleep","type":"Word"},"suffix":[{"text":"1","type":"Word"}]}]}}
 
 No newline at end of file

src/main/java/ecorp/easy/installer/EasyInstaller.java

+2 −25
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ import javafx.fxml.FXMLLoader; 
import javafx.fxml.Initializable;

import javafx.scene.Parent;

import javafx.scene.Scene;

import javafx.scene.control.MenuBar;

import javafx.scene.control.MenuItem;

import javafx.scene.text.Font;

import javafx.stage.Screen;

import javafx.stage.Stage;
@@ -65,8 +63,8 @@ public class EasyInstaller extends Application { 
        logger.debug("language = {}, country = {} ", currentLocale.getLanguage(), currentLocale.getCountry());

        

       //Load main view

        URL r = getClass().getResource(FXML_PATH+"mainWindow.fxml");

        FXMLLoader loader = new FXMLLoader(r);

        final URL fxmlPath = getClass().getResource(FXML_PATH+"mainWindow.fxml");

        final FXMLLoader loader = new FXMLLoader(fxmlPath);

        loader.setResources(i18n);

        Parent root = loader.load() ;

        controller = loader.getController();
@@ -77,27 +75,6 @@ public class EasyInstaller extends Application { 
        Scene scene = new Scene(root);

        

        stage.setTitle(i18n.getString("appTitle")+AppConstants.APP_VERSION);

        

        

        

        

        

        /*

        try {

			MenuBar mb = (MenuBar) root.getChildrenUnmodifiable().get(1);

			if( System.getProperty("os.name","UNKNOWN").equals("Mac OS X")) {

				logger.debug("Detected Mac OS.");

		        mb.setUseSystemMenuBar(true);

		        

		        

		        

			} else {

				mb.setVisible(false);

			}

		} catch (Exception e) {

			logger.debug("Error - cannot find menu bar");

		}*/

        

        stage.setScene(scene);



        stage.setResizable(true);

build.gradle

+1 −1

File changed.

Contains only whitespace changes.