resolve merge conflicts of a6194d3d92 to ub-launcher3-calgary

Change-Id: I29b3c3bb2c070e34c78c62b8f9086e6f3c8bd277

diff --cc res/layout/widgets_view.xml
index cc513ab,c51ec80..410d1be
--- 1/res/layout/widgets_view.xml
--- 2/res/layout/widgets_view.xml
+++ b/res/layout/widgets_view.xml
@@@ -34,13 -34,20 +34,20 @@@
          android:elevation="2dp"
          android:visibility="invisible" />
  
-     <com.android.launcher3.widget.WidgetsRecyclerView
+     <FrameLayout
          android:id="@+id/main_content"
-         android:theme="@style/CustomOverscroll.Dark"
-         android:layout_width="match_parent"
-         android:layout_height="match_parent"
          android:layout_gravity="center"
          android:elevation="15dp"
-         android:visibility="gone" />
+         android:visibility="gone"
+         android:layout_width="match_parent"
+         android:layout_height="match_parent">
+ 
+         <com.android.launcher3.widget.WidgetsRecyclerView
+             android:id="@+id/widgets_list_view"
 -            android:theme="@style/Theme.Dark.CustomOverscroll"
++            android:theme="@style/CustomOverscroll.Dark"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent" />
+     </FrameLayout>
+ 
  
  </com.android.launcher3.widget.WidgetsContainerView>

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

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

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