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

[Pnalingual] Resolve code conflict.

Browse Source 
Bug: 228292561
Test: local
Change-Id: Idc79694fdecf3ad64e93e2f353837fd7bbdde1ed
(cherry picked from commit aac21a59aa)
This commit is contained in:
tom hsu
2022-04-06 18:28:13 +08:00
committed by Tom Hsu
parent a926f6ddbc
commit 6436a5aa6f
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,17 +146,17 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
android.app.FragmentManager fragmentManager = getFragmentManager(); android.app.FragmentManager fragmentManager = getFragmentManager();
fragmentManager.registerFragmentLifecycleCallbacks( fragmentManager.registerFragmentLifecycleCallbacks(
new android.app.FragmentManager.FragmentLifecycleCallbacks() { new android.app.FragmentManager.FragmentLifecycleCallbacks() {
@Override @Override
public void onFragmentViewCreated( public void onFragmentViewCreated(
android.app.FragmentManager fm, android.app.FragmentManager fm,
android.app.Fragment f, android.app.Fragment f,
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()
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
.replace(R.id.content_frame, mLocalePickerWithRegion) .replace(R.id.content_frame, mLocalePickerWithRegion)