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

Commit 2f63c570 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Stay on the region selection page after clicking "Cancel"." into main

parents cf5646c9 8be2d2ff

src/com/android/settings/regionalpreferences/RegionDialogFragment.java

+5 −4
Original line number Diff line number Diff line
@@ -139,15 +139,16 @@ public class RegionDialogFragment extends InstrumentedDialogFragment { 
                            mContext,

                            SettingsEnums.ACTION_CHANGE_REGION_DIALOG_POSITIVE_BTN_CLICKED);

                    // TODO: add new metrics for DIALOG_CHANGE_PREFERRED_LOCALE_REGION

                    dismiss();

                    if (getActivity() != null) {

                        getActivity().finish();

                    }

                } else {

                    mMetricsFeatureProvider.action(

                            mContext,

                            SettingsEnums.ACTION_CHANGE_REGION_DIALOG_NEGATIVE_BTN_CLICKED);

                    // TODO: add new metrics for DIALOG_CHANGE_PREFERRED_LOCALE_REGION

                }

                    dismiss();

                if (getActivity() != null) {

                    getActivity().finish();

                }

            }

        }