diff --git a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java index 8795bf97e70..59a5fb0a596 100644 --- a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java +++ b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java @@ -43,6 +43,7 @@ import com.android.settings.R; public class LocaleLinearLayoutManager extends LinearLayoutManager { private final LocaleDragAndDropAdapter mAdapter; private final Context mContext; + private LocaleListEditor mLocaleListEditor; private final AccessibilityNodeInfoCompat.AccessibilityActionCompat mActionMoveUp; private final AccessibilityNodeInfoCompat.AccessibilityActionCompat mActionMoveDown; @@ -147,8 +148,12 @@ public class LocaleLinearLayoutManager extends LinearLayoutManager { } if (result) { - mAdapter.doTheUpdate(); + mLocaleListEditor.showConfirmDialog(false, mAdapter.getFeedItemList().get(0)); } return result; } + + public void setLocaleListEditor(LocaleListEditor localeListEditor) { + mLocaleListEditor = localeListEditor; + } } diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java index 28f066ab28f..59a39c8eee3 100644 --- a/src/com/android/settings/localepicker/LocaleListEditor.java +++ b/src/com/android/settings/localepicker/LocaleListEditor.java @@ -472,6 +472,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View private void configureDragAndDrop(LayoutPreference layout) { final RecyclerView list = layout.findViewById(R.id.dragList); final LocaleLinearLayoutManager llm = new LocaleLinearLayoutManager(getContext(), mAdapter); + llm.setLocaleListEditor(this); llm.setAutoMeasureEnabled(true); list.setLayoutManager(llm); list.setHasFixedSize(true); @@ -505,7 +506,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View return false; } - private void showConfirmDialog(boolean isFirstRemoved, LocaleStore.LocaleInfo localeInfo) { + public void showConfirmDialog(boolean isFirstRemoved, LocaleStore.LocaleInfo localeInfo) { Locale currentSystemLocale = LocalePicker.getLocales().get(0); if (!localeInfo.getLocale().equals(currentSystemLocale)) { final LocaleDialogFragment localeDialogFragment =