Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev
This commit is contained in:
@@ -82,12 +82,7 @@ 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();
|
||||
setSelectable(false);
|
||||
|
||||
setLayoutResource(layoutResId);
|
||||
}
|
||||
@@ -174,11 +169,6 @@ public class SeekBarPreference extends RestrictedPreference
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public CharSequence getSummary() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
|
||||
setProgress(restoreValue ? getPersistedInt(mProgress)
|
||||
|
Reference in New Issue
Block a user