mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Volume button switching now setting dependent.

Browse Source 
Change-Id: I29b2f4652937995b2cecd10f6f2d7934f25b4b81
This commit is contained in:
Andrzej J.R. Hunt
2012-07-28 14:50:15 +02:00
committed by Michael Meeks
parent dd2b94db43
commit 1a7054c054
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
View File

@@ -16,11 +16,13 @@ import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.ServiceConnection; import android.content.ServiceConnection;
import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.Message; import android.os.Message;
import android.os.Messenger; import android.os.Messenger;
import android.preference.PreferenceManager;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -71,7 +73,13 @@ public class PresentationActivity extends Activity {
@Override @Override
public boolean dispatchKeyEvent(KeyEvent event) { 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 action = event.getAction();
int keyCode = event.getKeyCode(); int keyCode = event.getKeyCode();