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

Merge "[Wi-Fi] Un-relevant string flash then disappear in WiFi direct page."

Browse Source
This commit is contained in:
Goven Liu
2019-10-07 06:06:47 +00:00
committed by Android (Google) Code Review
parent 92cd7b40f3 623e8570b9
commit a4ef70fa22
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java
View File

@@ -36,13 +36,13 @@ public abstract class P2pCategoryPreferenceController extends AbstractPreference
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return true; return mCategory.getPreferenceCount() > 0;
} }
@Override @Override
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mCategory = screen.findPreference(getPreferenceKey()); mCategory = screen.findPreference(getPreferenceKey());
super.displayPreference(screen);
} }
public void removeAllChildren() { public void removeAllChildren() {

10
tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
View File

@@ -20,7 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -60,8 +60,8 @@ public class P2pCategoryPreferenceControllerTest {
} }
@Test @Test
public void isAlwaysAvailable() { public void isAvailable_withInitialEmptyGroup_shouldBeFalse() {
assertThat(mController.isAvailable()).isTrue(); assertThat(mController.isAvailable()).isFalse();
} }
@Test @Test
@@ -69,7 +69,7 @@ public class P2pCategoryPreferenceControllerTest {
mController.removeAllChildren(); mController.removeAllChildren();
verify(mCategory).removeAll(); verify(mCategory).removeAll();
verify(mCategory).setVisible(false); verify(mCategory, times(2)).setVisible(false);
} }
@Test @Test
@@ -79,7 +79,7 @@ public class P2pCategoryPreferenceControllerTest {
verify(mCategory).addPreference(pref); verify(mCategory).addPreference(pref);
verify(mCategory, atLeastOnce()).setVisible(true); verify(mCategory, atLeastOnce()).setVisible(true);
verify(mCategory, never()).setVisible(false); verify(mCategory).setVisible(false);
} }
@Test @Test