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

Commit 8be2d2ff authored by danielwbhuang's avatar danielwbhuang
Browse files

Stay on the region selection page after clicking "Cancel". 

Only finish the activity after user has selected a region.

Bug: 403172371
Test: manual
Flag: EXEMPT bugfix
Change-Id: I9eee0728f7a06260249ad1db6d499eeb8c8ea255
parent 1f8cd5ec

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

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

                            mContext,

                            SettingsEnums.ACTION_CHANGE_REGION_DIALOG_POSITIVE_BTN_CLICKED);

                            SettingsEnums.ACTION_CHANGE_REGION_DIALOG_POSITIVE_BTN_CLICKED);

                    // TODO: add new metrics for DIALOG_CHANGE_PREFERRED_LOCALE_REGION

                    // TODO: add new metrics for DIALOG_CHANGE_PREFERRED_LOCALE_REGION

                    dismiss();

                    if (getActivity() != null) {

                        getActivity().finish();

                    }

                } else {

                } else {

                    mMetricsFeatureProvider.action(

                    mMetricsFeatureProvider.action(

                            mContext,

                            mContext,

                            SettingsEnums.ACTION_CHANGE_REGION_DIALOG_NEGATIVE_BTN_CLICKED);

                            SettingsEnums.ACTION_CHANGE_REGION_DIALOG_NEGATIVE_BTN_CLICKED);

                    // TODO: add new metrics for DIALOG_CHANGE_PREFERRED_LOCALE_REGION

                    // TODO: add new metrics for DIALOG_CHANGE_PREFERRED_LOCALE_REGION

                }

                    dismiss();

                    dismiss();

                if (getActivity() != null) {

                    getActivity().finish();

                }

                }

            }

            }

        }

        }