Move android specific classes into the corresponding parent package

Author: Mykola Mokhnach

…nt/AndroidInstallApplicationOptions.java …nt/AndroidInstallApplicationOptions.javasrc/main/java/io/appium/java_client/appmanagement/AndroidInstallApplicationOptions.java renamed to src/main/java/io/appium/java_client/android/appmanagement/AndroidInstallApplicationOptions.java src/main/java/io/appium/java_client/appmanagement/AndroidInstallApplicationOptions.java renamed to src/main/java/io/appium/java_client/android/appmanagement/AndroidInstallApplicationOptions.java

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package io.appium.java_client.appmanagement;
+package io.appium.java_client.android.appmanagement;
 
 import com.google.common.collect.ImmutableMap;
+import io.appium.java_client.appmanagement.BaseInstallApplicationOptions;
 
 import java.time.Duration;
 import java.util.Map;

…ent/AndroidRemoveApplicationOptions.java …ent/AndroidRemoveApplicationOptions.javasrc/main/java/io/appium/java_client/appmanagement/AndroidRemoveApplicationOptions.java renamed to src/main/java/io/appium/java_client/android/appmanagement/AndroidRemoveApplicationOptions.java src/main/java/io/appium/java_client/appmanagement/AndroidRemoveApplicationOptions.java renamed to src/main/java/io/appium/java_client/android/appmanagement/AndroidRemoveApplicationOptions.java

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package io.appium.java_client.appmanagement;
+package io.appium.java_client.android.appmanagement;
 
 import com.google.common.collect.ImmutableMap;
+import io.appium.java_client.appmanagement.BaseRemoveApplicationOptions;
 
 import java.time.Duration;
 import java.util.Map;

…/AndroidTerminateApplicationOptions.java …/AndroidTerminateApplicationOptions.javasrc/main/java/io/appium/java_client/appmanagement/AndroidTerminateApplicationOptions.java renamed to src/main/java/io/appium/java_client/android/appmanagement/AndroidTerminateApplicationOptions.java src/main/java/io/appium/java_client/appmanagement/AndroidTerminateApplicationOptions.java renamed to src/main/java/io/appium/java_client/android/appmanagement/AndroidTerminateApplicationOptions.java

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package io.appium.java_client.appmanagement;
+package io.appium.java_client.android.appmanagement;
 
 import com.google.common.collect.ImmutableMap;
+import io.appium.java_client.appmanagement.BaseTerminateApplicationOptions;
 
 import java.time.Duration;
 import java.util.Map;

src/main/java/io/appium/java_client/appmanagement/ApplicationState.java

@@ -19,14 +19,8 @@
 import java.util.Arrays;
 
 public enum ApplicationState {
-    NOT_INSTALLED(0), NOT_RUNNING(1), RUNNING_IN_BACKGROUND_SUSPENDED(2),
-    RUNNING_IN_BACKGROUND(3), RUNNING_IN_FOREGROUND(4);
-
-    private int code;
-
-    ApplicationState(int code) {
-        this.code = code;
-    }
+    NOT_INSTALLED, NOT_RUNNING, RUNNING_IN_BACKGROUND_SUSPENDED,
+    RUNNING_IN_BACKGROUND, RUNNING_IN_FOREGROUND;
 
     /**
      * Creates {@link ApplicationState} instance based on the code.
@@ -36,7 +30,7 @@ public enum ApplicationState {
      */
     public static ApplicationState ofCode(int code) {
         return Arrays.stream(ApplicationState.values())
-                .filter(x -> code == x.code)
+                .filter(x -> code == x.ordinal())
                 .findFirst()
                 .orElseThrow(() -> new IllegalArgumentException(
                         String.format("Application state %s is unknown", code))