commit 80df7e1530a5ac2440ed3f237232451665e683dd
author Yorke Lee <yorkelee@google.com> Wed Jul 23 17:07:36 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 23 17:07:36 2014 +0000
tree 52a1019808869a3750c259b2c72bb4796aee94d3
parent 9aef95c3616a4aa80ab9d35941e611b1f10eacbf
parent fbfad4618630b82331074197519aa93f25d8e312

am ee44afa1: Merge "Make ViewPagerTabs and FABController RTL aware" into lmp-dev

* commit 'ee44afa111ef48acbfa22b9ecb381c5d2e05acce':
  Make ViewPagerTabs and FABController RTL aware

InCallUI/src/com/android/incallui/CallCardFragment.java

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index e7bd13c..7b5c9b7 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -190,7 +190,7 @@
                 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 @@
                 // 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 @@
                 assignTranslateAnimation(mCallButtonsContainer, 5);
 
                 mFloatingActionButtonController.align(
-                        mIsLandscape ? FloatingActionButtonController.ALIGN_QUARTER_RIGHT
+                        mIsLandscape ? FloatingActionButtonController.ALIGN_QUARTER_END
                             : FloatingActionButtonController.ALIGN_MIDDLE,
                         0 /* offsetX */,
                         0 /* offsetY */,