[Pnalingual] Resolve code conflict.

Bug: 228292561
Test: local
Change-Id: Idc79694fdecf3ad64e93e2f353837fd7bbdde1ed
This commit is contained in:
tom hsu
2022-04-06 18:28:13 +08:00
committed by Tom Hsu
parent 806cea3017
commit aac21a59aa

View File

@@ -153,7 +153,8 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
View v, View v,
Bundle savedInstanceState) { Bundle savedInstanceState) {
super.onFragmentViewCreated(fm, f, v, savedInstanceState); super.onFragmentViewCreated(fm, f, v, savedInstanceState);
mLocalePickerWithRegion.getListView().addHeaderView(launchAppLocaleDetailsPage()); mLocalePickerWithRegion.getListView()
.addHeaderView(launchAppLocaleDetailsPage());
} }
}, true); }, true);
fragmentManager.beginTransaction() fragmentManager.beginTransaction()