PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Panlingual] Fix settings crash due to no content view." into tm-dev am: e79605c652

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684392

Change-Id: I972a5641a3d6f06b174e1eecec44acedff2a5fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tom Hsu
2022-04-11 16:32:57 +00:00
committed by Automerger Merge Worker
parent 080ef875d8 e79605c652
commit e24b3ee152
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/localepicker/AppLocalePickerActivity.java
View File

@@ -87,12 +87,6 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
launchLocalePickerPage(); launchLocalePickerPage();
} }
@Override
public void onResume() {
super.onResume();
mLocalePickerWithRegion.getListView().addHeaderView(launchAppLocaleDetailsPage());
}
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home) { if (item.getItemId() == android.R.id.home) {
@@ -136,7 +130,19 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
void launchLocalePickerPage() { void launchLocalePickerPage() {
// LocalePickerWithRegion use android.app.ListFragment. Thus, it can not use // LocalePickerWithRegion use android.app.ListFragment. Thus, it can not use
// getSupportFragmentManager() to add this into container. // getSupportFragmentManager() to add this into container.
getFragmentManager().beginTransaction() android.app.FragmentManager fragmentManager = getFragmentManager();
fragmentManager.registerFragmentLifecycleCallbacks(
new android.app.FragmentManager.FragmentLifecycleCallbacks() {
@Override
public void onFragmentResumed(
android.app.FragmentManager fm,
android.app.Fragment f) {
super.onFragmentResumed(fm, f);
mLocalePickerWithRegion.getListView()
.addHeaderView(launchAppLocaleDetailsPage());
}
}, true);
fragmentManager.beginTransaction()
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
.replace(R.id.content_frame, mLocalePickerWithRegion) .replace(R.id.content_frame, mLocalePickerWithRegion)
.commit(); .commit();