From 42af56bf611ecf2ec1747bc843b536168b2db2cf Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 20 Dec 2022 16:27:21 +0200 Subject: [PATCH] Android: fix deprecations for getDrawable() on QtMessageDialogHelper Change-Id: Icd359663af11f44b4bcf0cd4e4f1f7f5a51242e4 Reviewed-by: Ville Voutilainen (cherry picked from commit 31a0d99fa565d39bf39f0c3ae5ed00859679a969) Reviewed-by: Qt Cherry-pick Bot --- .../qtproject/qt/android/QtMessageDialogHelper.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java b/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java index 5680c068aad..58bcbf06271 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java @@ -73,7 +73,8 @@ public class QtMessageDialogHelper try { TypedValue typedValue = new TypedValue(); m_theme.resolveAttribute(android.R.attr.alertDialogIcon, typedValue, true); - return m_activity.getResources().getDrawable(typedValue.resourceId); + return m_activity.getResources().getDrawable(typedValue.resourceId, + m_activity.getTheme()); } catch (Exception e) { e.printStackTrace(); } @@ -83,7 +84,8 @@ public class QtMessageDialogHelper { case 1: // Information try { - return m_activity.getResources().getDrawable(android.R.drawable.ic_dialog_info); + return m_activity.getResources().getDrawable(android.R.drawable.ic_dialog_info, + m_activity.getTheme()); } catch (Exception e) { e.printStackTrace(); } @@ -97,14 +99,16 @@ public class QtMessageDialogHelper // break; case 3: // Critical try { - return m_activity.getResources().getDrawable(android.R.drawable.ic_dialog_alert); + return m_activity.getResources().getDrawable(android.R.drawable.ic_dialog_alert, + m_activity.getTheme()); } catch (Exception e) { e.printStackTrace(); } break; case 4: // Question try { - return m_activity.getResources().getDrawable(android.R.drawable.ic_menu_help); + return m_activity.getResources().getDrawable(android.R.drawable.ic_menu_help, + m_activity.getTheme()); } catch (Exception e) { e.printStackTrace(); }