diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index 05a16315641..220fdce27c9 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -521,7 +521,7 @@ android:title="@string/show_key_presses" android:summary="@string/show_key_presses_summary" /> - diff --git a/src/com/android/settings/development/TouchpadVisualizerPreferenceController.java b/src/com/android/settings/development/TouchpadVisualizerPreferenceController.java index 04ae92b56da..48582b6481b 100644 --- a/src/com/android/settings/development/TouchpadVisualizerPreferenceController.java +++ b/src/com/android/settings/development/TouchpadVisualizerPreferenceController.java @@ -23,7 +23,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.SwitchPreference; +import androidx.preference.SwitchPreferenceCompat; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -60,7 +60,7 @@ public class TouchpadVisualizerPreferenceController extends @Override public void updateState(@NonNull Preference preference) { boolean touchpadVisualizerEnabled = InputSettings.useTouchpadVisualizer(mContext); - ((SwitchPreference) mPreference).setChecked(touchpadVisualizerEnabled); + ((SwitchPreferenceCompat) mPreference).setChecked(touchpadVisualizerEnabled); } @Override @@ -68,6 +68,6 @@ public class TouchpadVisualizerPreferenceController extends super.onDeveloperOptionsSwitchDisabled(); InputSettings.setTouchpadVisualizer(mContext, false); - ((SwitchPreference) mPreference).setChecked(false); + ((SwitchPreferenceCompat) mPreference).setChecked(false); } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/development/TouchpadVisualizerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TouchpadVisualizerPreferenceControllerTest.java index 826bae927ef..3bf08991b49 100644 --- a/tests/robotests/src/com/android/settings/development/TouchpadVisualizerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TouchpadVisualizerPreferenceControllerTest.java @@ -27,7 +27,7 @@ import android.platform.test.annotations.EnableFlags; import android.platform.test.flag.junit.SetFlagsRule; import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; +import androidx.preference.SwitchPreferenceCompat; import com.android.hardware.input.Flags; import com.android.settings.testutils.shadow.ShadowSystemSettings; @@ -54,7 +54,7 @@ public class TouchpadVisualizerPreferenceControllerTest { @Mock private PreferenceScreen mScreen; @Mock - private SwitchPreference mPreference; + private SwitchPreferenceCompat mPreference; private Context mContext;