summaryrefslogtreecommitdiffstats
path: root/src/android/jar
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2014-11-09 13:01:35 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2014-11-10 12:19:12 +0100
commitd9715108c1bf46d3a2b0482d1c9a0f61215a5e0e (patch)
tree86848c427dd1270a96a8ed8679c353f08593330f /src/android/jar
parent3d70925ee54d06e90bea392883d230b8ae2b1782 (diff)
Android 5.0: extract new Switch style attributes
Switch_showText specifies whether the on/off text is shown in the thumb and Switch_splitTrack specifies whether the track is clipped underneath the thumb. Change-Id: I03fc6b799fe714e7b6e604328901c8c5a418ca6e Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/android/jar')
-rw-r--r--src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java b/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java
index b75dbac4b8..1e30e4a580 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java
@@ -1544,6 +1544,11 @@ public class ExtractStyle {
json.put("Switch_switchPadding", a.getDimensionPixelSize(getField(styleableClass, "Switch_switchPadding"), 0));
json.put("Switch_thumbTextPadding", a.getDimensionPixelSize(getField(styleableClass, "Switch_thumbTextPadding"), 0));
+ if (Build.VERSION.SDK_INT >= 21) {
+ json.put("Switch_showText", a.getBoolean(getField(styleableClass, "Switch_showText"), true));
+ json.put("Switch_splitTrack", a.getBoolean(getField(styleableClass, "Switch_splitTrack"), false));
+ }
+
a.recycle();
jsonWriter.name(styleName).value(json);
} catch (Exception e) {