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

Commit 11d1c56f authored by mxyyiyi's avatar mxyyiyi
Browse files

[Expressive Design] Add null check for icon view in dropdown list.

- Fix crash when clicking spinner under original style.

Fix: 406403111
Test: disable flag & test manual
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
Change-Id: I4b2337ed0285afd943a9790d22089320e9a22b49
parent ad0e8496
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -24,8 +24,10 @@ import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.android.settingslib.widget.SettingsSpinnerPreference.Style;
import com.android.settingslib.widget.spinner.R;

@@ -71,7 +73,9 @@ public class SettingsSpinnerAdapter<T> extends ArrayAdapter<T> {
        }
        TextView textView = view.findViewById(android.R.id.text1);
        ImageView iconView = view.findViewById(android.R.id.icon);
        if (iconView != null) {
            iconView.setVisibility((position == mSelectedPosition) ? View.VISIBLE : View.GONE);
        }
        String item = (String) getItem(position);
        textView.setText(item);
        return view;