diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d9e1735..7a51340 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1003,6 +1003,22 @@
         </activity>
 
         <activity
+            android:name=".Settings$NavigationModeSettingsActivity"
+            android:label="@string/system_navigation_title"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.android.settings.NAVIGATION_MODE_SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.gestures.SystemNavigationGestureSettings"/>
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_system"/>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true"/>
+        </activity>
+
+        <activity
             android:name=".Settings$RegionalPreferencesActivity"
             android:label="@string/regional_preferences_title"
             android:exported="true" >
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 5b2b983..c172be5 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -135,6 +135,8 @@
     /** Activity for the regional preferences settings. */
     public static class RegionalPreferencesActivity extends SettingsActivity { /* empty */ }
     public static class KeyboardSettingsActivity extends SettingsActivity { /* empty */ }
+    /** Activity for the navigation mode settings. */
+    public static class NavigationModeSettingsActivity extends SettingsActivity { /* empty */ }
     public static class UserDictionarySettingsActivity extends SettingsActivity { /* empty */ }
     public static class DarkThemeSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DisplaySettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 87d0a7e..836a544 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -419,5 +419,6 @@
             Settings.ModuleLicensesActivity.class.getName(),
             UserBackupSettingsActivity.class.getName(),
             Settings.MemtagPageActivity.class.getName(),
+            Settings.NavigationModeSettingsActivity.class.getName(),
     };
 }