diff options
author | Tyler Gunn <tgunn@google.com> | 2014-08-12 22:39:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-12 20:55:12 +0000 |
commit | 3333501fb5580bb18a9f089bf8bb7dcf59936231 (patch) | |
tree | ab4f6fdebf9064582091c4101d57248a23eafc41 | |
parent | 8c19738ab9bce11faaf9e3e0f8f3a1927f1dc2b6 (diff) | |
parent | 0b997e591cf0a990d019c2a31890844ba9d4658b (diff) | |
download | packages_apps_InCallUI-3333501fb5580bb18a9f089bf8bb7dcf59936231.tar.gz packages_apps_InCallUI-3333501fb5580bb18a9f089bf8bb7dcf59936231.tar.bz2 packages_apps_InCallUI-3333501fb5580bb18a9f089bf8bb7dcf59936231.zip |
Merge "Correcting dialpad animations in landscape (2/3)." into lmp-dev
-rw-r--r-- | src/com/android/incallui/InCallActivity.java | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java index 51fbce7f..1f7db588 100644 --- a/src/com/android/incallui/InCallActivity.java +++ b/src/com/android/incallui/InCallActivity.java @@ -27,6 +27,7 @@ import android.content.Intent; import android.content.res.Configuration; import android.os.Bundle; import android.telephony.DisconnectCause; +import android.text.TextUtils; import android.view.ViewTreeObserver; import android.view.animation.Animation; import android.view.animation.AnimationUtils; @@ -40,6 +41,8 @@ import com.android.phone.common.animation.AnimUtils; import com.android.phone.common.animation.AnimationListenerAdapter; import com.android.incallui.Call.State; +import java.util.Locale; + /** * Phone app "in call" screen. */ @@ -120,10 +123,19 @@ public class InCallActivity extends Activity { mCurrentOrientation = getResources().getConfiguration().orientation; mIsLandscape = getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE; - 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 isRtl = TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()) == + View.LAYOUT_DIRECTION_RTL; + + if (mIsLandscape) { + mSlideIn = AnimationUtils.loadAnimation(this, + isRtl ? R.anim.dialpad_slide_in_left : R.anim.dialpad_slide_in_right); + mSlideOut = AnimationUtils.loadAnimation(this, + isRtl ? 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); |