From 67f95bfd2f1ff8a59276a7cfd5459f0d0f1572d2 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Tue, 20 Oct 2020 02:12:28 +0000 Subject: [PATCH] Revert "Modify the privacy controller to be selectable in the next updateState()" This reverts commit f71149911b933b4ad78f2e9b5422d033455c3e9b. Reason for revert: Some unexpected code mixed in this CL. Change-Id: I43574314554a9c62559f529e45f69c29ba6b5a77 --- .../details2/WifiNetworkDetailsFragment2.java | 5 --- .../WifiPrivacyPreferenceController2.java | 10 ++--- .../WifiNetworkDetailsFragment2Test.java | 42 ------------------- .../WifiPrivacyPreferenceController2Test.java | 34 --------------- 4 files changed, 5 insertions(+), 86 deletions(-) diff --git a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java b/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java index db8bd67a53f..76a8c5f9749 100644 --- a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java +++ b/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, diff --git a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java index 60c1d995769..a0d4b16d57a 100644 --- a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java +++ b/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); } } diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2Test.java index 7f036235e75..4b1a8ca617e 100644 --- a/tests/robotests/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2Test.java @@ -73,46 +73,4 @@ public class WifiNetworkDetailsFragment2Test { verify(menuItem).setIcon(com.android.internal.R.drawable.ic_mode_edit); } - - @Test - public void refreshPreferences_shouldUpdatePreferenceStates() { - final FakeWifiNetworkDetailsFragment2 fakeFragment = new FakeWifiNetworkDetailsFragment2(); - - fakeFragment.refreshPreferences(); - - assertThat(fakeFragment.isUpdatePreferenceStatesCalled()).isTrue(); - } - - @Test - public void refreshPreferences_shouldDisplayPreferenceControllers() { - final FakeWifiNetworkDetailsFragment2 fakeFragment = new FakeWifiNetworkDetailsFragment2(); - - fakeFragment.refreshPreferences(); - - assertThat(fakeFragment.isDisplayPreferenceControllersCalled()).isTrue(); - } - - // Fake WifiNetworkDetailsFragment2 to verify the protected functions - public class FakeWifiNetworkDetailsFragment2 extends WifiNetworkDetailsFragment2 { - - private boolean mUpdatePreferenceStatesCalled; - private boolean mDisplayPreferenceControllersCalled; - - @Override - protected void updatePreferenceStates() { - mUpdatePreferenceStatesCalled = true; - } - - @Override - protected void displayPreferenceControllers() { - mDisplayPreferenceControllersCalled = true; - } - - public boolean isUpdatePreferenceStatesCalled() { - return mUpdatePreferenceStatesCalled; - } - public boolean isDisplayPreferenceControllersCalled() { - return mDisplayPreferenceControllersCalled; - } - } } diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.java index adf3a07816b..0414b1c9e8e 100644 --- a/tests/robotests/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.java @@ -105,38 +105,4 @@ public class WifiPrivacyPreferenceController2Test { assertThat(mDropDownPreference.isSelectable()).isFalse(); } - - @Test - public void testUpdateState_canSetPrivacyInNextUpdate_shouldBeSelectable() { - // Return false in WifiEntry#canSetPrivacy to make preference un-selectable first. - when(mMockWifiEntry.canSetPrivacy()).thenReturn(false); - - mPreferenceController.updateState(mDropDownPreference); - - assertThat(mDropDownPreference.isSelectable()).isFalse(); - - // Return true in WifiEntry#canSetPrivacy to verify preference back to selectable. - when(mMockWifiEntry.canSetPrivacy()).thenReturn(true); - - mPreferenceController.updateState(mDropDownPreference); - - assertThat(mDropDownPreference.isSelectable()).isTrue(); - } - - @Test - public void testUpdateState_canNotSetPrivacyInNextUpdate_shouldNotSelectable() { - // Return true in WifiEntry#canSetPrivacy to make preference selectable first. - when(mMockWifiEntry.canSetPrivacy()).thenReturn(true); - - mPreferenceController.updateState(mDropDownPreference); - - assertThat(mDropDownPreference.isSelectable()).isTrue(); - - // Return false in WifiEntry#canSetPrivacy to verify preference back to un-selectable. - when(mMockWifiEntry.canSetPrivacy()).thenReturn(false); - - mPreferenceController.updateState(mDropDownPreference); - - assertThat(mDropDownPreference.isSelectable()).isFalse(); - } }