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

[automerge] [Pnalingual] Resolve code conflict. 2p: 6436a5aa6f

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

Bug: 228292561
Change-Id: I889b195579da6dda07bb5f186a59f5a7f0fa8c08
This commit is contained in:
Presubmit Automerger Backend
2022-04-06 11:07:55 +00:00
parent ba369cbb31 6436a5aa6f
commit 9d162016b9
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()