Merge "Fix overlapping issue for Add a language page"
diff --git a/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java b/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
index bcc55e3..0d7d531 100644
--- a/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
+++ b/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
@@ -17,6 +17,7 @@
 package com.android.settings.localepicker;
 
 import android.app.FragmentTransaction;
+import android.app.ListFragment;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;
@@ -48,6 +49,14 @@
     }
 
     @Override
+    protected void onStart() {
+        super.onStart();
+        final ListFragment listFragment =
+                (ListFragment) getFragmentManager().findFragmentById(R.id.content_frame);
+        listFragment.getListView().setNestedScrollingEnabled(true);
+    }
+
+    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
             handleBackPressed();