From 939bd3a07f9248f8943a55f6af769903b7cd4851 Mon Sep 17 00:00:00 2001 From: Yash Garg Date: Wed, 30 Nov 2022 11:49:47 +0000 Subject: [PATCH 1/2] change value to default (0) if action is set to SPLIT_SCREEN --- src/org/lineageos/lineageparts/BootReceiver.java | 1 + .../lineageos/lineageparts/input/ButtonSettings.java | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/src/org/lineageos/lineageparts/BootReceiver.java b/src/org/lineageos/lineageparts/BootReceiver.java index 6b0ab872..b8d62bcb 100644 --- a/src/org/lineageos/lineageparts/BootReceiver.java +++ b/src/org/lineageos/lineageparts/BootReceiver.java @@ -41,6 +41,7 @@ public class BootReceiver extends BroadcastReceiver { setRestoredTunable(ctx); } + ButtonSettings.setLongPressActionToNothing(ctx); ButtonSettings.restoreKeySwapper(ctx); TouchscreenGestureSettings.restoreTouchscreenGestureStates(ctx); diff --git a/src/org/lineageos/lineageparts/input/ButtonSettings.java b/src/org/lineageos/lineageparts/input/ButtonSettings.java index 613e847f..d0db2c14 100644 --- a/src/org/lineageos/lineageparts/input/ButtonSettings.java +++ b/src/org/lineageos/lineageparts/input/ButtonSettings.java @@ -792,6 +792,17 @@ public class ButtonSettings extends SettingsPreferenceFragment preferences.getBoolean(KEY_SWAP_CAPACITIVE_KEYS, false)); } + public static void setLongPressActionToNothing(Context context) { + final int action = LineageSettings.System.getIntForUser(context.getContentResolver(), LineageSettings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION, + context.getResources().getInteger(org.lineageos.platform.internal.R.integer.config_longPressOnAppSwitchBehavior), + UserHandle.USER_CURRENT); + + if (action == Action.SPLIT_SCREEN.ordinal()) { + LineageSettings.System.putInt(context.getContentResolver(), + LineageSettings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION, Action.NOTHING.ordinal()); + } + } + @Override public boolean onPreferenceTreeClick(Preference preference) { if (preference == mSwapVolumeButtons) { -- GitLab From 8922cbffb166d99c3ee433330e39ecd41abc1aba Mon Sep 17 00:00:00 2001 From: Yash Garg Date: Thu, 1 Dec 2022 09:29:05 +0000 Subject: [PATCH 2/2] fix formatting for action --- src/org/lineageos/lineageparts/input/ButtonSettings.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/org/lineageos/lineageparts/input/ButtonSettings.java b/src/org/lineageos/lineageparts/input/ButtonSettings.java index d0db2c14..827ad8fa 100644 --- a/src/org/lineageos/lineageparts/input/ButtonSettings.java +++ b/src/org/lineageos/lineageparts/input/ButtonSettings.java @@ -793,9 +793,10 @@ public class ButtonSettings extends SettingsPreferenceFragment } public static void setLongPressActionToNothing(Context context) { - final int action = LineageSettings.System.getIntForUser(context.getContentResolver(), LineageSettings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION, - context.getResources().getInteger(org.lineageos.platform.internal.R.integer.config_longPressOnAppSwitchBehavior), - UserHandle.USER_CURRENT); + final int action = LineageSettings.System.getIntForUser(context.getContentResolver(), + LineageSettings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION, context.getResources().getInteger( + org.lineageos.platform.internal.R.integer.config_longPressOnAppSwitchBehavior), + UserHandle.USER_CURRENT); if (action == Action.SPLIT_SCREEN.ordinal()) { LineageSettings.System.putInt(context.getContentResolver(), -- GitLab