Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60b0368d authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Correcting dialpad animations in landscape (3/3)." into lmp-dev

parents e8411583 bf7a95e4

src/com/android/dialer/DialtactsActivity.java

+10 −4
Original line number Diff line number Diff line
@@ -414,10 +414,16 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 
            mActionBarController.restoreInstanceState(savedInstanceState);

        }



        final boolean isLayoutRtl = DialerUtils.isRtl();

        if (mIsLandscape) {

            mSlideIn = AnimationUtils.loadAnimation(this,

                mIsLandscape ? R.anim.dialpad_slide_in_right : R.anim.dialpad_slide_in_bottom);

                    isLayoutRtl ? R.anim.dialpad_slide_in_left : R.anim.dialpad_slide_in_right);

            mSlideOut = AnimationUtils.loadAnimation(this,

                mIsLandscape ? R.anim.dialpad_slide_out_right : R.anim.dialpad_slide_out_bottom);

                    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);