commit f856f352abda7562f810086d36226ccce5de34a6
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 27 00:43:55 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 27 00:43:55 2018 +0000
tree 3c7acea81784c5d1f60fa4e874aa80e605831aa1
parent a1ff74c68dad21694403d6aa8abb42337cbca658
parent 3b7e39014522cc1838a56a19fc9433f5b15adead

Merge "Fixes the inability to start quickscrub because hit target is none" into pi-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
index 8fb0620..88bc6ea 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -842,10 +842,17 @@
             buttonBounds.setEmpty();
             return;
         }
+        // Temporarily reset the translation back to origin to get the position in window
+        final float posX = view.getTranslationX();
+        final float posY = view.getTranslationY();
+        view.setTranslationX(0);
+        view.setTranslationY(0);
         view.getLocationInWindow(mTmpPosition);
         buttonBounds.set(mTmpPosition[0], mTmpPosition[1],
                 mTmpPosition[0] + view.getMeasuredWidth(),
                 mTmpPosition[1] + view.getMeasuredHeight());
+        view.setTranslationX(posX);
+        view.setTranslationY(posY);
     }
 
     private void updateRotatedViews() {