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 ef03dfed5c.

res/values-de/strings.xml

@@ -15,6 +15,8 @@
   <string name="pref_swipe_dist_summary">Abstand der Zeichen in den Ecken der Tasten (%s)</string>
   <string name="pref_long_timeout_title">Zeitüberschreitung bei Tastenwiederholung</string>
   <string name="pref_long_interval_title">Intervall der Tastenwiederholung</string>
+  <string name="pref_vibrate_title">Vibration</string>
+  <string name="pref_vibrate_summary">Vibration bei Tastendruck ein-/ausschalten</string>
   <string name="pref_precise_repeat_title">Präzise Cursorsteuerung</string>
   <string name="pref_precise_repeat_summary">Geschwindigkeit der Tastenwiederholung durch weniger oder mehr Wischen anpassen</string>
   <string name="pref_lockable_keys_title">Sperrbare Hilfstasten</string>

res/values-es/strings.xml

@@ -13,6 +13,8 @@
   <string name="pref_swipe_dist_summary">Distancia de caracteres en las esquinas de las letras (%s)</string>
   <string name="pref_long_timeout_title">Tiempo de espera de repetición de tecla</string>
   <string name="pref_long_interval_title">Intervalo de repetición de tecla</string>
+  <string name="pref_vibrate_title">Vibración</string>
+  <string name="pref_vibrate_summary">Habilitar/deshabilitar vibración al presionar una tecla</string>
   <string name="pref_precise_repeat_title">Movimientos de cursor preciso</string>
   <string name="pref_precise_repeat_summary">Modular la velocidad de repetición de teclas según si se desliza más o menos</string>
   <string name="pref_lockable_keys_title">Bloqueo de teclas modificadoras</string>

res/values-fr/strings.xml

@@ -13,6 +13,8 @@
   <string name="pref_swipe_dist_summary">La distance des caractères dans les coins (%s)</string>
   <string name="pref_long_timeout_title">Délai avant répétition</string>
   <string name="pref_long_interval_title">Écart entre répétitions</string>
+  <string name="pref_vibrate_title">Vibreur</string>
+  <string name="pref_vibrate_summary">Vibration a chaque touche</string>
   <string name="pref_precise_repeat_title">Mouvement précis du curseur</string>
   <string name="pref_precise_repeat_summary">Modifier la vitesse de répétition en bougeant le doigt</string>
   <string name="pref_category_style">Style</string>

res/values-ko/strings.xml

@@ -13,6 +13,8 @@
   <string name="pref_swipe_dist_summary">키 모서리 문자의 입력 범위 (%s)</string>
   <string name="pref_long_timeout_title">키 길게 누르기 지연</string>
   <string name="pref_long_interval_title">키 반복 간격</string>
+  <string name="pref_vibrate_title">진동</string>
+  <string name="pref_vibrate_summary">키 누를 때 진동 키거/끄기</string>
   <string name="pref_precise_repeat_title">정확한 커서 움직임</string>
   <string name="pref_precise_repeat_summary">더 많거나 적은 스와이프로 키 반복 조절</string>
   <string name="pref_category_style">스타일</string>

res/values-lv/strings.xml

@@ -17,6 +17,8 @@
   <string name="pref_swipe_dist_summary">Taustiņu stūros esošo rakstzīmju attālums (%s)</string>
   <string name="pref_long_timeout_title">Taustiņa atkārtošanās ātrums</string>
   <string name="pref_long_interval_title">Taustiņa atkārtošanās aizture</string>
+  <string name="pref_vibrate_title">Trīcēšana</string>
+  <string name="pref_vibrate_summary">Iespējot/atspējot taustiņa piespiešanas trīcēšanu</string>
   <string name="pref_precise_repeat_title">Pielāgojama kursora kustība</string>
   <string name="pref_precise_repeat_summary">Mainīt taustiņa atkārtošanās ātrumu ar pavilkšanas attālumu</string>
   <string name="pref_lockable_keys_title">Slēdzami pārveidotājtaustiņi</string>

