Merge "Make SeekBarPreference to be selectable" into qt-dev

am: dd59f1193f

Change-Id: I89748794f2ebb28296347039de9e357808fe5b2f

src/com/android/settings/widget/SeekBarPreference.java

@@ -69,6 +69,13 @@ public class SeekBarPreference extends RestrictedPreference
                 com.android.internal.R.layout.preference_widget_seekbar);
         a.recycle();
 
+        a = context.obtainStyledAttributes(
+                attrs, com.android.internal.R.styleable.Preference, defStyleAttr, defStyleRes);
+        final boolean isSelectable = a.getBoolean(
+                com.android.settings.R.styleable.Preference_android_selectable, false);
+        setSelectable(isSelectable);
+        a.recycle();
+
         setLayoutResource(layoutResId);
     }
 
@@ -93,7 +100,11 @@ public class SeekBarPreference extends RestrictedPreference
 
     @Override
     public boolean isSelectable() {
-        return isDisabledByAdmin();
+        if(isDisabledByAdmin()) {
+            return true;
+        } else {
+            return super.isSelectable();
+        }
     }
 
     @Override