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

[Settings] Restore the position

Browse Source 
Bug: 314888469
Test: manual
Flag: EXEMPT bugfix
Change-Id: I419a863b55b1357b9fbe14f2f2a88dd623bd5b53
This commit is contained in:
Zoey Chen
2024-09-04 09:19:01 +00:00
parent 544cf32491
commit d99ea6b397
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,7 @@ class LocaleDragAndDropAdapter
private static final String TAG = "LocaleDragAndDropAdapter"; private static final String TAG = "LocaleDragAndDropAdapter";
private static final String CFGKEY_SELECTED_LOCALES = "selectedLocales"; private static final String CFGKEY_SELECTED_LOCALES = "selectedLocales";
private static final String CFGKEY_DRAG_LOCALE = "dragLocales"; private static final String CFGKEY_DRAG_LOCALE = "dragLocales";
private static final String CFGKEY_MOVE_LOCALE_TO= "localeMoveTo";
private final Context mContext; private final Context mContext;
private final ItemTouchHelper mItemTouchHelper; private final ItemTouchHelper mItemTouchHelper;
@@ -65,6 +66,7 @@ class LocaleDragAndDropAdapter
private boolean mDragEnabled = true; private boolean mDragEnabled = true;
private NumberFormat mNumberFormatter = NumberFormat.getNumberInstance(); private NumberFormat mNumberFormatter = NumberFormat.getNumberInstance();
private LocaleStore.LocaleInfo mDragLocale; private LocaleStore.LocaleInfo mDragLocale;
private int mMovedLocaleTo;
class CustomViewHolder extends RecyclerView.ViewHolder implements View.OnTouchListener { class CustomViewHolder extends RecyclerView.ViewHolder implements View.OnTouchListener {
private final LocaleDragCell mLocaleDragCell; private final LocaleDragCell mLocaleDragCell;
@@ -229,6 +231,7 @@ class LocaleDragAndDropAdapter
mFeedItemList.remove(fromPosition); mFeedItemList.remove(fromPosition);
mFeedItemList.add(toPosition, saved); mFeedItemList.add(toPosition, saved);
mDragLocale = saved; mDragLocale = saved;
mMovedLocaleTo = toPosition;
} else { } else {
// TODO: It looks like sometimes the RecycleView tries to swap item -1 // TODO: It looks like sometimes the RecycleView tries to swap item -1
// I did not see it in a while, but if it happens, investigate and file a bug. // I did not see it in a while, but if it happens, investigate and file a bug.
@@ -391,6 +394,7 @@ class LocaleDragAndDropAdapter
outInstanceState.putStringArrayList(CFGKEY_SELECTED_LOCALES, selectedLocales); outInstanceState.putStringArrayList(CFGKEY_SELECTED_LOCALES, selectedLocales);
// Save the dragged locale before rotation // Save the dragged locale before rotation
outInstanceState.putSerializable(CFGKEY_DRAG_LOCALE, mDragLocale); outInstanceState.putSerializable(CFGKEY_DRAG_LOCALE, mDragLocale);
outInstanceState.putInt(CFGKEY_MOVE_LOCALE_TO, mMovedLocaleTo);
} }
} }
@@ -418,11 +422,12 @@ class LocaleDragAndDropAdapter
// drag locale's original position to the top. // drag locale's original position to the top.
mDragLocale = (LocaleStore.LocaleInfo) savedInstanceState.getSerializable( mDragLocale = (LocaleStore.LocaleInfo) savedInstanceState.getSerializable(
CFGKEY_DRAG_LOCALE); CFGKEY_DRAG_LOCALE);
mMovedLocaleTo = savedInstanceState.getInt(CFGKEY_MOVE_LOCALE_TO);
if (mDragLocale != null) { if (mDragLocale != null) {
mFeedItemList.removeIf( mFeedItemList.removeIf(
localeInfo -> TextUtils.equals(localeInfo.getId(), localeInfo -> TextUtils.equals(localeInfo.getId(),
mDragLocale.getId())); mDragLocale.getId()));
mFeedItemList.add(0, mDragLocale); mFeedItemList.add(mMovedLocaleTo, mDragLocale);
notifyItemRangeChanged(0, mFeedItemList.size()); notifyItemRangeChanged(0, mFeedItemList.size());
} }
} }