From 004ba4ff00c405324830d3b37640fc4a4dc6d442 Mon Sep 17 00:00:00 2001 From: Mis012 Date: Sat, 22 Jun 2024 14:35:56 +0200 Subject: [PATCH] remove some old debugging prints, gate others behind verbose log --- src/api-impl-jni/android_content_res_AssetManager.c | 4 ++-- src/api-impl-jni/views/android_view_View.c | 2 -- src/api-impl-jni/widgets/WrapperWidget.c | 4 ++-- src/api-impl/android/graphics/drawable/Drawable.java | 1 - src/api-impl/android/view/View.java | 1 - src/libandroid/asset_manager.c | 4 ++-- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/api-impl-jni/android_content_res_AssetManager.c b/src/api-impl-jni/android_content_res_AssetManager.c index ea647d62..18a2cbf8 100644 --- a/src/api-impl-jni/android_content_res_AssetManager.c +++ b/src/api-impl-jni/android_content_res_AssetManager.c @@ -24,7 +24,7 @@ JNIEXPORT jlong JNICALL Java_android_content_res_AssetManager_openAsset(JNIEnv * struct AssetManager *asset_manager = _PTR(_GET_LONG_FIELD(this, "mObject")); struct Asset *asset = AssetManager_openNonAsset(asset_manager, file_name, mode); - printf("AssetManager_openAsset(%p, %s, %d) returns %p\n", asset_manager, file_name, mode, asset); + android_log_printf(ANDROID_LOG_VERBOSE, "["__FILE__"]", "AssetManager_openAsset(%p, %s, %d) returns %p\n", asset_manager, file_name, mode, asset); return _INTPTR(asset); } @@ -39,7 +39,7 @@ JNIEXPORT jint JNICALL Java_android_content_res_AssetManager_openAssetFd(JNIEnv struct AssetManager *asset_manager = _PTR(_GET_LONG_FIELD(this, "mObject")); struct Asset *asset = AssetManager_openNonAsset(asset_manager, file_name, mode); - printf("AssetManager_openAssetFd(%p, %s, %d, ...)\n", asset_manager, file_name, mode); + android_log_printf(ANDROID_LOG_VERBOSE, "["__FILE__"]", "AssetManager_openAssetFd(%p, %s, %d, ...)\n", asset_manager, file_name, mode); fd = Asset_openFileDescriptor(asset, &offset, &size); diff --git a/src/api-impl-jni/views/android_view_View.c b/src/api-impl-jni/views/android_view_View.c index 7e1efdca..558c7ef9 100644 --- a/src/api-impl-jni/views/android_view_View.c +++ b/src/api-impl-jni/views/android_view_View.c @@ -272,8 +272,6 @@ JNIEXPORT void JNICALL Java_android_view_View_native_1setLayoutParams(JNIEnv *en gboolean vexpand = FALSE; if (gravity != -1) { - printf(":::-: setting gravity: %d\n", gravity); - if(gravity & GRAVITY_BOTTOM) valign = GTK_ALIGN_END; else if(gravity & GRAVITY_TOP) diff --git a/src/api-impl-jni/widgets/WrapperWidget.c b/src/api-impl-jni/widgets/WrapperWidget.c index 8ff0570e..a74fba28 100644 --- a/src/api-impl-jni/widgets/WrapperWidget.c +++ b/src/api-impl-jni/widgets/WrapperWidget.c @@ -121,8 +121,8 @@ static void wrapper_widget_snapshot(GtkWidget *widget, GdkSnapshot *snapshot) static void wrapper_widget_class_init(WrapperWidgetClass *class) { - GObjectClass *object_class = G_OBJECT_CLASS (class); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); + GObjectClass *object_class = G_OBJECT_CLASS(class); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(class); object_class->dispose = wrapper_widget_dispose; diff --git a/src/api-impl/android/graphics/drawable/Drawable.java b/src/api-impl/android/graphics/drawable/Drawable.java index a6641c92..3480733a 100644 --- a/src/api-impl/android/graphics/drawable/Drawable.java +++ b/src/api-impl/android/graphics/drawable/Drawable.java @@ -151,7 +151,6 @@ public class Drawable { public void setTintList(ColorStateList tint) {} public void setTint(int tint) { - System.out.println("setTint("+tint+")"); setTintList(ColorStateList.valueOf(tint)); } diff --git a/src/api-impl/android/view/View.java b/src/api-impl/android/view/View.java index be00da8b..0fc0b687 100644 --- a/src/api-impl/android/view/View.java +++ b/src/api-impl/android/view/View.java @@ -876,7 +876,6 @@ public class View implements Drawable.Callback { if(background != null) { if(background instanceof ColorDrawable) { - System.out.printf("__background__: >%x<\n", ((ColorDrawable)background).getColor()); setBackgroundColor(((ColorDrawable)background).getColor()); } else { setBackgroundDrawable(background); diff --git a/src/libandroid/asset_manager.c b/src/libandroid/asset_manager.c index 6f984a90..b152b282 100644 --- a/src/libandroid/asset_manager.c +++ b/src/libandroid/asset_manager.c @@ -31,7 +31,7 @@ struct Asset* AAssetManager_open(struct AssetManager *asset_manager, const char char *path = malloc(strlen(ASSET_DIR) + strlen(file_name) + 1); sprintf(path, "%s%s", ASSET_DIR, file_name); - printf("AAssetManager_open called for %s\n", file_name); + android_log_printf(ANDROID_LOG_VERBOSE, "["__FILE__"]", "AAssetManager_open called for %s\n", file_name); struct Asset *asset = AssetManager_openNonAsset(asset_manager, path, mode); free(path); @@ -91,7 +91,7 @@ struct AAssetDir * AAssetManager_openDir(struct AssetManager *asset_manager, con dir->asset_dir = asset_dir; dir->curr_index = 0; - printf("AAssetManager_openDir called for %s\n", dirpath); + android_log_printf(ANDROID_LOG_VERBOSE, "["__FILE__"]", "AAssetManager_openDir called for %s\n", dirpath); return dir; }