From 9fbfe9dea1270095699e7092a59452aba841c9a3 Mon Sep 17 00:00:00 2001
From: Mis012 <Michael.Srba@seznam.cz>
Date: Thu, 14 Mar 2024 21:31:43 +0100
Subject: [PATCH] api-impl: remove hacky overrides for android.support

These were originally needed because the official android.support classes
required APIs that we didn't support and it didn't seem worth the effort
to make them happy when the actual apps using these compat classes
were comparatively trivial.

We now support all the necessary APIs, so we can remove the overrides
and let the apps use their bundled android.support classes.
---
 .../support/multidex/MultiDexApplication.java | 22 ----------
 .../support/v4/app/FragmentActivity.java      | 34 --------------
 .../support/v7/app/AppCompatActivity.java     |  6 ---
 .../animation/AccelerateInterpolator.java     | 44 ++++++++++++++++++-
 src/api-impl/meson.build                      |  3 --
 5 files changed, 43 insertions(+), 66 deletions(-)
 delete mode 100644 src/api-impl/android/support/multidex/MultiDexApplication.java
 delete mode 100644 src/api-impl/android/support/v4/app/FragmentActivity.java
 delete mode 100644 src/api-impl/android/support/v7/app/AppCompatActivity.java

diff --git a/src/api-impl/android/support/multidex/MultiDexApplication.java b/src/api-impl/android/support/multidex/MultiDexApplication.java
deleted file mode 100644
index 6df27d75..00000000
--- a/src/api-impl/android/support/multidex/MultiDexApplication.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package android.support.multidex;
-
-import android.app.Application;
-import android.content.Context;
-
-/**
- * Minimal MultiDex capable application. To use the legacy multidex library there is 3 possibility:
- * <ul>
- * <li>Declare this class as the application in your AndroidManifest.xml.</li>
- * <li>Have your {@link Application} extends this class.</li>
- * <li>Have your {@link Application} override attachBaseContext starting with<br>
- * <code>
-  protected void attachBaseContext(Context base) {<br>
-    super.attachBaseContext(base);<br>
-    MultiDex.install(this);
-    </code></li>
- *   <ul>
- */
-public class MultiDexApplication extends Application {
-	protected void attachBaseContext(Context base) {
-	}
-}
diff --git a/src/api-impl/android/support/v4/app/FragmentActivity.java b/src/api-impl/android/support/v4/app/FragmentActivity.java
deleted file mode 100644
index 461b4e19..00000000
--- a/src/api-impl/android/support/v4/app/FragmentActivity.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package android.support.v4.app;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class FragmentActivity extends Activity {
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-	}
-
-	protected void onStart() {
-		super.onStart();
-	}
-
-	protected void onRestart() {
-		super.onRestart();
-	}
-
-	protected void onResume() {
-		super.onResume();
-	}
-
-	protected void onPause() {
-		super.onPause();
-	}
-
-	protected void onStop() {
-		super.onStop();
-	}
-
-	protected void onDestroy() {
-		super.onDestroy();
-	}
-}
diff --git a/src/api-impl/android/support/v7/app/AppCompatActivity.java b/src/api-impl/android/support/v7/app/AppCompatActivity.java
deleted file mode 100644
index 30a9b071..00000000
--- a/src/api-impl/android/support/v7/app/AppCompatActivity.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package android.support.v7.app;
-
-import android.app.Activity;
-
-public class AppCompatActivity extends Activity {
-}
diff --git a/src/api-impl/android/view/animation/AccelerateInterpolator.java b/src/api-impl/android/view/animation/AccelerateInterpolator.java
index e373d045..0208aab8 100644
--- a/src/api-impl/android/view/animation/AccelerateInterpolator.java
+++ b/src/api-impl/android/view/animation/AccelerateInterpolator.java
@@ -1,5 +1,25 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package android.view.animation;
 
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+
 /**
  * An interpolator where the rate of change starts out slowly and
  * and then accelerates.
@@ -14,6 +34,29 @@ public class AccelerateInterpolator implements Interpolator {
 		mDoubleFactor = 2.0;
 	}
 
+	/**
+	 * Constructor
+	 *
+	 * @param factor Degree to which the animation should be eased. Seting
+	 *        factor to 1.0f produces a y=x^2 parabola. Increasing factor above
+	 *        1.0f  exaggerates the ease-in effect (i.e., it starts even
+	 *        slower and ends evens faster)
+	 */
+	public AccelerateInterpolator(float factor) {
+		mFactor = factor;
+		mDoubleFactor = 2 * mFactor;
+	}
+
+	public AccelerateInterpolator(Context context, AttributeSet attrs) {
+		TypedArray a =
+		    context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.AccelerateInterpolator);
+
+		mFactor = a.getFloat(com.android.internal.R.styleable.AccelerateInterpolator_factor, 1.0f);
+		mDoubleFactor = 2 * mFactor;
+
+		a.recycle();
+	}
+
 	public float getInterpolation(float input) {
 		if (mFactor == 1.0f) {
 			return input * input;
@@ -21,5 +64,4 @@ public class AccelerateInterpolator implements Interpolator {
 			return (float)Math.pow(input, mDoubleFactor);
 		}
 	}
-
 }
diff --git a/src/api-impl/meson.build b/src/api-impl/meson.build
index 72c433d3..58af0e90 100644
--- a/src/api-impl/meson.build
+++ b/src/api-impl/meson.build
@@ -274,9 +274,6 @@ hax_jar = jar('hax', [
               	'android/print/PrintManager.java',
               	'android/provider/Settings.java',
               	'android/R.java',
-              	'android/support/multidex/MultiDexApplication.java',
-              	'android/support/v4/app/FragmentActivity.java',
-              	'android/support/v7/app/AppCompatActivity.java',
               	'android/telecom/TelecomManager.java',
               	'android/telephony/PhoneStateListener.java',
               	'android/telephony/TelephonyManager.java',