commit 6436a5aa6f663c2228fcc45a1b99618bfc33dd60
author tom hsu <tomhsu@google.com> Wed Apr 06 18:28:13 2022 +0800
committer Tom Hsu <tomhsu@google.com> Wed Apr 06 11:07:22 2022 +0000
tree cb3194afd796d53f9dac351025149586c60de53c
parent a926f6ddbccd212fac679650914dbc27bff28ceb

[Pnalingual] Resolve code conflict.

Bug: 228292561
Test: local
Change-Id: Idc79694fdecf3ad64e93e2f353837fd7bbdde1ed
(cherry picked from commit aac21a59aac2c5a8e0a6dbb82d0a5d9c72f0f614)

src/com/android/settings/localepicker/AppLocalePickerActivity.java

diff --git a/src/com/android/settings/localepicker/AppLocalePickerActivity.java b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
index 45499ee..2c652c6 100644
--- a/src/com/android/settings/localepicker/AppLocalePickerActivity.java
+++ b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
@@ -146,17 +146,17 @@
         android.app.FragmentManager fragmentManager = getFragmentManager();
         fragmentManager.registerFragmentLifecycleCallbacks(
                 new android.app.FragmentManager.FragmentLifecycleCallbacks() {
-                @Override
-                public void onFragmentViewCreated(
-                        android.app.FragmentManager fm,
-                        android.app.Fragment f,
-                        View v,
-                        Bundle savedInstanceState) {
-                    super.onFragmentViewCreated(fm, f, v, savedInstanceState);
-                    mLocalePickerWithRegion
-                        .getListView().addHeaderView(launchAppLocaleDetailsPage());
-                }
-            }, true);
+                    @Override
+                    public void onFragmentViewCreated(
+                            android.app.FragmentManager fm,
+                            android.app.Fragment f,
+                            View v,
+                            Bundle savedInstanceState) {
+                        super.onFragmentViewCreated(fm, f, v, savedInstanceState);
+                        mLocalePickerWithRegion.getListView()
+                                .addHeaderView(launchAppLocaleDetailsPage());
+                    }
+                }, true);
         fragmentManager.beginTransaction()
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
                 .replace(R.id.content_frame, mLocalePickerWithRegion)