diff --git a/res/xml/emergency_gesture_settings.xml b/res/xml/emergency_gesture_settings.xml
index 2f53a906994..22e51a9e268 100644
--- a/res/xml/emergency_gesture_settings.xml
+++ b/res/xml/emergency_gesture_settings.xml
@@ -22,15 +22,11 @@
 
     <com.android.settingslib.widget.MainSwitchPreference
         android:key="gesture_emergency_button_switch_bar"
-        app:controller="com.android.settings.gestures.EmergencyGesturePreferenceController" />
-
-    <com.android.settings.widget.VideoPreference
-        android:key="emergency_gesture_screen_video"
-        app:animation="@raw/gesture_double_tap"
-        app:preview="@drawable/gesture_double_tap"/>
+        app:controller="com.android.settings.emergency.EmergencyGesturePreferenceController" />
 
     <com.android.settingslib.widget.TopIntroPreference
         android:title="@string/emergency_gesture_screen_summary"
+        app:allowDividerAbove="false"
         app:allowDividerBelow="true" />
 
     <SwitchPreference
@@ -39,10 +35,10 @@
         android:title="@string/emergency_gesture_sound_setting_title"
         android:summary="@string/emergency_gesture_sound_setting_summary"
         app:keywords="@string/keywords_gesture"
-        app:controller="com.android.settings.gestures.EmergencyGestureSoundPreferenceController"
+        app:controller="com.android.settings.emergency.EmergencyGestureSoundPreferenceController"
         app:allowDividerAbove="true"/>
 
-    <com.android.settings.gestures.EmergencyGestureNumberOverridePreference
+    <com.android.settings.emergency.EmergencyGestureNumberOverridePreference
         android:key="emregency_gesture_number_override"
         android:title="@string/emergency_gesture_call_for_help_title"
         android:summary="@string/summary_placeholder"
@@ -51,5 +47,5 @@
         android:dialogLayout="@layout/emergency_gesture_number_override_dialog"
         android:positiveButtonText="@string/save"
         app:allowDividerAbove="true"
-        app:controller="com.android.settings.gestures.EmergencyGestureNumberOverridePreferenceController"/>
+        app:controller="com.android.settings.emergency.EmergencyGestureNumberOverridePreferenceController"/>
 </PreferenceScreen>
diff --git a/res/xml/emergency_settings.xml b/res/xml/emergency_settings.xml
index 31c209bf375..25ae82d3fb6 100644
--- a/res/xml/emergency_settings.xml
+++ b/res/xml/emergency_settings.xml
@@ -29,8 +29,8 @@
         android:key="gesture_emergency_summary"
         android:title="@string/emergency_gesture_screen_title"
         android:order="100"
-        android:fragment="com.android.settings.gestures.EmergencyGestureSettings"
-        settings:controller="com.android.settings.gestures.EmergencyGestureEntrypointPreferenceController" />
+        android:fragment="com.android.settings.emergency.EmergencyGestureSettings"
+        settings:controller="com.android.settings.emergency.EmergencyGestureEntrypointPreferenceController" />
     <com.android.settingslib.RestrictedPreference
         android:key="app_and_notif_cell_broadcast_settings"
         android:title="@string/cell_broadcast_settings"
diff --git a/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceController.java b/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java
similarity index 99%
rename from src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceController.java
rename to src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java
index 278fa3aa961..fa0b0329538 100644
--- a/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceController.java
+++ b/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.gestures;
+package com.android.settings.emergency;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreference.java b/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreference.java
similarity index 98%
rename from src/com/android/settings/gestures/EmergencyGestureNumberOverridePreference.java
rename to src/com/android/settings/emergency/EmergencyGestureNumberOverridePreference.java
index 6e0a6a72065..9b5fea7a2ac 100644
--- a/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreference.java
+++ b/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.gestures;
+package com.android.settings.emergency;
 
 import static android.content.DialogInterface.BUTTON_POSITIVE;
 
diff --git a/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java b/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceController.java
similarity index 98%
rename from src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java
rename to src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceController.java
index ecbd9c76cf2..b6e46e6da88 100644
--- a/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java
+++ b/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.gestures;
+package com.android.settings.emergency;
 
 import static com.android.settingslib.emergencynumber.EmergencyNumberUtils.EMERGENCY_NUMBER_OVERRIDE_AUTHORITY;
 
