Merge "Fix icon UX bug" into main (4951641d) · Commits · e / os / android_packages_apps_Settings

res/layout/preference_icon_credman.xml

0 → 100644

+98 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 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.
		-->

		<!-- Based off preference_material_settings.xml except that ripple on only on the left side. -->
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="?android:attr/listPreferredItemHeightSmall"
		android:gravity="center_vertical"
		android:background="@android:color/transparent"
		android:clipToPadding="false">

		<LinearLayout
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:background="?android:attr/selectableItemBackground"
		android:gravity="start\|center_vertical"
		android:clipToPadding="false"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

		<LinearLayout
		android:id="@+id/icon_frame"
		android:layout_width="48dp"
		android:layout_height="40dp"
		android:gravity="start\|center_vertical"
		android:minWidth="56dp"
		android:orientation="horizontal"
		android:clipToPadding="false"
		android:paddingTop="4dp"
		android:paddingBottom="4dp">
		<androidx.preference.internal.PreferenceImageView
		android:id="@android:id/icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		settings:maxWidth="32dp"
		settings:maxHeight="32dp" />
		</LinearLayout>

		<RelativeLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:paddingTop="16dp"
		android:paddingBottom="16dp">

		<TextView
		android:id="@android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceListItem"
		android:ellipsize="marquee" />

		<TextView
		android:id="@android:id/summary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@android:id/title"
		android:layout_alignStart="@android:id/title"
		android:textAppearance="?android:attr/textAppearanceListItemSecondary"
		android:textColor="?android:attr/textColorSecondary"
		android:maxLines="10" />

		</RelativeLayout>

		</LinearLayout>

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

		<!-- Preference should place its actual preference widget here. -->
		<LinearLayout
		android:id="@android:id/widget_frame"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:paddingEnd="16dp"
		android:minWidth="61dp"
		android:gravity="center"
		android:orientation="vertical" />

		</LinearLayout>
		No newline at end of file

src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ import android.os.UserManager;
		import android.provider.Settings;
		import android.service.autofill.AutofillServiceInfo;
		import android.text.TextUtils;
		import android.util.IconDrawableFactory;
		import android.util.Log;
		import android.view.View;
		import android.widget.Switch;
		@@ -98,7 +97,6 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
		private static final int MAX_SELECTABLE_PROVIDERS = 5;

		private final PackageManager mPm;
		private final IconDrawableFactory mIconFactory;
		private final List<CredentialProviderInfo> mServices;
		private final Set<String> mEnabledPackageNames;
		private final @Nullable CredentialManager mCredentialManager;
		@@ -119,7 +117,6 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
		public CredentialManagerPreferenceController(Context context, String preferenceKey) {
		super(context, preferenceKey);
		mPm = context.getPackageManager();
		mIconFactory = IconDrawableFactory.newInstance(mContext);
		mServices = new ArrayList<>();
		mEnabledPackageNames = new HashSet<>();
		mExecutor = ContextCompat.getMainExecutor(mContext);
		@@ -575,9 +572,11 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
		pref.setTitle(title);

		if (icon != null) {
		pref.setIcon(Utils.getSafeIcon(icon));
		pref.setIcon(icon);
		}

		pref.setLayoutResource(R.layout.preference_icon_credman);

		if (subtitle != null) {
		pref.setSummary(subtitle);
		}