diff options
author | Yorke Lee <yorkelee@google.com> | 2014-07-23 17:12:10 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-23 17:12:10 +0000 |
commit | 76975384916aaa8dd23c8cffec822a4d752791ab (patch) | |
tree | 52a1019808869a3750c259b2c72bb4796aee94d3 | |
parent | 8dbc79c6af4f1cac2a1f056e87a8f1819e56d044 (diff) | |
parent | 80df7e1530a5ac2440ed3f237232451665e683dd (diff) |
am d5cc7e0a: am ee44afa1: Merge "Make ViewPagerTabs and FABController RTL aware" into lmp-dev
* commit 'd5cc7e0afb9ff6504cb8e76011f0b441e7ed2ccf':
Make ViewPagerTabs and FABController RTL aware
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index e7bd13c8e..7b5c9b759 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -190,7 +190,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr observer.removeOnGlobalLayoutListener(this); mFloatingActionButtonController.setScreenWidth(parent.getWidth()); mFloatingActionButtonController.align( - mIsLandscape ? FloatingActionButtonController.ALIGN_QUARTER_RIGHT + mIsLandscape ? FloatingActionButtonController.ALIGN_QUARTER_END : FloatingActionButtonController.ALIGN_MIDDLE, 0 /* offsetX */, 0 /* offsetY */, @@ -673,7 +673,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr // Move it below the screen. mFloatingActionButtonController.manuallyTranslate( mFloatingActionButtonController.getTranslationXForAlignment( - mIsLandscape ? FloatingActionButtonController.ALIGN_QUARTER_RIGHT + mIsLandscape ? FloatingActionButtonController.ALIGN_QUARTER_END : FloatingActionButtonController.ALIGN_MIDDLE ), mFloatingActionButtonHideOffset @@ -726,7 +726,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr assignTranslateAnimation(mCallButtonsContainer, 5); mFloatingActionButtonController.align( - mIsLandscape ? FloatingActionButtonController.ALIGN_QUARTER_RIGHT + mIsLandscape ? FloatingActionButtonController.ALIGN_QUARTER_END : FloatingActionButtonController.ALIGN_MIDDLE, 0 /* offsetX */, 0 /* offsetY */, |