Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0ab024a authored by Bruno Martins's avatar Bruno Martins
Browse files

ButtonSettings: Bring back navbar inverted layout unconditionally

This reverts commit 5e81a834.
When that was first committed, it was missed the fact that
user might want to invert down arrow key and IME switcher,
which only show up when typing.

Change-Id: Ie7459ddf63400aa5a813ce4a279d138721fbc122
parent aeeabd21
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
    private static final String KEY_VOLUME_PANEL_ON_LEFT = "volume_panel_on_left";
    private static final String DISABLE_NAV_KEYS = "disable_nav_keys";
    private static final String KEY_NAVIGATION_ARROW_KEYS = "navigation_bar_menu_arrow_keys";
    private static final String KEY_NAVIGATION_INVERTED_LAYOUT = "sysui_nav_bar_inverse";
    private static final String KEY_NAVIGATION_HOME_LONG_PRESS = "navigation_home_long_press";
    private static final String KEY_NAVIGATION_HOME_DOUBLE_TAP = "navigation_home_double_tap";
    private static final String KEY_NAVIGATION_APP_SWITCH_LONG_PRESS =
@@ -118,7 +117,6 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
    private SwitchPreference mVolumePanelOnLeft;
    private SwitchPreference mDisableNavigationKeys;
    private SwitchPreference mNavigationArrowKeys;
    private SwitchPreference mNavigationInvertedLayout;
    private ListPreference mNavigationHomeLongPressAction;
    private ListPreference mNavigationHomeDoubleTapAction;
    private ListPreference mNavigationAppSwitchLongPressAction;
@@ -225,10 +223,6 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
        // Navigation bar arrow keys while typing
        mNavigationArrowKeys = (SwitchPreference) findPreference(KEY_NAVIGATION_ARROW_KEYS);

        // Navigation bar inverted layout
        mNavigationInvertedLayout =
                (SwitchPreference) findPreference(KEY_NAVIGATION_INVERTED_LAYOUT);

        // Navigation bar home long press
        mNavigationHomeLongPressAction = initList(KEY_NAVIGATION_HOME_LONG_PRESS,
                homeLongPressAction);
@@ -642,7 +636,6 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
                    mNavigationPreferencesCat.addPreference(mEdgeLongSwipeAction);

                    mNavigationPreferencesCat.removePreference(mNavigationArrowKeys);
                    mNavigationPreferencesCat.removePreference(mNavigationInvertedLayout);
                    mNavigationPreferencesCat.removePreference(mNavigationHomeLongPressAction);
                    mNavigationPreferencesCat.removePreference(mNavigationHomeDoubleTapAction);
                    mNavigationPreferencesCat.removePreference(mNavigationAppSwitchLongPressAction);