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

Commit e8a7887f authored by Calvin Pan's avatar Calvin Pan Committed by Automerger Merge Worker
Browse files

Merge "Adding state description for current locale item" into tm-dev am: ba95ddf6 am: a55d87bb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17950645



Change-Id: Id55ab5242a6f7dc92a39505c2f24674638eff3c1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f583fa0 a55d87bb

core/java/com/android/internal/app/SuggestedLocaleAdapter.java

+7 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.view.ViewGroup; 
import android.widget.BaseAdapter;

import android.widget.Filter;

import android.widget.Filterable;

import android.widget.FrameLayout;

import android.widget.TextView;



import com.android.internal.R;
@@ -222,6 +221,7 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable { 
                        convertView = mInflater.inflate(

                                R.layout.app_language_picker_current_locale_item, parent, false);

                        title = convertView.findViewById(R.id.language_picker_item);

                        addStateDescriptionIntoCurrentLocaleItem(convertView);

                    } else {

                        convertView = mInflater.inflate(

                                R.layout.language_picker_item, parent, false);
@@ -234,6 +234,7 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable { 
                if (!(convertView instanceof ViewGroup)) {

                    convertView = mInflater.inflate(

                            R.layout.app_language_picker_current_locale_item, parent, false);

                    addStateDescriptionIntoCurrentLocaleItem(convertView);

                }

                updateTextView(

                        convertView, convertView.findViewById(R.id.language_picker_item), position);
@@ -369,4 +370,9 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable { 
                    : View.TEXT_DIRECTION_LTR);

        }

    }



    private void addStateDescriptionIntoCurrentLocaleItem(View root) {

        String description = root.getContext().getResources().getString(R.string.checked);

        root.setStateDescription(description);

    }

}