PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c

Browse Source 
Change-Id: I7656da884d4d656b7d4cba9b12bcf017b3e5edcb
This commit is contained in:
Menghan Li
2020-03-26 09:41:57 +00:00
committed by Automerger Merge Worker
parent a5852f43db b751a12a1c
commit cfbd58ecc6
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/accessibility/ShortcutPreference.java
View File

@@ -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();
} }
} }