diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-04 15:42:23 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-04 15:42:23 +0200 |
commit | a29d6b0ef3a09693478d89cd298f331089d71ab2 (patch) | |
tree | 6d3007e7352d6a7eec49a93526d1e77eb721a3ca /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | |
parent | f0ee7ed4cf91427a12fa7dd55dc67b7f6c5c4833 (diff) | |
download | open-keychain-a29d6b0ef3a09693478d89cd298f331089d71ab2.tar.gz open-keychain-a29d6b0ef3a09693478d89cd298f331089d71ab2.tar.bz2 open-keychain-a29d6b0ef3a09693478d89cd298f331089d71ab2.zip |
Import code, fix collision of key spinner with other loaders
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | 17 |
1 files changed, 0 insertions, 17 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 efad2e45d..002f85e5d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -97,7 +97,6 @@ public class ImportKeysActivity extends ActionBarActivity { private SlidingTabLayout mSlidingTabLayout; private PagerTabStripAdapter mTabsAdapter; - public static final int VIEW_PAGER_HEIGHT = 64; // dp private static final int ALL_TABS = -1; private static final int TAB_CLOUD = 0; @@ -270,10 +269,6 @@ public class ImportKeysActivity extends ActionBarActivity { mSlidingTabLayout.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - // resize view pager back to 64 if keyserver settings have been collapsed - if (getViewPagerHeight() > VIEW_PAGER_HEIGHT) { - resizeViewPager(VIEW_PAGER_HEIGHT); - } } @Override @@ -339,18 +334,6 @@ public class ImportKeysActivity extends ActionBarActivity { getSupportFragmentManager().executePendingTransactions(); } - public void resizeViewPager(int dp) { - ViewGroup.LayoutParams params = mViewPager.getLayoutParams(); - params.height = FormattingUtils.dpToPx(this, dp); - // update layout after operations - mSlidingTabLayout.setViewPager(mViewPager); - } - - public int getViewPagerHeight() { - ViewGroup.LayoutParams params = mViewPager.getLayoutParams(); - return FormattingUtils.pxToDp(this, params.height); - } - private String getFingerprintFromUri(Uri dataUri) { String fingerprint = dataUri.toString().split(":")[1].toLowerCase(Locale.ENGLISH); Log.d(Constants.TAG, "fingerprint: " + fingerprint); |