whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix wrong style of QMessageBox on Android. 

Extracting the theme information seems pretty buggy on some
Android devices, so let the platform functions do it instead.

Task-number: QTBUG-35687
Change-Id: Ib27e846fad98624c3c396dab06d476281de693f7
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
bb10
BogDan Vatra 2016-03-28 15:28:43 +03:00
parent daebbcf5f4
commit 32a419229a
1 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java
View File

@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 BogDan Vatra <bogdan@kde.org>
** Copyright (C) 2016 BogDan Vatra <bogdan@kde.org>
** Contact: http://www.qt.io/licensing/
**
** This file is part of the Android port of the Qt Toolkit.
@ -172,30 +172,6 @@ public class QtMessageDialogHelper
m_buttonsList.add(new ButtonStruct(this, id, text));
}
private void setTextAppearance(TextView view, String attr, String style)
{
try {
int[] attrs = (int[]) Class.forName("android.R$styleable").getDeclaredField("TextAppearance").get(null);
final TypedArray a = m_theme.obtainStyledAttributes(null,
attrs,
Class.forName("android.R$attr").getDeclaredField(attr).getInt(null),
Class.forName("android.R$style").getDeclaredField(style).getInt(null));
final int textSize = a.getDimensionPixelSize(
Class.forName("android.R$styleable").getDeclaredField("TextAppearance_textSize").getInt(null), 0);
if (textSize != 0)
view.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
final int textColor = a.getColor(
Class.forName("android.R$styleable").getDeclaredField("TextAppearance_textColor").getInt(null), 0x3138);
if (textColor != 0x3138)
view.setTextColor(textColor);
a.recycle();
} catch (Exception e) {
e.printStackTrace();
}
}
private Drawable getStyledDrawable(String drawable) throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException
{
int[] attrs = {Class.forName("android.R$attr").getDeclaredField(drawable).getInt(null)};
@ -252,7 +228,7 @@ public class QtMessageDialogHelper
view.setLongClickable(true);
view.setText(m_text);
setTextAppearance(view, "textAppearanceMedium", "TextAppearance_Medium");
view.setTextAppearance(m_activity, android.R.style.TextAppearance_Medium);
RelativeLayout.LayoutParams layout = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
layout.setMargins(16, 8, 16, 8);
@ -269,7 +245,7 @@ public class QtMessageDialogHelper
view.setLongClickable(true);
view.setText(m_informativeText);
setTextAppearance(view, "textAppearanceMedium", "TextAppearance_Medium");
view.setTextAppearance(m_activity, android.R.style.TextAppearance_Medium);
RelativeLayout.LayoutParams layout = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
layout.setMargins(16, 8, 16, 8);
@ -289,7 +265,7 @@ public class QtMessageDialogHelper
view.setLongClickable(true);
view.setText(m_detailedText);
setTextAppearance(view, "textAppearanceSmall", "TextAppearance_Small");
view.setTextAppearance(m_activity, android.R.style.TextAppearance_Small);
RelativeLayout.LayoutParams layout = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
layout.setMargins(16, 8, 16, 8);