diff --git a/res/xml/double_tap_power_settings.xml b/res/xml/double_tap_power_to_open_camera_settings.xml
similarity index 82%
rename from res/xml/double_tap_power_settings.xml
rename to res/xml/double_tap_power_to_open_camera_settings.xml
index deb171c27cd..315c7f04da4 100644
--- a/res/xml/double_tap_power_settings.xml
+++ b/res/xml/double_tap_power_to_open_camera_settings.xml
@@ -18,19 +18,18 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:title="@string/double_tap_power_for_camera_title">
 
     <com.android.settingslib.widget.IllustrationPreference
         android:key="gesture_double_tap_power_video"
         settings:searchable="false"
-        app:lottie_rawRes="@drawable/quickly_open_camera"/>
+        settings:lottie_rawRes="@drawable/quickly_open_camera"/>
 
     <SwitchPreferenceCompat
         android:key="gesture_double_tap_power"
         android:title="@string/double_tap_power_for_camera_title"
         android:summary="@string/double_tap_power_for_camera_summary"
-        app:keywords="@string/keywords_gesture"
-        app:controller="com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController"/>
+        settings:keywords="@string/keywords_gesture"
+        settings:controller="com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController"/>
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
index 577758df396..75140ed8c31 100644
--- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java
+++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
@@ -56,9 +56,9 @@ public class DoubleTapPowerSettings extends DashboardFragment {
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.double_tap_power_settings;
+        return R.xml.double_tap_power_to_open_camera_settings;
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.double_tap_power_settings);
+            new BaseSearchIndexProvider(R.xml.double_tap_power_to_open_camera_settings);
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
index a08b81800a4..10e2565b345 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
@@ -20,6 +20,8 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.provider.SearchIndexableResource;
 
+import com.android.settings.R;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,11 +40,17 @@ public class DoubleTapPowerSettingsTest {
         mSettings = new DoubleTapPowerSettings();
     }
 
+    @Test
+    public void getPreferenceResId_returnsResId() {
+        assertThat(mSettings.getPreferenceScreenResId())
+                .isEqualTo(R.xml.double_tap_power_to_open_camera_settings);
+    }
+
     @Test
     public void testSearchIndexProvider_shouldIndexResource() {
         final List<SearchIndexableResource> indexRes =
-            DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                RuntimeEnvironment.application, true /* enabled */);
+                DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        RuntimeEnvironment.application, true /* enabled */);
 
         assertThat(indexRes).isNotNull();
         assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());