diff --git a/res/xml/screen_off_udfps_settings.xml b/res/xml/screen_off_udfps_settings.xml
index f723321124a32cadb7f168fcebfae589a6dfd086..1e1bddbd6ff27311dc4b0193fb1f431af83734cf 100644
--- a/res/xml/screen_off_udfps_settings.xml
+++ b/res/xml/screen_off_udfps_settings.xml
@@ -19,7 +19,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:title="@string/ambient_display_screen_off_udfps_title">
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:key="gesture_screen_off_udfps"
         android:title="@string/ambient_display_screen_off_udfps_title"
         android:summary="@string/ambient_display_screen_off_udfps_summary"
diff --git a/src/com/android/settings/gestures/ScreenOffUdfpsSettings.java b/src/com/android/settings/gestures/ScreenOffUdfpsSettings.java
index 959c0f7df1393de3feeea3ea5552a531a313cb2e..763ffb69bf7739993dfc55d1cbbfa1a1b40856af 100644
--- a/src/com/android/settings/gestures/ScreenOffUdfpsSettings.java
+++ b/src/com/android/settings/gestures/ScreenOffUdfpsSettings.java
@@ -44,7 +44,7 @@ public class ScreenOffUdfpsSettings extends DashboardFragment {
     public void onAttach(Context context) {
         super.onAttach(context);
         SuggestionFeatureProvider suggestionFeatureProvider =
-                FeatureFactory.getFactory(context).getSuggestionFeatureProvider();
+                FeatureFactory.Companion.getFeatureFactory().getSuggestionFeatureProvider();
         SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context);
         prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply();