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

[Pnalingual] Resolve code conflict. am: 6436a5aa6f

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

Change-Id: I9e1316234f825ab3cd92fc8e395dbffe82448dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
tom hsu
2022-04-06 11:48:43 +00:00
committed by Automerger Merge Worker
parent 0a6067a69e 6436a5aa6f
commit 715ebf4705
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)