Merge "Merge "QS: Fix RTL animation" into nyc-dev am: d1df86dbb8 am: 395e0f6cff" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-05-20 20:01:27 +00:00
committed by Android (Google) Code Review

View File

@@ -252,8 +252,12 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
private void getRelativePositionInt(int[] loc1, View view, View parent) {
if(view == parent || view == null) return;
loc1[0] += view.getX();
loc1[1] += view.getTop();
// Ignore tile pages as they can have some offset we don't want to take into account in
// RTL.
if (!(view instanceof PagedTileLayout.TilePage)) {
loc1[0] += view.getLeft();
loc1[1] += view.getTop();
}
getRelativePositionInt(loc1, (View) view.getParent(), parent);
}