Merge changes I22d799f8,I1bc14e7a into nyc-dev

* changes:
  Guard against crash in dev options
  Switch to whitelist for animations

src/com/android/settings/wifi/WifiSettings.java

@@ -175,6 +175,7 @@ public class WifiSettings extends RestrictedSettingsFragment
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        setAnimationAllowed(true);
         addPreferencesFromResource(R.xml.wifi_settings);
         mAddPreference = new Preference(getContext());
         mAddPreference.setIcon(R.drawable.ic_menu_add_inset);