PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mihai Niță
2016-02-04 22:20:18 +00:00
committed by Android (Google) Code Review
parent a1242bcc93 e7f40be0ef
commit d7f4d7e177
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
View File

@@ -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) {