diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-07-28 14:50:15 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-06 10:23:05 +0100 |
| commit | 1a7054c05452ab83f026ef8916a6b1a3b303dfd4 (patch) | |
| tree | 293d55ad60d59a82371826d7e60275ba6659c4eb /android/sdremote/src | |
| parent | dd2b94db437ef74af3681bebe286886e433e23bc (diff) | |
Volume button switching now setting dependent.
Change-Id: I29b2f4652937995b2cecd10f6f2d7934f25b4b81
Diffstat (limited to 'android/sdremote/src')
| -rw-r--r-- | android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java index dbcc2e7e6638..efb3ae8c343a 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java +++ b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java @@ -16,11 +16,13 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; +import android.content.SharedPreferences; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; import android.os.Message; import android.os.Messenger; +import android.preference.PreferenceManager; import android.text.format.DateFormat; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -71,7 +73,13 @@ public class PresentationActivity extends Activity { @Override public boolean dispatchKeyEvent(KeyEvent event) { - if (mPresentationFragment.isVisible() || mThumbnailFragment.isVisible()) { + SharedPreferences aPref = PreferenceManager + .getDefaultSharedPreferences(this); + boolean aVolumeSwitching = aPref.getBoolean("option_volumeswitching", + false); + boolean aRelevantFragmentVisible = mPresentationFragment.isVisible() + || mThumbnailFragment.isVisible(); + if (aVolumeSwitching && aRelevantFragmentVisible) { int action = event.getAction(); int keyCode = event.getKeyCode(); |