Moved launcher files to subfolder

inclement · inclement · commit 7e91e816b348 · 2017-01-15T14:26:29.000Z
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java
@@ -36,6 +36,7 @@
 import org.libsdl.app.SDLActivity;
 
 import org.kivy.android.PythonUtil;
+import org.kivy.android.launcher.Project;
 
 import org.renpy.android.ResourceManager;
 import org.renpy.android.AssetExtract;
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/launcher/Project.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/launcher/Project.java
@@ -1,4 +1,4 @@
-package org.kivy.android;
+package org.kivy.android.launcher;
 
 import java.io.UnsupportedEncodingException;
 import java.io.File;
@@ -15,11 +15,11 @@
  */
 public class Project {
 
-    String dir = null;
+    public String dir = null;
     String title = null;
     String author = null;
     Bitmap icon = null;
-    boolean landscape = false;
+    public boolean landscape = false;
 
     static String decode(String s) {
         try {
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/launcher/ProjectAdapter.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/launcher/ProjectAdapter.java
@@ -1,4 +1,4 @@
-package org.kivy.android;
+package org.kivy.android.launcher;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/launcher/ProjectChooser.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/launcher/ProjectChooser.java
@@ -1,4 +1,4 @@
-package org.kivy.android;
+package org.kivy.android.launcher;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.tmpl.xml b/pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.tmpl.xml
@@ -86,7 +86,7 @@
         </activity>
 
         {% if args.launcher %}
-        <activity android:name="org.kivy.android.ProjectChooser"
+        <activity android:name="org.kivy.android.launcher.ProjectChooser"
                   android:icon="@drawable/icon"
                   android:label="@string/app_name">
 
@@ -121,4 +121,4 @@
         {% endif %}
     </application>
 
-</manifest>
+</manifest>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.kivy.android;`
	`1`	`+package org.kivy.android.launcher;`
`2`	`2`
`3`	`3`	`import android.app.Activity;`
`4`	`4`	`import android.content.Context;`