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

Merge "Fix crash in ManageKeyboard screen in TvSettings."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-07 22:25:49 +00:00
committed by Android (Google) Code Review
parent eb338ad900 c9eb55593f
commit 84b615b99a
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ import android.content.res.Configuration;
import android.os.UserHandle;
import android.text.TextUtils;
import android.util.Log;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
import android.view.inputmethod.InputMethodSubtype;
@@ -155,7 +156,14 @@ public class InputMethodPreference extends PrimarySwitchPreference
final int iconSize = getContext().getResources().getDimensionPixelSize(
R.dimen.secondary_app_icon_size);
if (icon != null && iconSize > 0) {
icon.setLayoutParams(new LinearLayout.LayoutParams(iconSize, iconSize));
if (isTv()) {
ViewGroup.LayoutParams params = icon.getLayoutParams();
params.height = iconSize;
params.width = iconSize;
icon.setLayoutParams(params);
} else {
icon.setLayoutParams(new LinearLayout.LayoutParams(iconSize, iconSize));
}
}
}