From 54cc08c2917e2872cb79e56410b7c305dcebfef6 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Mon, 2 Nov 2015 23:06:35 +0100 Subject: extended: leave ActionMode on page change --- .../keychain/ui/ViewKeyAdvActivity.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java index a27bb3ad3..3db6bf4ae 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java @@ -27,6 +27,8 @@ import android.support.v4.app.LoaderManager; import android.support.v4.content.CursorLoader; import android.support.v4.content.Loader; import android.support.v4.view.ViewPager; +import android.support.v4.view.ViewPager.SimpleOnPageChangeListener; +import android.view.ActionMode; import android.view.View; import android.widget.Toast; @@ -239,4 +241,23 @@ public class ViewKeyAdvActivity extends BaseActivity implements super.onActivityResult(requestCode, resultCode, data); } } + + @Override + public void onActionModeStarted(final ActionMode mode) { + super.onActionModeStarted(mode); + // Leave whatever action mode we are in when we change the page + mSlidingTabLayout.setOnPageChangeListener(new SimpleOnPageChangeListener() { + @Override + public void onPageSelected(int position) { + super.onPageSelected(position); + mode.finish(); + } + }); + } + + @Override + public void onActionModeFinished(ActionMode mode) { + super.onActionModeFinished(mode); + mSlidingTabLayout.setOnPageChangeListener(null); + } } -- cgit v1.2.3