diff options
author | Tyler Gunn <tgunn@google.com> | 2014-08-12 22:39:29 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-12 20:55:12 +0000 |
commit | 60b0368d6f65e95a08aea7f0b46b8729bc2aebc0 (patch) | |
tree | bc8803ba403f61ba43023e6f28daded634b0d155 /src | |
parent | e8411583d356db0568d2aafd9a7e2b0781c89e2b (diff) | |
parent | bf7a95e47facece917e99f19848c014c1438cd77 (diff) |
Merge "Correcting dialpad animations in landscape (3/3)." into lmp-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index cb01e8ef0..5a76ffa74 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -414,10 +414,16 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O mActionBarController.restoreInstanceState(savedInstanceState); } - mSlideIn = AnimationUtils.loadAnimation(this, - mIsLandscape ? R.anim.dialpad_slide_in_right : R.anim.dialpad_slide_in_bottom); - mSlideOut = AnimationUtils.loadAnimation(this, - mIsLandscape ? R.anim.dialpad_slide_out_right : R.anim.dialpad_slide_out_bottom); + final boolean isLayoutRtl = DialerUtils.isRtl(); + if (mIsLandscape) { + mSlideIn = AnimationUtils.loadAnimation(this, + isLayoutRtl ? R.anim.dialpad_slide_in_left : R.anim.dialpad_slide_in_right); + mSlideOut = AnimationUtils.loadAnimation(this, + isLayoutRtl ? R.anim.dialpad_slide_out_left : R.anim.dialpad_slide_out_right); + } else { + mSlideIn = AnimationUtils.loadAnimation(this, R.anim.dialpad_slide_in_bottom); + mSlideOut = AnimationUtils.loadAnimation(this, R.anim.dialpad_slide_out_bottom); + } mSlideIn.setInterpolator(AnimUtils.EASE_IN); mSlideOut.setInterpolator(AnimUtils.EASE_OUT); |