diff --git a/src/com/android/settings/gestures/EmergencyGesturePreferenceController.java b/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java
similarity index 97%
rename from src/com/android/settings/gestures/EmergencyGesturePreferenceController.java
rename to src/com/android/settings/emergency/EmergencyGesturePreferenceController.java
index 241552690cf..a966ab309e9 100644
--- a/src/com/android/settings/gestures/EmergencyGesturePreferenceController.java
+++ b/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.gestures;
+package com.android.settings.emergency;
 
 import android.content.Context;
 import android.provider.Settings;
@@ -71,7 +71,7 @@ public class EmergencyGesturePreferenceController extends BasePreferenceControll
 
     @VisibleForTesting
     public boolean isChecked() {
-        return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, OFF) == ON;
+        return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, ON) == ON;
     }
 
     @Override
diff --git a/src/com/android/settings/gestures/EmergencyGestureSettings.java b/src/com/android/settings/emergency/EmergencyGestureSettings.java
similarity index 98%
rename from src/com/android/settings/gestures/EmergencyGestureSettings.java
rename to src/com/android/settings/emergency/EmergencyGestureSettings.java
index 5eec21cd188..7826872acff 100644
--- a/src/com/android/settings/gestures/EmergencyGestureSettings.java
+++ b/src/com/android/settings/emergency/EmergencyGestureSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.gestures;
+package com.android.settings.emergency;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
diff --git a/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceController.java b/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java
similarity index 88%
rename from src/com/android/settings/gestures/EmergencyGestureSoundPreferenceController.java
rename to src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java
index 1a68ade9fe5..d5896d8b111 100644
--- a/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceController.java
+++ b/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.gestures;
+package com.android.settings.emergency;
 
 import android.content.Context;
 import android.provider.Settings;
@@ -22,11 +22,12 @@ import android.provider.Settings;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
 
 /**
  * Preference controller for emergency sos gesture setting
  */
-public class EmergencyGestureSoundPreferenceController extends GesturePreferenceController {
+public class EmergencyGestureSoundPreferenceController extends TogglePreferenceController {
 
     @VisibleForTesting
     static final int ON = 1;
@@ -39,11 +40,6 @@ public class EmergencyGestureSoundPreferenceController extends GesturePreference
         super(context, key);
     }
 
-    @Override
-    protected String getVideoPrefKey() {
-        return "emergency_gesture_screen_video";
-    }
-
     private static boolean isGestureAvailable(Context context) {
         return context.getResources()
                 .getBoolean(R.bool.config_show_emergency_gesture_settings);
diff --git a/tests/robotests/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java
similarity index 94%
rename from tests/robotests/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java
index e62de080f3c..916937284a0 100644
--- a/tests/robotests/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.settings.gestures;
+package com.android.settings.emergency;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
-import static com.android.settings.gestures.EmergencyGestureEntrypointPreferenceController.ACTION_EMERGENCY_GESTURE_SETTINGS;
+import static com.android.settings.emergency.EmergencyGestureEntrypointPreferenceController.ACTION_EMERGENCY_GESTURE_SETTINGS;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceControllerTest.java
index 80c10d0edc9..cab17aba709 100644
--- a/tests/robotests/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.gestures;
+package com.android.settings.emergency;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
diff --git a/tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/emergency/EmergencyGesturePreferenceControllerTest.java
similarity index 92%
rename from tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/emergency/EmergencyGesturePreferenceControllerTest.java
index 08106d3b661..542301cc95b 100644
--- a/tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/emergency/EmergencyGesturePreferenceControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.settings.gestures;
+package com.android.settings.emergency;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
-import static com.android.settings.gestures.EmergencyGesturePreferenceController.OFF;
-import static com.android.settings.gestures.EmergencyGesturePreferenceController.ON;
+import static com.android.settings.emergency.EmergencyGesturePreferenceController.OFF;
+import static com.android.settings.emergency.EmergencyGesturePreferenceController.ON;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceControllerTest.java
similarity index 91%
rename from tests/robotests/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceControllerTest.java
index b14a29e0b35..6f3884eb7be 100644
--- a/tests/robotests/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.settings.gestures;
+package com.android.settings.emergency;
 
-import static com.android.settings.gestures.EmergencyGestureSoundPreferenceController.OFF;
-import static com.android.settings.gestures.EmergencyGestureSoundPreferenceController.ON;
+import static com.android.settings.emergency.EmergencyGestureSoundPreferenceController.OFF;
+import static com.android.settings.emergency.EmergencyGestureSoundPreferenceController.ON;
 
 import static com.google.common.truth.Truth.assertThat;