Merge "Fix two pane widget picker bugs" into main (1bb90a78) · Commits · e / os / BlissLauncher3

res/layout/widgets_full_sheet.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@
		android:visibility="gone"
		android:textSize="18sp"
		android:layout_below="@id/search_and_recommendations_container"
		tools:text="No widgets available" />
		tools:text="@string/no_widgets_available" />

		<!-- Fast scroller popup -->
		<TextView

res/layout/widgets_two_pane_sheet.xml

+13 −9

Original line number	Diff line number	Diff line
		@@ -47,6 +47,16 @@
		android:textColor="?attr/widgetPickerTitleColor"
		android:textSize="24sp" />

		<TextView
		android:id="@+id/no_widgets_text"
		style="@style/PrimaryHeadline"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:gravity="center"
		android:textSize="18sp"
		android:visibility="gone"
		tools:text="@string/no_widgets_available" />

		<LinearLayout
		android:id="@+id/linear_layout_container"
		android:layout_width="match_parent"
		@@ -57,6 +67,9 @@
		android:id="@+id/recycler_view_container"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:paddingBottom="24dp"
		android:layout_gravity="start"
		android:layout_weight="0.33">
		<TextView
		@@ -90,15 +103,6 @@
		android:gravity="end"
		android:layout_gravity="end"
		android:orientation="horizontal">
		<TextView
		android:id="@+id/no_widgets_text"
		style="@style/PrimaryHeadline"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:gravity="center"
		android:textSize="18sp"
		android:visibility="gone"
		tools:text="No widgets available" />
		<ScrollView
		android:id="@+id/right_pane_scroll_view"
		android:layout_width="match_parent"

res/layout/widgets_two_pane_sheet_paged_view.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@
		android:gravity="start"
		android:paddingHorizontal="@dimen/widget_list_horizontal_margin_two_pane"
		android:layout_gravity="start"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:layout_alignParentStart="true">
		<com.android.launcher3.widget.picker.WidgetPagedView
		android:id="@+id/widgets_view_pager"

res/layout/widgets_two_pane_sheet_recyclerview.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		android:layout_height="match_parent"
		android:gravity="start"
		android:layout_gravity="start"
		android:clipChildren="false"
		android:layout_alignParentStart="true">

		<com.android.launcher3.widget.picker.WidgetsRecyclerView

src/com/android/launcher3/widget/picker/WidgetsFullSheet.java

+19 −7

Original line number	Diff line number	Diff line
		@@ -173,6 +173,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
		protected WidgetsSearchBar mSearchBar;
		protected TextView mHeaderTitle;
		protected RecyclerViewFastScroller mFastScroller;
		protected int mBottomPadding;

		public WidgetsFullSheet(Context context, AttributeSet attrs, int defStyleAttr) {
		super(context, attrs, defStyleAttr);
		@@ -370,15 +371,16 @@ public class WidgetsFullSheet extends BaseWidgetSheet
		@Override
		public void setInsets(Rect insets) {
		super.setInsets(insets);
		int bottomPadding = Math.max(insets.bottom, mNavBarScrimHeight);
		setBottomPadding(mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView, bottomPadding);
		setBottomPadding(mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView, bottomPadding);
		mBottomPadding = Math.max(insets.bottom, mNavBarScrimHeight);
		setBottomPadding(mAdapters.get(AdapterHolder.PRIMARY).mWidgetsRecyclerView, mBottomPadding);
		setBottomPadding(mAdapters.get(AdapterHolder.SEARCH).mWidgetsRecyclerView, mBottomPadding);
		if (mHasWorkProfile) {
		setBottomPadding(mAdapters.get(AdapterHolder.WORK).mWidgetsRecyclerView, bottomPadding);
		setBottomPadding(mAdapters.get(AdapterHolder.WORK)
		.mWidgetsRecyclerView, mBottomPadding);
		}
		((MarginLayoutParams) mNoWidgetsView.getLayoutParams()).bottomMargin = bottomPadding;
		((MarginLayoutParams) mNoWidgetsView.getLayoutParams()).bottomMargin = mBottomPadding;

		if (bottomPadding > 0) {
		if (mBottomPadding > 0) {
		setupNavBarColor();
		} else {
		clearNavBarColor();
		@@ -387,6 +389,15 @@ public class WidgetsFullSheet extends BaseWidgetSheet
		requestLayout();
		}

		@Override
		public WindowInsets onApplyWindowInsets(WindowInsets insets) {
		WindowInsets w = super.onApplyWindowInsets(insets);
		if (mInsets.bottom != mNavBarScrimHeight) {
		setInsets(mInsets);
		}
		return w;
		}

		private void setBottomPadding(RecyclerView recyclerView, int bottomPadding) {
		recyclerView.setPadding(
		recyclerView.getPaddingLeft(),
		@@ -791,8 +802,9 @@ public class WidgetsFullSheet extends BaseWidgetSheet
		if (mDeviceProfile.isLandscape != dp.isLandscape && dp.isTablet && !dp.isTwoPanels) {
		handleClose(false);
		show(BaseActivity.fromContext(getContext()), false);
		} else {
		} else if (!isTwoPane()) {
		reset();
		resetExpandedHeaders();
		}

		// When folding/unfolding the foldables, we need to switch between the regular widget picker