PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit f71149911b.

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

Change-Id: I43574314554a9c62559f529e45f69c29ba6b5a77
This commit is contained in:
Weng Su
2020-10-20 02:12:28 +00:00
parent f71149911b
commit 67f95bfd2f
4 changed files with 5 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
View File

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

8
src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
View File

@@ -69,12 +69,12 @@ public class WifiPrivacyPreferenceController2 extends BasePreferenceController i
public void updateState(Preference preference) { public void updateState(Preference preference) {
final DropDownPreference dropDownPreference = (DropDownPreference) preference; final DropDownPreference dropDownPreference = (DropDownPreference) preference;
final int randomizationLevel = getRandomizationValue(); final int randomizationLevel = getRandomizationValue();
final boolean isSelectable = mWifiEntry.canSetPrivacy();
preference.setSelectable(isSelectable);
dropDownPreference.setValue(Integer.toString(randomizationLevel)); dropDownPreference.setValue(Integer.toString(randomizationLevel));
if (isSelectable) {
updateSummary(dropDownPreference, randomizationLevel); updateSummary(dropDownPreference, randomizationLevel);
} else {
// 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); dropDownPreference.setSummary(R.string.wifi_privacy_settings_ephemeral_summary);
} }
} }

42
tests/robotests/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2Test.java
View File

@@ -73,46 +73,4 @@ public class WifiNetworkDetailsFragment2Test {
verify(menuItem).setIcon(com.android.internal.R.drawable.ic_mode_edit); 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;
}
}
} }

34
tests/robotests/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.java
View File

@@ -105,38 +105,4 @@ public class WifiPrivacyPreferenceController2Test {
assertThat(mDropDownPreference.isSelectable()).isFalse(); 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();
}
} }