Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f16b0cd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-9c41bb9c971547b49c41b3d37ad42e21" into tm-mainline-prod 

* changes:
  [automerge] [Panlingual] Fix settings crash from rotation. 2p: 19bd21d9
  [Panlingual] Fix settings crash from rotation.
parents 16cbd398 d36ff21f

src/com/android/settings/localepicker/AppLocalePickerActivity.java

+7 −15
Original line number Diff line number Diff line
@@ -86,6 +86,12 @@ public class AppLocalePickerActivity extends SettingsBaseActivity 
        launchLocalePickerPage();

    }



    @Override

    public void onResume() {

        super.onResume();

        mLocalePickerWithRegion.getListView().addHeaderView(launchAppLocaleDetailsPage());

    }



    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        if (item.getItemId() == android.R.id.home) {
@@ -143,21 +149,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity 
    void launchLocalePickerPage() {

        // LocalePickerWithRegion use android.app.ListFragment. Thus, it can not use

        // getSupportFragmentManager() to add this into container.

        android.app.FragmentManager fragmentManager = getFragmentManager();

        fragmentManager.registerFragmentLifecycleCallbacks(

                new android.app.FragmentManager.FragmentLifecycleCallbacks() {

                    @Override

                    public void onFragmentViewCreated(

                            android.app.FragmentManager fm,

                            android.app.Fragment f,

                            View v,

                            Bundle savedInstanceState) {

                        super.onFragmentViewCreated(fm, f, v, savedInstanceState);

                        mLocalePickerWithRegion.getListView()

                                .addHeaderView(launchAppLocaleDetailsPage());

                    }

                }, true);

        fragmentManager.beginTransaction()

        getFragmentManager().beginTransaction()

                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)

                .replace(R.id.content_frame, mLocalePickerWithRegion)

                .commit();