From 44d922baea047a2bb7bde9ff91288dea6b98d715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kilian=20=22Caf=C3=A9Haine=22=20Guillaume?= Date: Tue, 19 Nov 2024 18:00:38 +0100 Subject: [PATCH] api-impl: stubs and fixes for Open Sudoku --- src/api-impl/android/content/Context.java | 2 +- src/api-impl/android/graphics/Paint.java | 2 ++ .../graphics/drawable/DrawableWrapper.java | 15 +++++++++++++++ .../android/graphics/drawable/InsetDrawable.java | 16 ++++------------ src/api-impl/android/media/AudioManager.java | 4 ++++ src/api-impl/android/view/View.java | 2 ++ src/api-impl/meson.build | 1 + 7 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 src/api-impl/android/graphics/drawable/DrawableWrapper.java diff --git a/src/api-impl/android/content/Context.java b/src/api-impl/android/content/Context.java index 2386f00a..deab4330 100644 --- a/src/api-impl/android/content/Context.java +++ b/src/api-impl/android/content/Context.java @@ -217,7 +217,7 @@ public class Context extends Object { case "accessibility": return new AccessibilityManager(); case "layout_inflater": - return new LayoutInflater(getApplicationContext()); + return new LayoutInflater(this); case "wifi": return new WifiManager(); case "bluetooth": diff --git a/src/api-impl/android/graphics/Paint.java b/src/api-impl/android/graphics/Paint.java index ebf6bc1c..eaa36369 100644 --- a/src/api-impl/android/graphics/Paint.java +++ b/src/api-impl/android/graphics/Paint.java @@ -282,6 +282,8 @@ public class Paint { return new FontMetricsInt(); } + public void set(Paint paint) {} + private native long native_constructor(); private native void native_set_antialias(long skia_paint, boolean aa); private native void native_set_color(long skia_paint, int color); diff --git a/src/api-impl/android/graphics/drawable/DrawableWrapper.java b/src/api-impl/android/graphics/drawable/DrawableWrapper.java new file mode 100644 index 00000000..9990622e --- /dev/null +++ b/src/api-impl/android/graphics/drawable/DrawableWrapper.java @@ -0,0 +1,15 @@ +package android.graphics.drawable; + +import android.graphics.drawable.Drawable; + +public class DrawableWrapper extends Drawable { + private Drawable drawable; + + public DrawableWrapper(Drawable drawable) { + this.drawable = drawable; + } + + public Drawable getDrawable() { + return drawable; + } +} diff --git a/src/api-impl/android/graphics/drawable/InsetDrawable.java b/src/api-impl/android/graphics/drawable/InsetDrawable.java index 31af0e77..188021ec 100644 --- a/src/api-impl/android/graphics/drawable/InsetDrawable.java +++ b/src/api-impl/android/graphics/drawable/InsetDrawable.java @@ -1,25 +1,17 @@ package android.graphics.drawable; import android.graphics.Rect; +import android.graphics.drawable.DrawableWrapper; -public class InsetDrawable extends Drawable { - - private Drawable drawable; +public class InsetDrawable extends DrawableWrapper { public InsetDrawable(Drawable drawable, int insetLeft, int insetTop, int insetRight, int insetBottom) { - super(); - this.drawable = drawable; + super(drawable); } public InsetDrawable(Drawable drawable, int inset) { - super(); - this.drawable = drawable; + super(drawable); } public boolean getPadding(Rect padding) { return false; } - - public Drawable getDrawable() { - return drawable; - } - } diff --git a/src/api-impl/android/media/AudioManager.java b/src/api-impl/android/media/AudioManager.java index 1be737a7..2cab883c 100644 --- a/src/api-impl/android/media/AudioManager.java +++ b/src/api-impl/android/media/AudioManager.java @@ -52,4 +52,8 @@ public class AudioManager { public void setStreamVolume(int streamType, int index, int flags) { System.out.println("AudioManager.setStreamVolume: >" + streamType + "< >" + index + "< >" + flags + "<"); } + + public boolean isStreamMute(int streamType) { + return false; + } } diff --git a/src/api-impl/android/view/View.java b/src/api-impl/android/view/View.java index 9abbca08..5c6fbd62 100644 --- a/src/api-impl/android/view/View.java +++ b/src/api-impl/android/view/View.java @@ -1947,4 +1947,6 @@ public class View implements Drawable.Callback { public int getImportantForAutofill() {return 0;} public void setImportantForAutofill(int flag) {} + + public void setDefaultFocusHighlightEnabled(boolean enabled) {} } diff --git a/src/api-impl/meson.build b/src/api-impl/meson.build index fc92916e..c3b1827f 100644 --- a/src/api-impl/meson.build +++ b/src/api-impl/meson.build @@ -206,6 +206,7 @@ hax_jar = jar('hax', [ 'android/graphics/drawable/ColorDrawable.java', 'android/graphics/drawable/Drawable.java', 'android/graphics/drawable/DrawableContainer.java', + 'android/graphics/drawable/DrawableWrapper.java', 'android/graphics/drawable/GradientDrawable.java', 'android/graphics/drawable/InsetDrawable.java', 'android/graphics/drawable/LayerDrawable.java',