Merge "[Panlingual] Fix the back button press" into tm-dev

This commit is contained in:
Tom Hsu
2022-04-07 02:52:23 +00:00
committed by Android (Google) Code Review

View File

@@ -95,26 +95,12 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home) {
handleBackPressed();
super.onBackPressed();
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
public void onBackPressed() {
handleBackPressed();
}
private void handleBackPressed() {
if (getFragmentManager().getBackStackEntryCount() > 1) {
super.onBackPressed();
} else {
setResult(RESULT_CANCELED);
finish();
}
}
@Override
public void onLocaleSelected(LocaleStore.LocaleInfo localeInfo) {
if (localeInfo == null || localeInfo.getLocale() == null || localeInfo.isSystemLocale()) {