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

Commit 57ee1f29 authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[Panlingual] Should show confirm dialog when use the action of... 

Merge "[Panlingual] Should show confirm dialog when use the action of accessibility to change the default locale Bug: 303777391 Test: manual" into main
parents 2934cc08 a8b9414f

src/com/android/settings/localepicker/LocaleLinearLayoutManager.java

+6 −1
Original line number Diff line number Diff line
@@ -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;

    }

}

src/com/android/settings/localepicker/LocaleListEditor.java

+2 −1
Original line number Diff line number Diff line
@@ -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 =