diff options
Diffstat (limited to 'src/org/cyanogenmod/theme/chooserv2/ChooserActivity.java')
| -rw-r--r-- | src/org/cyanogenmod/theme/chooserv2/ChooserActivity.java | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/org/cyanogenmod/theme/chooserv2/ChooserActivity.java b/src/org/cyanogenmod/theme/chooserv2/ChooserActivity.java index ee60286..05aa1ae 100644 --- a/src/org/cyanogenmod/theme/chooserv2/ChooserActivity.java +++ b/src/org/cyanogenmod/theme/chooserv2/ChooserActivity.java @@ -82,7 +82,7 @@ public class ChooserActivity extends FragmentActivity DisplayMetrics dm = getResources().getDisplayMetrics(); int margin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 24, dm); - mPager.setPageMargin(margin); + mPager.setPageMargin(-margin / 2); mPager.setOffscreenPageLimit(3); mPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { @@ -187,10 +187,14 @@ public class ChooserActivity extends FragmentActivity hideSaveApplyButton(); } else if (mExpanded) { mExpanded = false; - mContainer.collapse(); - ThemeFragment f = (ThemeFragment) getSupportFragmentManager() + final ThemeFragment f = (ThemeFragment) getSupportFragmentManager() .findFragmentByTag(getFragmentTag(mPager.getCurrentItem())); - f.collapse(); + f.fadeOutCards(new Runnable() { + public void run() { + mContainer.collapse(); + f.collapse(); + } + }); } else { super.onBackPressed(); } @@ -261,17 +265,12 @@ public class ChooserActivity extends FragmentActivity private View.OnClickListener mPagerClickListener = new View.OnClickListener() { @Override public void onClick(View v) { - mExpanded = !mExpanded; - if (mExpanded) { + if (!mExpanded) { + mExpanded = true; mContainer.expand(); ThemeFragment f = (ThemeFragment) getSupportFragmentManager() .findFragmentByTag(getFragmentTag(mPager.getCurrentItem())); f.expand(); - } else { - mContainer.collapse(); - ThemeFragment f = (ThemeFragment) getSupportFragmentManager() - .findFragmentByTag(getFragmentTag(mPager.getCurrentItem())); - f.collapse(); } } }; |