diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-19 11:12:14 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-19 11:12:14 -0800 |
| commit | f94068462649986dad263f28226be6c514af47d3 (patch) | |
| tree | 7f9622b0e83c4f4fd2ebd40134140d5f1aac44a2 /res/layout/widgets_view.xml | |
| parent | b347535cb09c5a7bebf0c928d9842236e43cd4b5 (diff) | |
| parent | a6194d3d9205488d6f5400193f8d4d6aaf140218 (diff) | |
| download | android_packages_apps_Trebuchet-f94068462649986dad263f28226be6c514af47d3.tar.gz android_packages_apps_Trebuchet-f94068462649986dad263f28226be6c514af47d3.tar.bz2 android_packages_apps_Trebuchet-f94068462649986dad263f28226be6c514af47d3.zip | |
resolve merge conflicts of a6194d3d92 to ub-launcher3-calgary
Change-Id: I29b3c3bb2c070e34c78c62b8f9086e6f3c8bd277
Diffstat (limited to 'res/layout/widgets_view.xml')
| -rw-r--r-- | res/layout/widgets_view.xml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml index cc513ab36..410d1be3f 100644 --- a/res/layout/widgets_view.xml +++ b/res/layout/widgets_view.xml @@ -34,13 +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/CustomOverscroll.Dark" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </FrameLayout> + </com.android.launcher3.widget.WidgetsContainerView>
\ No newline at end of file |