diff options
author | d34d <clark@cyngn.com> | 2014-07-26 09:44:56 -0700 |
---|---|---|
committer | Clark Scheff <clark@cyngn.com> | 2014-07-28 10:31:30 -0700 |
commit | e12c6994ba5ac932bc03a4a264738455a00b655f (patch) | |
tree | 14415938660af68573d37f7537a546763db6db8c /src/org | |
parent | 4b8f4a4b93647ac06a942fc0802bbacff5ff4323 (diff) | |
download | packages_apps_ThemeChooser-e12c6994ba5ac932bc03a4a264738455a00b655f.zip packages_apps_ThemeChooser-e12c6994ba5ac932bc03a4a264738455a00b655f.tar.gz packages_apps_ThemeChooser-e12c6994ba5ac932bc03a4a264738455a00b655f.tar.bz2 |
Fix component selector hide animation firing off rapidly.
If the user presses the back button repeatedly while the component
selector is being displayed, the selector will reset the hide animation
and start over. This patch enables and disables the selector so that
this behavior does not exist.
Change-Id: I894107a239c4af55c1485401ca925a8b74b75ac0
Diffstat (limited to 'src/org')
-rw-r--r-- | src/org/cyanogenmod/theme/chooserv2/ChooserActivity.java | 2 | ||||
-rw-r--r-- | src/org/cyanogenmod/theme/chooserv2/ComponentSelector.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/org/cyanogenmod/theme/chooserv2/ChooserActivity.java b/src/org/cyanogenmod/theme/chooserv2/ChooserActivity.java index 8a66d53..8f94739 100644 --- a/src/org/cyanogenmod/theme/chooserv2/ChooserActivity.java +++ b/src/org/cyanogenmod/theme/chooserv2/ChooserActivity.java @@ -272,7 +272,7 @@ public class ChooserActivity extends FragmentActivity @Override public void onBackPressed() { - if (mSelector.getVisibility() == View.VISIBLE) { + if (mSelector.isEnabled()) { mSelector.hide(); if (mContainerYOffset != 0) { slideContentDown(mContainerYOffset); diff --git a/src/org/cyanogenmod/theme/chooserv2/ComponentSelector.java b/src/org/cyanogenmod/theme/chooserv2/ComponentSelector.java index b878d6b..0985c9b 100644 --- a/src/org/cyanogenmod/theme/chooserv2/ComponentSelector.java +++ b/src/org/cyanogenmod/theme/chooserv2/ComponentSelector.java @@ -172,6 +172,7 @@ public class ComponentSelector extends LinearLayout if (!Utils.hasNavigationBar(mContext)) { findViewById(R.id.navbar_padding).setVisibility(View.GONE); } + setEnabled(false); } public void setComponentType(String component) { @@ -226,13 +227,15 @@ public class ComponentSelector extends LinearLayout public void show() { if (getVisibility() == View.GONE) { + setEnabled(true); setVisibility(View.VISIBLE); startAnimation(mAnimateIn); } } public void hide() { - if (getVisibility() == View.VISIBLE) { + if (getVisibility() == View.VISIBLE && isEnabled()) { + setEnabled(false); startAnimation(mAnimateOut); } if (mMediaPlayer != null && mMediaPlayer.isPlaying()) mMediaPlayer.stop(); |