1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Fix wrong field name in ExtractStyle.java

Browse Source 
In Android 5.1 the field name for the inset state member in
InsetDrawable changed from mInsetState to mState.

Task-number: QTBUG-45714
Change-Id: I0ebada1ef90954013e5357cbd10df925f8f05295
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Christian Strømme 2015-04-24 15:21:21 +02:00 committed by Christian Stromme
parent ef622d55ca
commit 119c5ec93f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java
View File

@ -1100,7 +1100,9 @@ public class ExtractStyle {
{
try {
InsetDrawable d = (InsetDrawable)drawable;
Object mInsetStateObject = getAccessibleField(InsetDrawable.class, "mInsetState").get(d);
// mInsetState changed to mState in Android 5.1 (22)
Object mInsetStateObject = getAccessibleField(InsetDrawable.class, (Build.VERSION.SDK_INT > 21) ? "mState"
: "mInsetState").get(d);
Rect _padding = new Rect();
boolean hasPadding = d.getPadding(_padding);
return getDrawable(getAccessibleField(mInsetStateObject.getClass(), "mDrawable").get(mInsetStateObject), filename, hasPadding ? _padding : null);