Merge "Fix corner radius for single item in the widgets tray." into sc-dev (f45f8752) · Commits · e / os / android_packages_apps_Trebuchet

res/drawable/widgets_list_single_item_ripple.xml

0 → 100644

+41 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright 2021, 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.
		** You may obtain a copy of the License at
		**
		** http://www.apache.org/licenses/LICENSE-2.0
		**
		** Unless required by applicable law or agreed to in writing, software
		** distributed under the License is distributed on an "AS IS" BASIS,
		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		** See the License for the specific language governing permissions and
		** limitations under the License.
		*/
		-->
		<ripple xmlns:android="http://schemas.android.com/apk/res/android"
		android:color="?android:attr/colorControlHighlight">
		<item android:id="@android:id/mask">
		<shape android:shape="rectangle">
		<corners
		android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
		android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
		android:bottomLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
		android:bottomRightRadius="@dimen/widget_list_top_bottom_corner_radius" />
		</shape>
		</item>
		<item android:id="@android:id/background">
		<shape android:shape="rectangle">
		<solid android:color="?android:attr/colorBackground" />
		<corners
		android:topLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
		android:topRightRadius="@dimen/widget_list_top_bottom_corner_radius"
		android:bottomLeftRadius="@dimen/widget_list_top_bottom_corner_radius"
		android:bottomRightRadius="@dimen/widget_list_top_bottom_corner_radius" />
		</shape>
		</item>
		</ripple>
		No newline at end of file

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,9 @@ public final class WidgetsListHeaderViewHolderBinder implements
		public void bindViewHolder(WidgetsListHeaderHolder viewHolder, WidgetsListHeaderEntry data,
		int position) {
		WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
		if (position == 0) {
		if (mWidgetsListAdapter.getItemCount() == 1) {
		widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_single_item_ripple);
		} else if (position == 0) {
		widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_top_ripple);
		} else if (position == mWidgetsListAdapter.getItemCount() - 1) {
		widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_bottom_ripple);

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,9 @@ public final class WidgetsListSearchHeaderViewHolderBinder implements
		public void bindViewHolder(WidgetsListSearchHeaderHolder viewHolder,
		WidgetsListSearchHeaderEntry data, int position) {
		WidgetsListHeader widgetsListHeader = viewHolder.mWidgetsListHeader;
		if (position == 0) {
		if (mWidgetsListAdapter.getItemCount() == 1) {
		widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_single_item_ripple);
		} else if (position == 0) {
		widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_top_ripple);
		} else if (position == mWidgetsListAdapter.getItemCount() - 1) {
		widgetsListHeader.setBackgroundResource(R.drawable.widgets_list_bottom_ripple);