Merge "Stay on the region selection page after clicking "Cancel"." into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
2f63c57042
@@ -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();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user