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

Commit d7f4d7e1 authored by Mihai Niță's avatar Mihai Niță Committed by Android (Google) Code Review
Browse files

Merge "Locale list: format the numbers using the UI locale"

parents a1242bcc e7f40be0
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.settings.R;
import com.android.internal.app.LocalePicker;
import com.android.internal.app.LocaleStore;

import java.text.NumberFormat;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
@@ -45,6 +46,7 @@ class LocaleDragAndDropAdapter
    private final ItemTouchHelper mItemTouchHelper;
    private boolean mRemoveMode = false;
    private boolean mDragEnabled = true;
    private NumberFormat mNumberFormatter = NumberFormat.getNumberInstance();

    class CustomViewHolder extends RecyclerView.ViewHolder implements View.OnTouchListener {
        private final LocaleDragCell mLocaleDragCell;
@@ -113,7 +115,7 @@ class LocaleDragAndDropAdapter
        String label = feedItem.getFullNameNative();
        dragCell.setLabel(label);
        dragCell.setLocalized(feedItem.isTranslated());
        dragCell.setMiniLabel(Integer.toString(i + 1));
        dragCell.setMiniLabel(mNumberFormatter.format(i + 1));
        dragCell.setShowCheckbox(mRemoveMode);
        dragCell.setShowMiniLabel(!mRemoveMode);
        dragCell.setShowHandle(!mRemoveMode);
@@ -195,6 +197,8 @@ class LocaleDragAndDropAdapter

        LocaleList ll = new LocaleList(newList);
        LocalePicker.updateLocales(ll);

        mNumberFormatter = NumberFormat.getNumberInstance(Locale.getDefault());
    }

    private void setDragEnabled(boolean enabled) {