summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-01-20 00:34:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-01-20 00:34:14 +0000
commit50def21a4b22795b5e0ce2ed3498d09da1568b66 (patch)
tree045309c687b517cdc0b42c10440ab395703192e0
parent180f7770295bf5e6477315403b2d1538664b752f (diff)
parent0d00e52bd850d0ebdbfe85cbce44f4231561d8f2 (diff)
downloadandroid_packages_apps_Trebuchet-50def21a4b22795b5e0ce2ed3498d09da1568b66.tar.gz
android_packages_apps_Trebuchet-50def21a4b22795b5e0ce2ed3498d09da1568b66.tar.bz2
android_packages_apps_Trebuchet-50def21a4b22795b5e0ce2ed3498d09da1568b66.zip
Merge "Fix position of task menu in RTL" into ub-launcher3-master
-rw-r--r--quickstep/src/com/android/quickstep/TaskMenuView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/quickstep/src/com/android/quickstep/TaskMenuView.java b/quickstep/src/com/android/quickstep/TaskMenuView.java
index bf7537697..196a2270f 100644
--- a/quickstep/src/com/android/quickstep/TaskMenuView.java
+++ b/quickstep/src/com/android/quickstep/TaskMenuView.java
@@ -35,6 +35,7 @@ import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherAnimUtils;
import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
import com.android.launcher3.anim.AnimationSuccessListener;
import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;
import com.android.launcher3.dragndrop.DragLayer;
@@ -170,7 +171,8 @@ public class TaskMenuView extends AbstractFloatingView {
measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
mLauncher.getDragLayer().getDescendantRectRelativeToSelf(taskView, sTempRect);
Rect insets = mLauncher.getDragLayer().getInsets();
- setX(sTempRect.left + (sTempRect.width() - getMeasuredWidth()) / 2 - insets.left);
+ int x = sTempRect.left + (sTempRect.width() - getMeasuredWidth()) / 2 - insets.left;
+ setX(Utilities.isRtl(getResources()) ? -x : x);
setY(sTempRect.top - mTaskIconAndName.getPaddingTop() - insets.top);
}