diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-07-23 17:03:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-22 22:02:49 +0000 |
| commit | fbfad4618630b82331074197519aa93f25d8e312 (patch) | |
| tree | 5d41f913dccac0183f97528da11c17cb6134c0da /InCallUI | |
| parent | 3676fd514ce0844761df8c8098cd2e2c74cf2f1d (diff) | |
| parent | 3001e34153b67bbd3e6e811eab83c9bdd2a9334e (diff) | |
Merge "Make ViewPagerTabs and FABController RTL aware" into lmp-dev
Diffstat (limited to 'InCallUI')
| -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 */, |