diff --git a/src/api-impl/android/app/Activity.java b/src/api-impl/android/app/Activity.java
index 19d41aa0..49e7b3fa 100644
--- a/src/api-impl/android/app/Activity.java
+++ b/src/api-impl/android/app/Activity.java
@@ -622,4 +622,8 @@ public class Activity extends ContextThemeWrapper implements Window.Callback, La
 	public int getChangingConfigurations() {
 		return 0;
 	}
+
+	public void finishAfterTransition() {
+		finish();
+	}
 }
diff --git a/src/api-impl/android/app/ActivityOptions.java b/src/api-impl/android/app/ActivityOptions.java
index 245fca21..23a9d980 100644
--- a/src/api-impl/android/app/ActivityOptions.java
+++ b/src/api-impl/android/app/ActivityOptions.java
@@ -10,6 +10,10 @@ public class ActivityOptions {
 		return new ActivityOptions();
 	}
 
+	public static ActivityOptions makeSceneTransitionAnimation(Activity activity, View view, String name) {
+		return new ActivityOptions();
+	}
+
 	public Bundle toBundle() {
 		return null;
 	}
diff --git a/src/api-impl/android/app/Notification.java b/src/api-impl/android/app/Notification.java
index 030d9871..180806a4 100644
--- a/src/api-impl/android/app/Notification.java
+++ b/src/api-impl/android/app/Notification.java
@@ -53,6 +53,8 @@ public class Notification implements Parcelable {
 
 	public Bundle extras;
 
+	public String category;
+
 	String text;
 	String title;
 	List<Action> actions = new ArrayList<Action>();
diff --git a/src/api-impl/android/app/NotificationManager.java b/src/api-impl/android/app/NotificationManager.java
index d4e0b311..a8bb77d2 100644
--- a/src/api-impl/android/app/NotificationManager.java
+++ b/src/api-impl/android/app/NotificationManager.java
@@ -118,4 +118,8 @@ public class NotificationManager {
 	public List<NotificationChannelGroup> getNotificationChannelGroups() {
 		return Collections.emptyList();
 	}
+
+	public boolean areNotificationsEnabled() {
+		return true;
+	}
 }
diff --git a/src/api-impl/android/app/PendingIntent.java b/src/api-impl/android/app/PendingIntent.java
index 33dd358e..f0fa8f41 100644
--- a/src/api-impl/android/app/PendingIntent.java
+++ b/src/api-impl/android/app/PendingIntent.java
@@ -59,4 +59,12 @@ public class PendingIntent implements Parcelable {
 
 	public class CanceledException extends Exception {
 	}
+
+	public String getCreatorPackage() {
+		return Context.this_application.getPackageName();
+	}
+
+	public int getCreatorUid() {
+		return Context.this_application.getApplicationInfo().uid;
+	}
 }
diff --git a/src/api-impl/android/app/job/JobInfo.java b/src/api-impl/android/app/job/JobInfo.java
index bae373cc..3a621fe2 100644
--- a/src/api-impl/android/app/job/JobInfo.java
+++ b/src/api-impl/android/app/job/JobInfo.java
@@ -46,6 +46,14 @@ public class JobInfo {
 			return this;
 		}
 
+		public Builder setRequiresBatteryNotLow(boolean requires_battery_not_low) {
+			return this;
+		}
+
+		public Builder setRequiresStorageNotLow(boolean requires_storage_not_low) {
+			return this;
+		}
+
 		public JobInfo build() {
 			return new JobInfo();
 		}
diff --git a/src/api-impl/android/content/Intent.java b/src/api-impl/android/content/Intent.java
index 13546c80..b79a4442 100644
--- a/src/api-impl/android/content/Intent.java
+++ b/src/api-impl/android/content/Intent.java
@@ -2,6 +2,7 @@ package android.content;
 
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
+import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Parcelable;
@@ -391,4 +392,10 @@ public class Intent implements Parcelable {
 	public ComponentName resolveActivity(PackageManager pm) {
 		return component;
 	}
+
+	public void setSourceBounds(Rect sourceBounds) {}
+
+	public void setSelector(Intent selector) {}
+
+	public void setClipData(ClipData clip) {}
 }
diff --git a/src/api-impl/android/content/pm/SigningInfo.java b/src/api-impl/android/content/pm/SigningInfo.java
index 5812eeaa..11e1c30a 100644
--- a/src/api-impl/android/content/pm/SigningInfo.java
+++ b/src/api-impl/android/content/pm/SigningInfo.java
@@ -12,4 +12,8 @@ public final class SigningInfo {
 	public Signature[] getSigningCertificateHistory() {
 		return null;
 	}
+
+	public boolean hasPastSigningCertificates() {
+		return false;
+	}
 }
diff --git a/src/api-impl/android/graphics/Paint.java b/src/api-impl/android/graphics/Paint.java
index cd0d0c89..a00166bc 100644
--- a/src/api-impl/android/graphics/Paint.java
+++ b/src/api-impl/android/graphics/Paint.java
@@ -337,6 +337,8 @@ public class Paint {
 		return align;
 	}
 
+	public boolean hasGlyph(String text) { return false; }
+
 	private static native long native_create();
 	private static native long native_clone(long paint);
 	private static native void native_recycle(long paint);
diff --git a/src/api-impl/android/net/ConnectivityManager.java b/src/api-impl/android/net/ConnectivityManager.java
index 28635752..45db4857 100644
--- a/src/api-impl/android/net/ConnectivityManager.java
+++ b/src/api-impl/android/net/ConnectivityManager.java
@@ -43,4 +43,6 @@ public class ConnectivityManager {
 
 	public void registerDefaultNetworkCallback(NetworkCallback cb, Handler hdl) {}
 
+	public void registerDefaultNetworkCallback(NetworkCallback cb) {}
+
 }
diff --git a/src/api-impl/android/os/UserManager.java b/src/api-impl/android/os/UserManager.java
index eeb04551..f45ca945 100644
--- a/src/api-impl/android/os/UserManager.java
+++ b/src/api-impl/android/os/UserManager.java
@@ -7,4 +7,8 @@ public class UserManager {
 	public static boolean supportsMultipleUsers() {
 		return false;
 	}
+
+	public long getSerialNumberForUser(UserHandle user) {
+		return user.getIdentifier();
+	}
 }
diff --git a/src/api-impl/android/security/keystore/AndroidKeyStore.java b/src/api-impl/android/security/keystore/AndroidKeyStore.java
index 2b7e24b7..681d897f 100644
--- a/src/api-impl/android/security/keystore/AndroidKeyStore.java
+++ b/src/api-impl/android/security/keystore/AndroidKeyStore.java
@@ -10,10 +10,13 @@ import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableKeyException;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
+import java.util.Collections;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashMap;
 
+import android.util.Slog;
+
 public class AndroidKeyStore extends KeyStoreSpi {
 
 	HashMap<String, String> map = new HashMap<>();
@@ -70,8 +73,8 @@ public class AndroidKeyStore extends KeyStoreSpi {
 
 	@Override
 	public Enumeration<String> engineAliases() {
-		// TODO Auto-generated method stub
-		throw new UnsupportedOperationException("Unimplemented method 'engineAliases'");
+		Slog.i("AndroidKeyStore", "engineAliases() called");
+		return Collections.emptyEnumeration();
 	}
 
 	@Override
diff --git a/src/api-impl/android/transition/Fade.java b/src/api-impl/android/transition/Fade.java
new file mode 100644
index 00000000..740d1e2f
--- /dev/null
+++ b/src/api-impl/android/transition/Fade.java
@@ -0,0 +1,4 @@
+package android.transition;
+
+public class Fade extends Transition {
+}
diff --git a/src/api-impl/android/transition/Transition.java b/src/api-impl/android/transition/Transition.java
index ace46d18..3f9dbe51 100644
--- a/src/api-impl/android/transition/Transition.java
+++ b/src/api-impl/android/transition/Transition.java
@@ -11,4 +11,8 @@ public class Transition {
 	public Transition addListener(TransitionListener listener) {
 		return this;
 	}
+
+	public Transition excludeTarget(int targetId, boolean exclude) {
+		return this;
+	}
 }
diff --git a/src/api-impl/android/view/Display.java b/src/api-impl/android/view/Display.java
index e07a81f5..7fc00554 100644
--- a/src/api-impl/android/view/Display.java
+++ b/src/api-impl/android/view/Display.java
@@ -1,6 +1,7 @@
 package android.view;
 
 import android.graphics.Point;
+import android.graphics.Rect;
 import android.util.DisplayMetrics;
 
 public final class Display {
@@ -63,4 +64,8 @@ public final class Display {
 	public void getRealSize(Point size) {
 		getSize(size);
 	}
+
+	public void getRectSize(Rect rect) {
+		rect.set(0, 0, getWidth(), getHeight());
+	}
 }
diff --git a/src/api-impl/android/view/View.java b/src/api-impl/android/view/View.java
index a2a992f3..5df78a09 100644
--- a/src/api-impl/android/view/View.java
+++ b/src/api-impl/android/view/View.java
@@ -2199,4 +2199,8 @@ public class View implements Drawable.Callback {
 	public void scrollBy(int x, int y) {
 		scrollTo(scrollX + x, scrollY + y);
 	}
+
+	public void setAccessibilityPaneTitle(CharSequence paneTitle) {}
+
+	public void setAccessibilityHeading(boolean heading) {}
 }
diff --git a/src/api-impl/android/view/Window.java b/src/api-impl/android/view/Window.java
index cb3e93d7..dd65f8a6 100644
--- a/src/api-impl/android/view/Window.java
+++ b/src/api-impl/android/view/Window.java
@@ -154,4 +154,8 @@ public class Window {
 	public Transition getSharedElementReenterTransition() {
 		return new Transition();
 	}
+
+	public void setReturnTransition(Transition transition) {}
+
+	public void setEnterTransition(Transition transition) {}
 }
diff --git a/src/api-impl/android/view/WindowInsets.java b/src/api-impl/android/view/WindowInsets.java
index b688b91c..f478fee2 100644
--- a/src/api-impl/android/view/WindowInsets.java
+++ b/src/api-impl/android/view/WindowInsets.java
@@ -59,4 +59,8 @@ public class WindowInsets {
 	public boolean isConsumed() {
 		return false;
 	}
+
+	public WindowInsets consumeDisplayCutout() {
+		return this;
+	}
 }
diff --git a/src/api-impl/android/widget/TextSwitcher.java b/src/api-impl/android/widget/TextSwitcher.java
new file mode 100644
index 00000000..eaba50b6
--- /dev/null
+++ b/src/api-impl/android/widget/TextSwitcher.java
@@ -0,0 +1,15 @@
+package android.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+public class TextSwitcher extends ViewAnimator {
+
+	public TextSwitcher(Context context) {
+		this(context, null);
+	}
+
+	public TextSwitcher(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+}
diff --git a/src/api-impl/meson.build b/src/api-impl/meson.build
index 6c7054f2..41bec462 100644
--- a/src/api-impl/meson.build
+++ b/src/api-impl/meson.build
@@ -439,6 +439,7 @@ srcs = [
 	'android/text/style/UpdateLayout.java',
 	'android/text/style/URLSpan.java',
 	'android/text/util/Linkify.java',
+	'android/transition/Fade.java',
 	'android/transition/Transition.java',
 	'android/util/AndroidException.java',
 	'android/util/AndroidRuntimeException.java',
@@ -627,6 +628,7 @@ srcs = [
 	'android/widget/Switch.java',
 	'android/widget/TableLayout.java',
 	'android/widget/TableRow.java',
+	'android/widget/TextSwitcher.java',
 	'android/widget/TextView.java',
 	'android/widget/Toast.java',
 	'android/widget/ToggleButton.java',