diff options
| author | Kenny Root <kenny@the-b.org> | 2009-06-03 00:10:24 +0000 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2009-06-03 00:10:24 +0000 |
| commit | 85e8cd9462ee555f895b368acdd62b78a6aa496d (patch) | |
| tree | ba5fddbb49d5ae777bbbb82cb3873e67b558d816 | |
| parent | 7ba9f9f9f7fda04b3a6f34f8d5bb91950bfce44f (diff) | |
| download | connectbot-85e8cd9462ee555f895b368acdd62b78a6aa496d.tar.gz connectbot-85e8cd9462ee555f895b368acdd62b78a6aa496d.tar.bz2 connectbot-85e8cd9462ee555f895b368acdd62b78a6aa496d.zip | |
Don't conflate "bumpy arrows" and "vibrate on bell"
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@265 df292f66-193f-0410-a5fc-6d59da041ff2
| -rw-r--r-- | src/org/connectbot/service/TerminalBridge.java | 2 | ||||
| -rw-r--r-- | src/org/connectbot/service/TerminalManager.java | 21 |
2 files changed, 17 insertions, 6 deletions
diff --git a/src/org/connectbot/service/TerminalBridge.java b/src/org/connectbot/service/TerminalBridge.java index fcb833c..5123158 100644 --- a/src/org/connectbot/service/TerminalBridge.java +++ b/src/org/connectbot/service/TerminalBridge.java @@ -1108,7 +1108,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal } public synchronized void tryKeyVibrate() { - manager.vibrate(); + manager.tryKeyVibrate(); } /** diff --git a/src/org/connectbot/service/TerminalManager.java b/src/org/connectbot/service/TerminalManager.java index 4c120db..9719452 100644 --- a/src/org/connectbot/service/TerminalManager.java +++ b/src/org/connectbot/service/TerminalManager.java @@ -99,10 +99,12 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen private final long IDLE_TIMEOUT = 300000; // 5 minutes private Vibrator vibrator; - private volatile boolean wantVibration; + private volatile boolean wantKeyVibration; public static final long VIBRATE_DURATION = 30; private NotificationManager notificationManager; + + private boolean wantBellVibration; private static final int NOTIFICATION_ID = 1; @Override @@ -138,8 +140,9 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen wifilock = manager.createWifiLock(TAG); vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE); - wantVibration = prefs.getBoolean(PreferenceConstants.BELL_VIBRATE, true); + wantKeyVibration = prefs.getBoolean(PreferenceConstants.BUMPY_ARROWS, true); + wantBellVibration = prefs.getBoolean(PreferenceConstants.BELL_VIBRATE, true); enableMediaPlayer(); notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); @@ -379,7 +382,12 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen } } - public void vibrate() { + public void tryKeyVibrate() { + if (wantKeyVibration) + vibrate(); + } + + private void vibrate() { if (vibrator != null) vibrator.vibrate(VIBRATE_DURATION); } @@ -416,7 +424,7 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen if (mediaPlayer != null) mediaPlayer.start(); - if (wantVibration) + if (wantBellVibration) vibrate(); } @@ -478,8 +486,11 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen PreferenceConstants.DEFAULT_BELL_VOLUME); mediaPlayer.setVolume(volume, volume); } + } else if (PreferenceConstants.BELL_VIBRATE.equals(key)) { + wantBellVibration = sharedPreferences.getBoolean( + PreferenceConstants.BELL_VIBRATE, true); } else if (PreferenceConstants.BUMPY_ARROWS.equals(key)) { - wantVibration = sharedPreferences.getBoolean( + wantKeyVibration = sharedPreferences.getBoolean( PreferenceConstants.BUMPY_ARROWS, true); } } |