diff --git a/res/xml/gesture_navigation_settings.xml b/res/xml/gesture_navigation_settings.xml
index 7465dd9454ed..7901483f62b7 100644
--- a/res/xml/gesture_navigation_settings.xml
+++ b/res/xml/gesture_navigation_settings.xml
@@ -63,7 +63,19 @@
         settings:textEnd="@string/thick_label"
         android:dependency="navigation_bar_hint" />
 
-    <com.android.settingslib.widget.SliderPreference
+
+
+    <ListPreference
+        android:key="gesture_navbar_space_preference"
+        android:title="@string/gesture_navbar_space_title"
+        android:summary="@string/gesture_navbar_space_summary"
+        android:entries="@array/gesture_navbar_space_entries"
+        android:entryValues="@array/gesture_navbar_space_values"
+        android:defaultValue="0"
+        android:persistent="false"
+        settings:useSimpleSummaryProvider="true" />
+
+<com.android.settingslib.widget.SliderPreference
         android:key="gesture_back_height"
         android:title="@string/back_height_title"
         android:summary="@string/back_height_summary"
diff --git a/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java b/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
index afcaacbdca38..54488f06d675 100644
--- a/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
+++ b/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
@@ -71,6 +71,11 @@ public class GestureNavigationSettingsFragment extends DashboardFragment impleme
     private static final String GESTURE_NAVBAR_LENGTH_KEY = "gesture_navbar_length_preference";
     private static final String GESTURE_BACK_HEIGHT_KEY = "gesture_back_height";
     private static final String GESTURE_NAVBAR_HEIGHT_MODE_KEY = "gesture_navbar_height_preference";
+    private static final String GESTURE_NAVBAR_SPACE_PREFERENCE_KEY =
+            "gesture_navbar_space_preference";
+    private static final int GESTURE_NAVBAR_SPACE_DEFAULT = 0;
+    private static final int GESTURE_NAVBAR_SPACE_COMPACT = 1;
+    private static final int GESTURE_NAVBAR_SPACE_MINIMAL = 2;
     private static final String KEY_CORNER_LONG_SWIPE = "navigation_bar_corner_long_swipe";
     private static final String KEY_EDGE_LONG_SWIPE = "navigation_bar_edge_long_swipe";
     private static final String KEY_ENABLE_TASKBAR = "enable_taskbar";
@@ -125,6 +130,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 
         initGestureNavbarLengthPreference();
         initGestureNavbarHeightPreference();
+        initGestureNavbarSpacePreference();
 
         Action cornerLongSwipeAction = Action.fromSettings(resolver,
                 LineageSettings.System.KEY_CORNER_LONG_SWIPE_ACTION,
@@ -371,6 +377,43 @@ private void initGestureNavbarHeightPreference() {
             Settings.System.GESTURE_NAVBAR_HEIGHT_MODE, (int) v, UserHandle.USER_CURRENT));
     }
 
+
+    private void initGestureNavbarSpacePreference() {
+        final ListPreference pref = getPreferenceScreen().findPreference(
+                GESTURE_NAVBAR_SPACE_PREFERENCE_KEY);
+        if (pref == null) {
+            return;
+        }
+
+        final ContentResolver resolver = getContext().getContentResolver();
+        final int mode = Settings.System.getIntForUser(
+                resolver,
+                Settings.System.GESTURE_NAVBAR_SPACE_MODE,
+                GESTURE_NAVBAR_SPACE_DEFAULT,
+                UserHandle.USER_CURRENT);
+
+        pref.setValue(Integer.toString(mode));
+        pref.setOnPreferenceChangeListener((preference, newValue) -> {
+            final int newMode;
+            try {
+                newMode = Integer.parseInt((String) newValue);
+            } catch (NumberFormatException e) {
+                return false;
+            }
+
+            if (newMode < GESTURE_NAVBAR_SPACE_DEFAULT
+                    || newMode > GESTURE_NAVBAR_SPACE_MINIMAL) {
+                return false;
+            }
+
+            return Settings.System.putIntForUser(
+                    resolver,
+                    Settings.System.GESTURE_NAVBAR_SPACE_MODE,
+                    newMode,
+                    UserHandle.USER_CURRENT);
+        });
+    }
+
     private CharSequence formatStateDescription(SliderPreference pref, int progress) {
         Locale curLocale = getContext().getResources().getConfiguration().getLocales().get(0);
         NumberFormat numberFormat = NumberFormat.getPercentInstance(curLocale);