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

Merge "[Panlingual] Fix settings's crash." into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-13 08:58:07 +00:00
committed by Android (Google) Code Review
parent dae29a84fa 25dc3817a9
commit 4bc8231c71
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ import android.util.Log;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ListView;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.LocalePickerWithRegion; import com.android.internal.app.LocalePickerWithRegion;
@@ -49,6 +50,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
private LocalePickerWithRegion mLocalePickerWithRegion; private LocalePickerWithRegion mLocalePickerWithRegion;
private AppLocaleDetails mAppLocaleDetails; private AppLocaleDetails mAppLocaleDetails;
private Context mContextAsUser; private Context mContextAsUser;
private View mAppLocaleDetailContainer;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@@ -82,7 +84,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
false /* translate only */, false /* translate only */,
mPackageName); mPackageName);
mAppLocaleDetails = AppLocaleDetails.newInstance(mPackageName); mAppLocaleDetails = AppLocaleDetails.newInstance(mPackageName);
mAppLocaleDetailContainer = launchAppLocaleDetailsPage();
// Launch Locale picker part. // Launch Locale picker part.
launchLocalePickerPage(); launchLocalePickerPage();
} }
@@ -134,12 +136,14 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
fragmentManager.registerFragmentLifecycleCallbacks( fragmentManager.registerFragmentLifecycleCallbacks(
new android.app.FragmentManager.FragmentLifecycleCallbacks() { new android.app.FragmentManager.FragmentLifecycleCallbacks() {
@Override @Override
public void onFragmentResumed( public void onFragmentViewCreated(
android.app.FragmentManager fm, android.app.FragmentManager fm,
android.app.Fragment f) { android.app.Fragment f, View v, Bundle s) {
super.onFragmentResumed(fm, f); super.onFragmentViewCreated(fm, f, v, s);
mLocalePickerWithRegion.getListView() ListView listView = (ListView) v.findViewById(android.R.id.list);
.addHeaderView(launchAppLocaleDetailsPage()); if (listView != null) {
listView.addHeaderView(mAppLocaleDetailContainer);
}
} }
}, true); }, true);
fragmentManager.beginTransaction() fragmentManager.beginTransaction()