diff options
author | Sai Cheemalapati <saicheems@google.com> | 2014-06-03 13:54:23 -0700 |
---|---|---|
committer | Sai Cheemalapati <saicheems@google.com> | 2014-06-03 14:49:19 -0700 |
commit | 82d6da53d993bb3a5cabf7c9f5f0c0e62488c15f (patch) | |
tree | d43f4331bab66605dd59428c5077f06567675a9f /src | |
parent | 1e61380222440bb53a46a05907914207ce282386 (diff) |
Updated dialer animation in landscape.
Caching animations in constructor.
Dialer now flows in and out from/to the right.
Moved animation timing constants to constants file.
Change-Id: I287caa081c6576b347594d30ccce2b6d6526db1f
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 47 |
1 files changed, 37 insertions, 10 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index e516a534f..f2f49c1ae 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -26,6 +26,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; import android.net.Uri; @@ -161,6 +162,31 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O private SmartDialSearchFragment mSmartDialSearchFragment; /** + * Animation that slides in. + */ + private Animation mSlideIn; + + /** + * Animation that slides out. + */ + private Animation mSlideOut; + + /** + * Listener for after slide out animation completes on dialer fragment. + */ + AnimationListenerAdapter mSlideOutListener = new AnimationListenerAdapter() { + @Override + public void onAnimationEnd(Animation animation) { + commitDialpadFragmentHide(); + } + }; + + /** + * Set to true if the device is in landscape orientation. + */ + private boolean mIsLandscape; + + /** * Fragment containing the speed dial list, recents list, and all contacts list. */ private ListsFragment mListsFragment; @@ -382,6 +408,15 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O mShowDialpadOnResume = savedInstanceState.getBoolean(KEY_IS_DIALPAD_SHOWN); mActionBarController.restoreInstanceState(savedInstanceState); } + mIsLandscape = getResources().getConfiguration().orientation == + Configuration.ORIENTATION_LANDSCAPE; + + mSlideIn = AnimationUtils.loadAnimation(this, + mIsLandscape ? R.anim.slide_in_right : R.anim.slide_in); + mSlideOut = AnimationUtils.loadAnimation(this, + mIsLandscape ? R.anim.slide_out_right : R.anim.slide_out); + + mSlideOut.setAnimationListener(mSlideOutListener); parentLayout = (RelativeLayout) findViewById(R.id.dialtacts_mainlayout); parentLayout.getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING); @@ -601,8 +636,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O public void onDialpadShown() { updateFloatingActionButton(); if (mDialpadFragment.getAnimate()) { - Animation slideIn = AnimationUtils.loadAnimation(this, R.anim.slide_in); - mDialpadFragment.getView().startAnimation(slideIn); + mDialpadFragment.getView().startAnimation(mSlideIn); } else { mDialpadFragment.setYFraction(0); } @@ -631,14 +665,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O updateSearchFragmentPosition(); updateFloatingActionButton(); if (animate) { - Animation slideOut = AnimationUtils.loadAnimation(this, R.anim.slide_out); - slideOut.setAnimationListener(new AnimationListenerAdapter() { - @Override - public void onAnimationEnd(Animation animation) { - commitDialpadFragmentHide(); - } - }); - mDialpadFragment.getView().startAnimation(slideOut); + mDialpadFragment.getView().startAnimation(mSlideOut); } else { commitDialpadFragmentHide(); } |