Skip to content

Settings: add gesture navigation space preference #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Loukious wants to merge 1 commit into
base: 16.0
Choose a base branch
from
+56 −1
Open

Settings: add gesture navigation space preference #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion res/xml/gesture_navigation_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
43 changes: 43 additions & 0 deletions src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down