Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev
This commit is contained in:
@@ -64,7 +64,6 @@ public class ShortcutPreference extends Preference {
|
|||||||
setLayoutResource(R.layout.accessibility_shortcut_secondary_action);
|
setLayoutResource(R.layout.accessibility_shortcut_secondary_action);
|
||||||
setWidgetLayoutResource(R.layout.preference_widget_master_switch);
|
setWidgetLayoutResource(R.layout.preference_widget_master_switch);
|
||||||
setIconSpaceReserved(true);
|
setIconSpaceReserved(true);
|
||||||
setSelectable(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -138,8 +137,6 @@ public class ShortcutPreference extends Preference {
|
|||||||
public void setSettingsEditable(boolean enabled) {
|
public void setSettingsEditable(boolean enabled) {
|
||||||
if (mSettingsEditable != enabled) {
|
if (mSettingsEditable != enabled) {
|
||||||
mSettingsEditable = enabled;
|
mSettingsEditable = enabled;
|
||||||
// Disable whole component to let each child component can be addressed.
|
|
||||||
setSelectable(!mSettingsEditable);
|
|
||||||
notifyChanged();
|
notifyChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user