commit 36a3579c618bc7bc3d77dead690c166184765cef
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 19 02:17:31 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 19 02:17:33 2017 +0000
tree 3a87c359939bb21c4456793691bef641372a8c1d
parent 476618333689e81ae60ea065026f710a33898153
parent bb46d23c8f0e264863457d2b7a342ac331558b04

Merge "Remove animations in WifiSettings." into oc-dev

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

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 01551da..66e8c54 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -191,8 +191,10 @@
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        getPreferenceManager().setPreferenceComparisonCallback(
-                new PreferenceManager.SimplePreferenceComparisonCallback());
+        // TODO(b/37429702): Add animations and preference comparator back after initial screen is
+        // loaded (ODR).
+        setAnimationAllowed(false);
+
         addPreferencesFromResource(R.xml.wifi_settings);
 
         mConnectedAccessPointPreferenceCategory =
@@ -204,9 +206,6 @@
         mConfigureWifiSettingsPreference = findPreference(PREF_KEY_CONFIGURE_WIFI_SETTINGS);
         mSavedNetworksPreference = findPreference(PREF_KEY_SAVED_NETWORKS);
 
-        // Hide additional settings until access points are shown during onStart
-        showAdditionalSettings(false);
-
         Context prefContext = getPrefContext();
         mAddPreference = new Preference(prefContext);
         mAddPreference.setIcon(R.drawable.ic_menu_add_inset);
@@ -224,17 +223,6 @@
         mBgThread.start();
     }
 
-    // TODO(b/37429702): Figure out how to temporarily disable animations during startup and remove
-    // this method.
-    private void showAdditionalSettings(boolean visible) {
-        mAdditionalSettingsPreferenceCategory.setVisible(visible);
-        mAdditionalSettingsPreferenceCategory.removeAll();
-        if (visible) {
-            mAdditionalSettingsPreferenceCategory.addPreference(mConfigureWifiSettingsPreference);
-            mAdditionalSettingsPreferenceCategory.addPreference(mSavedNetworksPreference);
-        }
-    }
-
     @Override
     public void onDestroy() {
         mBgThread.quit();
@@ -359,8 +347,6 @@
             getView().removeCallbacks(mUpdateAccessPointsRunnable);
             updateAccessPointPreferences();
         }
-
-        showAdditionalSettings(true);
     }
 
     /**
@@ -394,7 +380,6 @@
         mWifiTracker.stopTracking();
         getView().removeCallbacks(mUpdateAccessPointsRunnable);
         getView().removeCallbacks(mHideProgressBarRunnable);
-        showAdditionalSettings(false);
         super.onStop();
     }