Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c7d5f77 authored by Wilson Wu's avatar Wilson Wu
Browse files

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
parent 4af66209

packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodPreference.java

+4 −9
Original line number Diff line number Diff line
@@ -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));

            }

        }

    }