res/values-pt/strings.xml

@@ -17,6 +17,8 @@
   <string name="pref_swipe_dist_summary">Distância até acionar os cantos das teclas (%s)</string>
   <string name="pref_long_timeout_title">Tempo até repetir tecla</string>
   <string name="pref_long_interval_title">Intervalo de repetição de tecla</string>
+  <string name="pref_vibrate_title">Vibração</string>
+  <string name="pref_vibrate_summary">Ativar/desativar vibração ao digitar</string>
   <string name="pref_precise_repeat_title">Precisão nos movimentos do cursor</string>
   <string name="pref_precise_repeat_summary">Varia a velocidade de repetição a depender do quanto deslizar</string>
   <string name="pref_lockable_keys_title">Teclas traváveis</string>

res/values-tr/strings.xml

@@ -17,6 +17,8 @@
   <string name="pref_swipe_dist_summary">Tuşların köşelerindeki karakterlerin uzaklıkları (%s)</string>
   <string name="pref_long_timeout_title">Tuş tekrarlama beklemesi</string>
   <string name="pref_long_interval_title">Tuş tekrarlama aralığı</string>
+  <string name="pref_vibrate_title">Titreşim</string>
+  <string name="pref_vibrate_summary">Tuşa basıldığında titreşimi etkinleştir</string>
   <string name="pref_precise_repeat_title">İmleç hareketini ayarla</string>
   <string name="pref_precise_repeat_summary">Tuş tekrar hızını az ya da çok kaydırarak ayarla</string>
   <string name="pref_lockable_keys_title">Sabitlenebilir değiştiriciler</string>

res/values-zh-rCN/strings.xml

@@ -15,6 +15,8 @@
   <string name="pref_swipe_dist_summary">输入按键四角的符号需要滑动的距离 (%s)</string>
   <string name="pref_long_timeout_title">长按到开始重复输入的时间</string>
   <string name="pref_long_interval_title">长按后每次重复输入的时间间隔</string>
+  <string name="pref_vibrate_title">振动</string>
+  <string name="pref_vibrate_summary">启用或者禁用按下按键时振动</string>
   <string name="pref_precise_repeat_title">精确控制光标移速</string>
   <string name="pref_precise_repeat_summary">按键重复按下速度由手指滑动的距离决定</string>
   <string name="pref_lockable_keys_title">组合键锁定</string>

res/values/strings.xml

@@ -17,6 +17,8 @@
   <string name="pref_swipe_dist_summary">Distance of characters in the corners of the keys (%s)</string>
   <string name="pref_long_timeout_title">Key repeat timeout</string>
   <string name="pref_long_interval_title">Key repeat interval</string>
+  <string name="pref_vibrate_title">Vibration</string>
+  <string name="pref_vibrate_summary">Enable/disable vibration on keypress</string>
   <string name="pref_precise_repeat_title">Precise cursor movements</string>
   <string name="pref_precise_repeat_summary">Modulate key repeat speed by swiping more or less</string>
   <string name="pref_lockable_keys_title">Lockable modifiers</string>

res/xml/settings.xml

@@ -20,6 +20,7 @@
       <CheckBoxPreference android:key="lockable_sub" android:title="Sub" android:defaultValue="false"/>
       <CheckBoxPreference android:key="lockable_box" android:title="Box" android:defaultValue="false"/>
     </PreferenceScreen>
+    <CheckBoxPreference android:key="vibrate_enabled" android:title="@string/pref_vibrate_title" android:summary="@string/pref_vibrate_summary" android:defaultValue="true"/>
   </PreferenceCategory>
   <PreferenceCategory android:title="@string/pref_category_style">
     <ListPreference android:key="theme" android:title="@string/pref_theme" android:summary="%s" android:defaultValue="system" android:entries="@array/pref_theme_entries" android:entryValues="@array/pref_theme_values"/>

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);

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,