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

Merge "Adding state description for current locale item" into tm-dev

Browse Source
This commit is contained in:
Calvin Pan
2022-04-28 02:42:29 +00:00
committed by Android (Google) Code Review
parent ac3033fd40 7a2ac50735
commit ba95ddf69d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/app/SuggestedLocaleAdapter.java
View File

@@ -27,7 +27,6 @@ import android.view.ViewGroup;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.Filter; import android.widget.Filter;
import android.widget.Filterable; import android.widget.Filterable;
import android.widget.FrameLayout;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.R; import com.android.internal.R;
@@ -222,6 +221,7 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable {
convertView = mInflater.inflate( convertView = mInflater.inflate(
R.layout.app_language_picker_current_locale_item, parent, false); R.layout.app_language_picker_current_locale_item, parent, false);
title = convertView.findViewById(R.id.language_picker_item); title = convertView.findViewById(R.id.language_picker_item);
addStateDescriptionIntoCurrentLocaleItem(convertView);
} else { } else {
convertView = mInflater.inflate( convertView = mInflater.inflate(
R.layout.language_picker_item, parent, false); R.layout.language_picker_item, parent, false);
@@ -234,6 +234,7 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable {
if (!(convertView instanceof ViewGroup)) { if (!(convertView instanceof ViewGroup)) {
convertView = mInflater.inflate( convertView = mInflater.inflate(
R.layout.app_language_picker_current_locale_item, parent, false); R.layout.app_language_picker_current_locale_item, parent, false);
addStateDescriptionIntoCurrentLocaleItem(convertView);
} }
updateTextView( updateTextView(
convertView, convertView.findViewById(R.id.language_picker_item), position); convertView, convertView.findViewById(R.id.language_picker_item), position);
@@ -369,4 +370,9 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable {
: View.TEXT_DIRECTION_LTR); : View.TEXT_DIRECTION_LTR);
} }
} }
private void addStateDescriptionIntoCurrentLocaleItem(View root) {
String description = root.getContext().getResources().getString(R.string.checked);
root.setStateDescription(description);
}
} }