[Pnalingual] Resolve code conflict.
Bug: 228292561 Test: local Change-Id: Idc79694fdecf3ad64e93e2f353837fd7bbdde1ed
This commit is contained in:
@@ -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()
|
||||||
|
Reference in New Issue
Block a user