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

Remove Settings preference_widget_primary_switch

Browse Source 
File content same as SettingsLib's preference_widget_primary_switch

Bug: 285231003
Test: m Settings
Change-Id: I4b9f92435ffb5c253241e294c4680025fe0447fc
This commit is contained in:
Chaohui Wang
2023-10-20 12:55:22 +08:00
parent a2cd54edaf
commit 82a9a9e47d
4 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,7 @@ public class ShortcutPreference extends Preference {
ShortcutPreference(Context context, AttributeSet attrs) {
super(context, attrs);
setLayoutResource(R.layout.accessibility_shortcut_secondary_action);
setWidgetLayoutResource(R.layout.preference_widget_primary_switch);
setWidgetLayoutResource(com.android.settingslib.R.layout.preference_widget_primary_switch);
setIconSpaceReserved(false);
// Treat onSettingsClicked as this preference's click.
setOnPreferenceClickListener(preference -> {
@@ -88,7 +88,8 @@ public class ShortcutPreference extends Preference {
mSettingsEditable ? outValue.resourceId : /* Remove background */ 0);
}
Switch switchWidget = holder.itemView.findViewById(R.id.switchWidget);
Switch switchWidget =
holder.itemView.findViewById(com.android.settingslib.R.id.switchWidget);
if (switchWidget != null) {
// Consumes move events to ignore drag actions.
switchWidget.setOnTouchListener((v, event) -> {