Skip to content

Commit bbc5af9

Browse files
committed
remove support-v4 jar
We're dropping the support for gingerbread devices Signed-off-by: Umair Khan <[email protected]>
1 parent 8797441 commit bbc5af9

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

core/src/processing/core/PApplet.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,8 @@
5151
import android.view.View;
5252
import android.view.ViewGroup;
5353
import android.view.ViewGroup.LayoutParams;
54-
import android.view.Window;
55-
import android.view.WindowManager;
5654
import android.widget.*;
57-
import android.support.v4.app.Fragment;
58-
import android.support.v4.app.FragmentActivity;
55+
import android.app.Fragment;
5956

6057
import org.apache.http.client.HttpClient;
6158
import org.apache.http.client.methods.HttpGet;
@@ -73,7 +70,7 @@ public class PApplet extends Fragment implements PConstants, Runnable {
7370
/**
7471
* The activity which holds this fragment.
7572
*/
76-
private FragmentActivity activity;
73+
private Activity activity;
7774

7875
/** The PGraphics renderer associated with this PApplet */
7976
public PGraphics g;

mode/android-support-v4.jar

-1.13 MB
Binary file not shown.

src/processing/mode/android/AndroidBuild.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public File createProject() throws IOException, SketchException {
182182
// PApplet.saveStream(new File(libsFolder, "processing-core.jar"), input);
183183
Base.copyFile(coreZipFile, new File(libsFolder, "processing-core.jar"));
184184

185-
copySupportV4(libsFolder);
185+
// copySupportV4(libsFolder);
186186

187187
// Copy any imported libraries (their libs and assets),
188188
// and anything in the code folder contents to the project.
@@ -868,15 +868,15 @@ private void writeMainActivity(final File srcDirectory) {
868868
"MainActivity.java");
869869
final PrintWriter writer = PApplet.createWriter(mainActivityFile);
870870
writer.println("package " + manifest.getPackageName() +";");
871-
writer.println("import android.support.v4.app.FragmentActivity;");
871+
writer.println("import android.app.Activity;");
872872
writer.println("import android.os.Bundle;");
873873
writer.println("import android.view.Window;");
874874
writer.println("import android.view.WindowManager;");
875875
writer.println("import android.widget.FrameLayout;");
876876
writer.println("import android.view.ViewGroup.LayoutParams;");
877-
writer.println("import android.support.v4.app.FragmentTransaction;");
877+
writer.println("import android.app.FragmentTransaction;");
878878
writer.println("import processing.core.PApplet;");
879-
writer.println("public class MainActivity extends FragmentActivity {");
879+
writer.println("public class MainActivity extends Activity {");
880880
writer.println(" PApplet fragment;");
881881
writer.println(" private static final String MAIN_FRAGMENT_TAG = \"main_fragment\";");
882882
writer.println(" int viewId = 0x1000;");
@@ -895,10 +895,10 @@ private void writeMainActivity(final File srcDirectory) {
895895
+ "LayoutParams.MATCH_PARENT));");
896896
writer.println(" if (savedInstanceState == null) {");
897897
writer.println(" fragment = new " + sketchClassName + "();");
898-
writer.println(" FragmentTransaction ft = getSupportFragmentManager().beginTransaction();");
898+
writer.println(" FragmentTransaction ft = getFragmentManager().beginTransaction();");
899899
writer.println(" ft.add(frame.getId(), fragment, MAIN_FRAGMENT_TAG).commit();");
900900
writer.println(" } else {");
901-
writer.println(" fragment = (PApplet) getSupportFragmentManager().findFragmentByTag(MAIN_FRAGMENT_TAG);");
901+
writer.println(" fragment = (PApplet) getFragmentManager().findFragmentByTag(MAIN_FRAGMENT_TAG);");
902902
writer.println(" }");
903903
writer.println(" }");
904904
writer.println(" @Override");
@@ -951,7 +951,7 @@ private void writeResLayoutMainFragment(final File file) {
951951
// writer.close();
952952
// }
953953

954-
954+
/*
955955
private void copySupportV4(File libsFolder) throws SketchException {
956956
File sdkLocation = sdk.getSdkFolder();
957957
File supportV4Jar = new File(sdkLocation, "extras/android/support/v4/android-support-v4.jar");
@@ -967,7 +967,7 @@ private void copySupportV4(File libsFolder) throws SketchException {
967967
}
968968
}
969969
}
970-
970+
*/
971971
/**
972972
* For each library, copy .jar and .zip files to the 'libs' folder,
973973
* and copy anything else to the 'assets' folder.

0 commit comments

Comments
 (0)