From e80b0f3d87a6f702b9d1d58068f8cc714c163c01 Mon Sep 17 00:00:00 2001 From: Samuel Mira Date: Fri, 3 Jun 2022 17:31:32 +0300 Subject: Android 13: Fix warnings on starting an application On Android 13, currently in beta, android triggers a warning because it is using a deprecated getDrawable function. The patch changes it to use the non-deprecated alternative as suggested in the warning. Fixes: QTBUG-103568 Change-Id: I3e629e7b75044bfb51874256895be0ec7e1088f8 Reviewed-by: Ville Voutilainen (cherry picked from commit e07fea6fb405c6e9affe6e377ad99a98a740c5be) Reviewed-by: Assam Boudjelthia --- src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java index 21e6ddc84d..c36459ad3a 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java @@ -819,7 +819,7 @@ public class QtActivityDelegate m_splashScreenSticky = info.metaData.containsKey("android.app.splash_screen_sticky") && info.metaData.getBoolean("android.app.splash_screen_sticky"); int id = info.metaData.getInt(splashScreenKey); m_splashScreen = new ImageView(m_activity); - m_splashScreen.setImageDrawable(m_activity.getResources().getDrawable(id)); + m_splashScreen.setImageDrawable(m_activity.getResources().getDrawable(id, m_activity.getTheme())); m_splashScreen.setScaleType(ImageView.ScaleType.FIT_XY); m_splashScreen.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); m_layout.addView(m_splashScreen); @@ -1258,7 +1258,7 @@ public class QtActivityDelegate if (attr.type >= TypedValue.TYPE_FIRST_COLOR_INT && attr.type <= TypedValue.TYPE_LAST_COLOR_INT) { m_activity.getWindow().setBackgroundDrawable(new ColorDrawable(attr.data)); } else { - m_activity.getWindow().setBackgroundDrawable(m_activity.getResources().getDrawable(attr.resourceId)); + m_activity.getWindow().setBackgroundDrawable(m_activity.getResources().getDrawable(attr.resourceId, m_activity.getTheme())); } if (m_dummyView != null) { m_layout.removeView(m_dummyView); -- cgit v1.2.3