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)
