diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-07-23 17:18:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-23 17:18:33 +0000 |
| commit | 44038d43eb8f9b1a81e5245cd365ba754eebeea6 (patch) | |
| tree | f85cf84b21167a30cd1a04b697a47163ba5d16b1 | |
| parent | e0142ffed614d8cdc6100f7fa1cf60a84ff4fcf6 (diff) | |
| parent | 76975384916aaa8dd23c8cffec822a4d752791ab (diff) | |
am 83d763c0: am d5cc7e0a: am ee44afa1: Merge "Make ViewPagerTabs and FABController RTL aware" into lmp-dev
* commit '83d763c0fbcfe3a25f709df7febc2226cc607029':
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 */, |