Revert "Modify the privacy controller to be selectable in the next updateState()"

This reverts commit f71149911b.

Reason for revert: Some unexpected code mixed in this CL.

Change-Id: I43574314554a9c62559f529e45f69c29ba6b5a77

src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java

@@ -255,11 +255,6 @@ public class WifiNetworkDetailsFragment2 extends DashboardFragment implements
      * API call for refreshing the preferences in this fragment.
      */
     public void refreshPreferences() {
-        updatePreferenceStates();
-        displayPreferenceControllers();
-    }
-
-    protected void displayPreferenceControllers() {
         final PreferenceScreen screen = getPreferenceScreen();
         for (AbstractPreferenceController controller : mControllers) {
             // WifiDetailPreferenceController2 gets the callback WifiEntryCallback#onUpdated,

src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java

@@ -69,12 +69,12 @@ public class WifiPrivacyPreferenceController2 extends BasePreferenceController i
     public void updateState(Preference preference) {
         final DropDownPreference dropDownPreference = (DropDownPreference) preference;
         final int randomizationLevel = getRandomizationValue();
-        final boolean isSelectable = mWifiEntry.canSetPrivacy();
-        preference.setSelectable(isSelectable);
         dropDownPreference.setValue(Integer.toString(randomizationLevel));
-        if (isSelectable) {
-            updateSummary(dropDownPreference, randomizationLevel);
-        } else {
+        updateSummary(dropDownPreference, randomizationLevel);
+
+        // Makes preference not selectable, when this is a ephemeral network.
+        if (!mWifiEntry.canSetPrivacy()) {
+            preference.setSelectable(false);
             dropDownPreference.setSummary(R.string.wifi_privacy_settings_ephemeral_summary);
         }
     }