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

This commit is contained in:
Treehugger Robot
2025-03-20 03:32:26 -07:00
committed by Android (Google) Code Review

View File

@@ -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();
dismiss();
}
}
}