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

Merge "[Pnalingual] Resolve code conflict."

Browse Source
This commit is contained in:
Tom Hsu
2022-04-06 10:38:08 +00:00
committed by Android (Google) Code Review
parent 4a12af2cf8 aac21a59aa
commit 444c4868ee
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/localepicker/AppLocalePickerActivity.java
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()