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

Commit 6436a5aa authored by tom hsu's avatar tom hsu Committed by Tom Hsu
Browse files

[Pnalingual] Resolve code conflict. 

Bug: 228292561
Test: local
Change-Id: Idc79694fdecf3ad64e93e2f353837fd7bbdde1ed
(cherry picked from commit aac21a59)
parent a926f6dd

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

+11 −11
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ public class AppLocalePickerActivity extends SettingsBaseActivity 
                            View v,

                            Bundle savedInstanceState) {

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

                    mLocalePickerWithRegion

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

                        mLocalePickerWithRegion.getListView()

                                .addHeaderView(launchAppLocaleDetailsPage());

                    }

                }, true);

        fragmentManager.beginTransaction()