Merge "Fix bug #12910775 Settings crash after tap on Access Point Names under Mobile networks"

src/com/android/settings/ApnSettings.java

@@ -120,12 +120,18 @@ public class ApnSettings extends SettingsPreferenceFragment implements
         super.onCreate(icicle);
 
         addPreferencesFromResource(R.xml.apn_settings);
-        getListView().setItemsCanFocus(true);
 
         mMobileStateFilter = new IntentFilter(
                 TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);
     }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        getListView().setItemsCanFocus(true);
+    }
+
     @Override
     public void onResume() {
         super.onResume();

src/com/android/settings/Settings.java

@@ -88,5 +88,6 @@ public class Settings extends SettingsActivity {
     public static class PrintJobSettingsActivity extends SettingsActivity { /* empty */ }
 
     public static class TopLevelSettings extends SettingsActivity { /* empty */ }
+    public static class ApnSettingsActivity extends SettingsActivity { /* empty */ }
 }
 

src/com/android/settings/SettingsActivity.java

@@ -278,7 +278,8 @@ public class SettingsActivity extends Activity
             PaymentSettings.class.getName(),
             KeyboardLayoutPickerFragment.class.getName(),
             ChooseAccountFragment.class.getName(),
-            DashboardSummary.class.getName()
+            DashboardSummary.class.getName(),
+            ApnSettings.class.getName()
     };
 
     private SharedPreferences mDevelopmentPreferences;