commit 962b7f6f97a375ee0e6f47bbefce0e90c9222b05
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri May 25 17:53:27 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri May 25 17:53:27 2018 +0000
tree f409d5aef4b58095f13264c1766d8779702963b7
parent 76c59da5c02ed522837352f45f5db2287a849d60
parent 662d41ca885b4b675c337af6acbe64e564cf09f9

[automerger] Accounting for view translation when calculating the focus location am: db9f86a472 am: 662d41ca88

Change-Id: Ib18878ccabfb8cf6a5b2655500f26c4f8602a0f2

src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java

diff --git a/src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java b/src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java
index bd5c06e..fde220c 100644
--- a/src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java
+++ b/src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java
@@ -18,7 +18,6 @@
 
 import android.graphics.Rect;
 import android.view.View;
-import android.view.View.OnFocusChangeListener;
 
 import com.android.launcher3.PagedView;
 
@@ -52,8 +51,8 @@
 
     private void computeLocationRelativeToContainer(View child, Rect outRect) {
         View parent = (View) child.getParent();
-        outRect.left += child.getLeft();
-        outRect.top += child.getTop();
+        outRect.left += child.getX();
+        outRect.top += child.getY();
 
         if (parent != mContainer) {
             if (parent instanceof PagedView) {
@@ -64,22 +63,4 @@
             computeLocationRelativeToContainer(parent, outRect);
         }
     }
-
-    /**
-     * Sets the alpha of this FocusIndicatorHelper to 0 when a view with this listener
-     * receives focus.
-     */
-    public View.OnFocusChangeListener getHideIndicatorOnFocusListener() {
-        return new OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                if (hasFocus) {
-                    endCurrentAnimation();
-                    setCurrentView(null);
-                    setAlpha(0);
-                    invalidateDirty();
-                }
-            }
-        };
-    }
 }