From ff01678ba688778d67f824a0be56634974c1b0e8 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Fri, 24 Jun 2022 22:00:23 +0200
Subject: Revert "Remove the vibration settings"

Bring back the "Vibration" option.

The duration option isn't added back because the vibration settings are
still handled by Android. In fact, the option has no effect if the
vibration are disabled in the system settings.

This partially reverts commit ef03dfed5c802a855c4655204eee39a8769cfed7.
---
 srcs/juloo.keyboard2/Config.java        | 3 +++
 srcs/juloo.keyboard2/Keyboard2View.java | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'srcs')

diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index e02868a..2b900f6 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -26,6 +26,7 @@ final class Config
   public int layout; // Or '-1' for the system defaults
   public int programming_layout; // Or '-1' for none
   public float swipe_dist_px;
+  public boolean vibrateEnabled;
   public long longPressTimeout;
   public long longPressInterval;
   public float marginBottom;
@@ -60,6 +61,7 @@ final class Config
     // default values
     layout = -1;
     programming_layout = -1;
+    vibrateEnabled = true;
     longPressTimeout = 600;
     longPressInterval = 65;
     marginBottom = res.getDimension(R.dimen.margin_bottom);
@@ -115,6 +117,7 @@ final class Config
     // Take the mean of both dimensions as an approximation of the diagonal.
     float physical_scaling = (dm.widthPixels + dm.heightPixels) / (dm.xdpi + dm.ydpi);
     swipe_dist_px = Float.valueOf(prefs.getString("swipe_dist", "15")) * physical_scaling;;
+    vibrateEnabled = prefs.getBoolean("vibrate_enabled", vibrateEnabled);
     longPressTimeout = prefs.getInt("longpress_timeout", (int)longPressTimeout);
     longPressInterval = prefs.getInt("longpress_interval", (int)longPressInterval);
     marginBottom = getDipPref(dm, prefs, "margin_bottom", marginBottom);
diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index 25edd00..fed2be6 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -185,6 +185,8 @@ public class Keyboard2View extends View
 
   private void vibrate()
   {
+    if (!_config.vibrateEnabled)
+      return ;
     if (VERSION.SDK_INT >= 5)
     {
       performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY,
-- 
cgit v1.2.3