diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-08-05 18:20:06 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2014-08-06 22:18:53 +0200 |
| commit | c79383968164af885dc8b9364b5198bb11bd3dbd (patch) | |
| tree | 4f8346b6280d6351da422279cf3c8207984daa13 /src | |
| parent | 7f78d547ca843ad58b016b72418f5b9ab47c8148 (diff) | |
Android: add support for Android.R.attr.state_accelerated
This lets the Qt Quick Controls Android Style choose the appropriate
window background that is meant to be used with HW acceleration.
Change-Id: I65d6f9319d77364637460e7c4ebb7ea3f4d53f12
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java | 6 |
1 files changed, 3 insertions, 3 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 6a948e289d..90e820de96 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java +++ b/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java @@ -451,9 +451,9 @@ public class ExtractStyle { final int [] DrawableStates ={android.R.attr.state_active, android.R.attr.state_checked , android.R.attr.state_enabled, android.R.attr.state_focused , android.R.attr.state_pressed, android.R.attr.state_selected - , android.R.attr.state_window_focused, 16908288, 16843597, 16843518}; - final String[] DrawableStatesLabels = {"active", "checked", "enabled", "focused", "pressed", "selected", "window_focused", "background", "multiline", "activated"}; - final String[] DisableDrawableStatesLabels = {"inactive", "unchecked", "disabled", "not_focused", "no_pressed", "unselected", "window_not_focused", "background", "multiline", "activated"}; + , android.R.attr.state_window_focused, 16908288, 16843597, 16843518, 16843547}; + final String[] DrawableStatesLabels = {"active", "checked", "enabled", "focused", "pressed", "selected", "window_focused", "background", "multiline", "activated", "accelerated"}; + final String[] DisableDrawableStatesLabels = {"inactive", "unchecked", "disabled", "not_focused", "no_pressed", "unselected", "window_not_focused", "background", "multiline", "activated", "accelerated"}; String getFileName(String file, String[] states) { |