Merge "Converting widget panel into a floating view" into ub-launcher3-master (cbdfc598) · Commits · e / os / android_packages_apps_Trebuchet

res/layout-land/launcher.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -60,12 +60,6 @@
		android:id="@+id/overview_panel"
		android:visibility="gone" />

		<include layout="@layout/widgets_view"
		android:id="@+id/widgets_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="invisible" />

		<include layout="@layout/all_apps"
		android:id="@+id/apps_view"
		android:layout_width="match_parent"

res/layout-port/launcher.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -66,12 +66,6 @@
		android:id="@+id/drop_target_bar"
		layout="@layout/drop_target_bar_horz" />

		<include layout="@layout/widgets_view"
		android:id="@+id/widgets_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="invisible" />

		<include layout="@layout/all_apps"
		android:id="@+id/apps_view"
		android:layout_width="match_parent"

res/layout-sw720dp/launcher.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -65,12 +65,6 @@
		<include layout="@layout/page_indicator"
		android:id="@+id/page_indicator" />

		<include layout="@layout/widgets_view"
		android:id="@+id/widgets_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="invisible" />

		<include layout="@layout/all_apps"
		android:id="@+id/apps_view"
		android:layout_width="match_parent"

res/layout/all_apps.xml

+22 −43

Original line number	Diff line number	Diff line
		@@ -18,60 +18,39 @@
		will bake the left/right padding into that view's background itself. -->
		<com.android.launcher3.allapps.AllAppsContainerView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:launcher="http://schemas.android.com/apk/res-auto"
		android:id="@+id/apps_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		launcher:revealBackground="@drawable/round_rect_primary">

		<View
		android:id="@+id/reveal_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center"
		android:focusable="false"
		android:visibility="invisible" />


		<com.android.launcher3.allapps.AllAppsRecyclerViewContainerView
		android:id="@+id/main_content"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center"
		android:focusable="true"
		android:clipToPadding="false"
		android:clipChildren="true"
		android:clipToPadding="false"
		android:focusable="true"
		android:focusableInTouchMode="true"
		android:saveEnabled="false"
		android:visibility="gone">
		android:saveEnabled="false" >

		<!-- DO NOT CHANGE THE ID -->
		<com.android.launcher3.allapps.AllAppsRecyclerView
		android:id="@+id/apps_list_view"
		android:layout_below="@id/search_container_all_apps"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_below="@id/search_container_all_apps"
		android:layout_gravity="center_horizontal\|top"
		android:clipToPadding="false"
		android:overScrollMode="never"
		android:descendantFocusability="afterDescendants"
		android:focusable="true" />
		android:focusable="true"
		android:overScrollMode="never" />

		<!-- Note: we are reusing/repurposing a system attribute for search layout, because of a
		platform bug, which prevents using custom attributes in <include> tag -->
		<include
		layout="?android:attr/keyboardLayout"
		android:id="@id/search_container_all_apps" />
		android:id="@id/search_container_all_apps"
		layout="?android:attr/keyboardLayout" />

		<include layout="@layout/all_apps_fast_scroller" />

		</com.android.launcher3.allapps.AllAppsRecyclerViewContainerView>
		<View
		android:id="@+id/nav_bar_bg"
		android:background="?attr/allAppsNavBarScrimColor"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_gravity="bottom"
		android:focusable="false" />
		android:layout_alignParentBottom="true"
		android:background="?attr/allAppsNavBarScrimColor" />
		</com.android.launcher3.allapps.AllAppsContainerView>
		No newline at end of file

res/layout/widgets_view.xml→res/layout/widgets_full_sheet.xml

+21 −30

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2015 The Android Open Source Project
		<!-- Copyright (C) 2017 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		@@ -13,40 +13,31 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<!-- The top and bottom paddings are defined in this container, but since we want
		the list view to span the full width (for touch interception purposes), we
		will bake the left/right padding into that view's background itself. -->
		<com.android.launcher3.widget.WidgetsContainerView
		<com.android.launcher3.widget.WidgetsFullSheet
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:launcher="http://schemas.android.com/apk/res-auto"
		android:id="@+id/widgets_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:descendantFocusability="afterDescendants"
		android:theme="?attr/widgetsTheme"
		launcher:revealBackground="@drawable/round_rect_primary">
		android:orientation="vertical"
		android:theme="?attr/widgetsTheme" >

		<View
		android:id="@+id/reveal_view"
		<com.android.launcher3.graphics.GradientView
		android:id="@+id/gradient_bg"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center"
		android:elevation="2dp"
		android:focusable="false"
		android:visibility="invisible" />
		android:layout_height="match_parent" />

		<FrameLayout
		android:id="@+id/main_content"
		android:id="@+id/container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center"
		android:elevation="15dp"
		android:visibility="gone">
		android:background="?android:attr/colorPrimary"
		android:elevation="4dp">

		<com.android.launcher3.widget.WidgetsRecyclerView
		android:id="@+id/widgets_list_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />
		android:layout_height="match_parent"
		android:clipToPadding="false"
		/>

		<!-- Fast scroller popup -->
		<TextView
		@@ -55,12 +46,6 @@
		android:layout_gravity="top\|end"
		android:layout_marginEnd="@dimen/fastscroll_popup_margin" />

		<ProgressBar
		android:id="@+id/loader"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center" />

		<com.android.launcher3.views.RecyclerViewFastScroller
		android:id="@+id/fast_scroller"
		android:layout_width="@dimen/fastscroll_width"
		@@ -68,6 +53,12 @@
		android:layout_gravity="end"
		android:layout_marginEnd="@dimen/fastscroll_end_margin" />

		<View
		android:id="@+id/nav_bar_bg"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_gravity="bottom"
		android:background="?attr/allAppsNavBarScrimColor"
		android:focusable="false" />
		</FrameLayout>

		</com.android.launcher3.widget.WidgetsContainerView>
		No newline at end of file
		</com.android.launcher3.widget.WidgetsFullSheet>
		No newline at end of file