Merge "Allowing widgets to be focusable" into ub-launcher3-burnaby-polish

am: d007d0722c

* commit 'd007d0722c782266f494806e750c24208d6d3ca5':
  Allowing widgets to be focusable

diff --cc src/com/android/launcher3/Launcher.java
Simple merge

diff --cc src/com/android/launcher3/LauncherAppWidgetHostView.java
index 01332fb,34c2943..e18cbbf
--- 1/src/com/android/launcher3/LauncherAppWidgetHostView.java
--- 2/src/com/android/launcher3/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/LauncherAppWidgetHostView.java
@@@ -26,9 -28,10 +28,11 @@@ import android.view.ViewConfiguration
  import android.view.ViewGroup;
  import android.widget.RemoteViews;
  
 -import com.android.launcher3.DragLayer.TouchCompleteListener;
 +import com.android.launcher3.dragndrop.DragLayer;
 +import com.android.launcher3.dragndrop.DragLayer.TouchCompleteListener;
  
+ import java.util.ArrayList;
+ 
  /**
   * {@inheritDoc}
   */