From c79383968164af885dc8b9364b5198bb11bd3dbd Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 5 Aug 2014 18:20:06 +0200 Subject: 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 Reviewed-by: BogDan Vatra --- src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java | 6 +++--- 1 file 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) { -- cgit v1.2.3