commit b9bbb351efc6af566df1939ff96062e374de4552
author Sunny Goyal <sunnygoyal@google.com> Mon May 09 21:11:02 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 09 21:11:02 2016 +0000
tree eef4e25bfbd866d88d60b1cd99e9ea7b57935e3f
parent d9d76820c52de9228446296c1aeaaae06e6c5248
parent ac6d3a87ae9a31873a34f3eae01979910740ade1

Merge "Fixing bug where the widget background enters into a focused state if a child calls requestFocus in xml" into ub-launcher3-calgary
am: ac6d3a87ae

* commit 'ac6d3a87ae9a31873a34f3eae01979910740ade1':
  Fixing bug where the widget background enters into a focused state if a child calls requestFocus in xml

Change-Id: I768f13b539e4de683925f94d29d092023660c371

src/com/android/launcher3/LauncherAppWidgetHostView.java

diff --git a/src/com/android/launcher3/LauncherAppWidgetHostView.java b/src/com/android/launcher3/LauncherAppWidgetHostView.java
index 570607e..28557d0 100644
--- a/src/com/android/launcher3/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/LauncherAppWidgetHostView.java
@@ -256,7 +256,7 @@
     @Override
     public void requestChildFocus(View child, View focused) {
         super.requestChildFocus(child, focused);
-        dispatchChildFocus(focused != null);
+        dispatchChildFocus(mChildrenFocused && focused != null);
         if (focused != null) {
             focused.setFocusableInTouchMode(false);
         }