From 3c7d5f77db0bdf78afc3bf05534af972a38b3c69 Mon Sep 17 00:00:00 2001 From: Wilson Wu Date: Wed, 9 Feb 2022 18:28:06 +0800 Subject: [PATCH] Clean InputMethodPreference icon logic This is a follow up CL as CL[1] which prevent a crash for TvSettings. Use same LayoutParams for non-TV cases to avoid special code path. [1]: I7e59f0a2c3fefe7e2c45e136f74d96416f159880 Bug: 205671514 Test: Manual test the icon size Change-Id: I3bbc01bc0a8cde1805d8996feba60ee3f5f5b399 --- .../inputmethod/InputMethodPreference.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodPreference.java b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodPreference.java index 26e3e0432fd6a..484ca9321c234 100644 --- a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodPreference.java @@ -32,7 +32,6 @@ import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; import android.widget.ImageView; -import android.widget.LinearLayout; import android.widget.Switch; import android.widget.Toast; @@ -156,14 +155,10 @@ public class InputMethodPreference extends PrimarySwitchPreference final int iconSize = getContext().getResources().getDimensionPixelSize( R.dimen.secondary_app_icon_size); if (icon != null && iconSize > 0) { - if (isTv()) { - ViewGroup.LayoutParams params = icon.getLayoutParams(); - params.height = iconSize; - params.width = iconSize; - icon.setLayoutParams(params); - } else { - icon.setLayoutParams(new LinearLayout.LayoutParams(iconSize, iconSize)); - } + ViewGroup.LayoutParams params = icon.getLayoutParams(); + params.height = iconSize; + params.width = iconSize; + icon.setLayoutParams(params); } }