Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Pnalingual] Resolve code conflict. am: 6436a5aa6f am: 715ebf4705

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615234

Change-Id: I2e252e7b93bc3587fbfeb0e8152fbc16ad6c0f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
tom hsu
2022-04-06 12:03:41 +00:00
committed by Automerger Merge Worker
parent 8180a6e3f8 715ebf4705
commit 8d2c67bd03
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/localepicker/AppLocalePickerActivity.java
View File

@@ -153,8 +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 mLocalePickerWithRegion.getListView()
.getListView().addHeaderView(launchAppLocaleDetailsPage()); .addHeaderView(launchAppLocaleDetailsPage());
} }
}, true); }, true);
fragmentManager.beginTransaction() fragmentManager.beginTransaction()