summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2014-05-27 06:42:42 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-27 13:04:16 +0200
commitd318e14715d2c6b07ccfccb0982f18a53a453da1 (patch)
treec8697a840c23175df71341b1f98768668929e6a1 /src/android
parent72a424f51281273d5f1774ce3995cdf87bb9e7ac (diff)
Android: extract View_scrollbarDefaultDelayBeforeFade
Task-number: QTBUG-39215 Change-Id: I8cc6e16a7155710ad322dc884ccbb194ca7d5b67 Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java3
1 files changed, 3 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 768ce40260..cd67c95264 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java
@@ -150,6 +150,7 @@ public class ExtractStyle {
final int View_fadingEdge = getField(styleableClass,"View_fadingEdge");
final int View_scrollbarStyle = getField(styleableClass,"View_scrollbarStyle");
final int View_scrollbarFadeDuration = getField(styleableClass,"View_scrollbarFadeDuration");
+ final int View_scrollbarDefaultDelayBeforeFade = getField(styleableClass,"View_scrollbarDefaultDelayBeforeFade");
final int View_scrollbarSize = getField(styleableClass,"View_scrollbarSize");
final int View_scrollbarThumbHorizontal = getField(styleableClass,"View_scrollbarThumbHorizontal");
final int View_scrollbarThumbVertical = getField(styleableClass,"View_scrollbarThumbVertical");
@@ -896,6 +897,8 @@ public class ExtractStyle {
json.put("View_scrollbarStyle", a.getInt(attr, 0));
else if (attr == View_scrollbarFadeDuration)
json.put("View_scrollbarFadeDuration", a.getInt(attr, 0));
+ else if (attr == View_scrollbarDefaultDelayBeforeFade)
+ json.put("View_scrollbarDefaultDelayBeforeFade", a.getInt(attr, 0));
else if (attr == View_scrollbarSize)
json.put("View_scrollbarSize", a.getDimensionPixelSize(attr, -1));
else if (attr == View_scrollbarThumbHorizontal)