diff --git a/src/main/java/hudson/plugins/android_emulator/AndroidEmulator.java b/src/main/java/hudson/plugins/android_emulator/AndroidEmulator.java index 5b74fd2c..d9e8d132 100644 --- a/src/main/java/hudson/plugins/android_emulator/AndroidEmulator.java +++ b/src/main/java/hudson/plugins/android_emulator/AndroidEmulator.java @@ -1029,8 +1029,8 @@ private ValidationResult doCheckScreenDensity(String density, boolean allowVaria } public FormValidation doCheckScreenResolution(@QueryParameter String value, - @QueryParameter String density, @QueryParameter String osVersion) { - return doCheckScreenResolution(value, density, osVersion, true).getFormValidation(); + @QueryParameter String screenDensity, @QueryParameter String osVersion) { + return doCheckScreenResolution(value, screenDensity, osVersion, true).getFormValidation(); } private ValidationResult doCheckScreenResolution(String resolution, String density, diff --git a/src/main/resources/hudson/plugins/android_emulator/AndroidEmulator/config.jelly b/src/main/resources/hudson/plugins/android_emulator/AndroidEmulator/config.jelly index 66079e0c..c45c8701 100644 --- a/src/main/resources/hudson/plugins/android_emulator/AndroidEmulator/config.jelly +++ b/src/main/resources/hudson/plugins/android_emulator/AndroidEmulator/config.jelly @@ -6,7 +6,7 @@ help="/plugin/android-emulator/help-emulatorNamed.html"> - + @@ -18,37 +18,35 @@ + checkUrl="descriptorByName/AndroidEmulator/checkOsVersion" checkDependsOn="" /> - + checkUrl="descriptorByName/AndroidEmulator/checkScreenDensity" checkDependsOn="" /> + checkUrl="descriptorByName/AndroidEmulator/checkScreenResolution" checkDependsOn="osVersion screenDensity"/> + checkUrl="descriptorByName/AndroidEmulator/checkDeviceDefinition" checkDependsOn=""/> + checkUrl="descriptorByName/AndroidEmulator/checkDeviceLocale" checkDependsOn=""/> + checkUrl="descriptorByName/AndroidEmulator/checkSdCardSize" checkDependsOn=""/> + checkUrl="descriptorByName/AndroidEmulator/checkTargetAbi" checkDependsOn="" /> @@ -109,7 +107,7 @@ - + diff --git a/src/main/resources/hudson/plugins/android_emulator/AndroidEmulator/global.jelly b/src/main/resources/hudson/plugins/android_emulator/AndroidEmulator/global.jelly index 59fa8468..06cb8a50 100644 --- a/src/main/resources/hudson/plugins/android_emulator/AndroidEmulator/global.jelly +++ b/src/main/resources/hudson/plugins/android_emulator/AndroidEmulator/global.jelly @@ -6,9 +6,8 @@ - + diff --git a/src/main/resources/hudson/plugins/android_emulator/UninstallBuilder/config.jelly b/src/main/resources/hudson/plugins/android_emulator/UninstallBuilder/config.jelly index 60fe9e76..d841db34 100644 --- a/src/main/resources/hudson/plugins/android_emulator/UninstallBuilder/config.jelly +++ b/src/main/resources/hudson/plugins/android_emulator/UninstallBuilder/config.jelly @@ -3,7 +3,7 @@ + checkUrl="descriptorByName/UninstallBuilder/checkPackageId" checkDependsOn=""/> ${%ID of the Android package to be uninstalled}