Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean InputMethodPreference icon logic

Browse Source 
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
This commit is contained in:
Wilson Wu
2022-02-09 18:28:06 +08:00
parent 4af6620969
commit 3c7d5f77db
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodPreference.java
View File

@@ -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);
}
}