aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-06-18 22:52:36 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-06-18 22:57:56 +0200
commit5c6139f57a870fba559bce2024a00b858341b053 (patch)
treedf3668939b84594c6181bf4b3598728d2e5390dc /OpenKeychain
parenta246dc96756621ec43595ef7659e27f23d548f81 (diff)
downloadopen-keychain-5c6139f57a870fba559bce2024a00b858341b053.tar.gz
open-keychain-5c6139f57a870fba559bce2024a00b858341b053.tar.bz2
open-keychain-5c6139f57a870fba559bce2024a00b858341b053.zip
forward touch events to pager in import activity
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 54186e380..298772e7d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -37,6 +37,7 @@ import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarActivity;
import android.util.DisplayMetrics;
import android.util.TypedValue;
+import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
@@ -182,6 +183,18 @@ public class ImportKeysActivity extends ActionBarActivity {
// update layout after operations
mSlidingTabLayout.setViewPager(mViewPager);
+
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent event) {
+ boolean result = super.onTouchEvent(event);
+
+ if (!result) {
+ mViewPager.onTouchEvent(event);
+ }
+
+ return result;
}
protected void handleActions(Bundle savedInstanceState, Intent intent) {