From 0c198fe1863324a9e33b6db76f4449cbf028e99b Mon Sep 17 00:00:00 2001 From: Yash Garg Date: Wed, 30 Nov 2022 11:49:47 +0000 Subject: [PATCH 1/3] 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 30d75f5b..309e164a 100644 --- a/src/org/lineageos/lineageparts/BootReceiver.java +++ b/src/org/lineageos/lineageparts/BootReceiver.java @@ -40,6 +40,7 @@ public class BootReceiver extends BroadcastReceiver { setRestoredTunable(ctx); } + ButtonSettings.setLongPressActionToNothing(ctx); TouchscreenGestureSettings.restoreTouchscreenGestureStates(ctx); // Extract the contributors database diff --git a/src/org/lineageos/lineageparts/input/ButtonSettings.java b/src/org/lineageos/lineageparts/input/ButtonSettings.java index 423dc603..b578dc2b 100644 --- a/src/org/lineageos/lineageparts/input/ButtonSettings.java +++ b/src/org/lineageos/lineageparts/input/ButtonSettings.java @@ -695,6 +695,17 @@ 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); + + 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 5317de36d13c6f242f3bd5e5dc52e2613e7da45b Mon Sep 17 00:00:00 2001 From: Yash Garg Date: Thu, 1 Dec 2022 09:31:10 +0000 Subject: [PATCH 2/3] 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 b578dc2b..651d9ba9 100644 --- a/src/org/lineageos/lineageparts/input/ButtonSettings.java +++ b/src/org/lineageos/lineageparts/input/ButtonSettings.java @@ -696,9 +696,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 From 9ea304cc00c217f81e0798c1713c624586047a71 Mon Sep 17 00:00:00 2001 From: Yash Garg Date: Thu, 1 Dec 2022 09:41:37 +0000 Subject: [PATCH 3/3] fix spacing --- src/org/lineageos/lineageparts/input/ButtonSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/lineageos/lineageparts/input/ButtonSettings.java b/src/org/lineageos/lineageparts/input/ButtonSettings.java index 651d9ba9..6a097a6f 100644 --- a/src/org/lineageos/lineageparts/input/ButtonSettings.java +++ b/src/org/lineageos/lineageparts/input/ButtonSettings.java @@ -697,7 +697,7 @@ 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( + LineageSettings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION, context.getResources().getInteger( org.lineageos.platform.internal.R.integer.config_longPressOnAppSwitchBehavior), UserHandle.USER_CURRENT); -- GitLab