Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use WifiEntry#shouldShowXLevelIcon() to show X in level icon" into rvc-qpr-dev am: a2da145ff6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12475283

Change-Id: I1910ca04565e936cd5054cb199aa074ead91cc0e
This commit is contained in:
Quang Luong
2020-09-11 18:57:42 +00:00
committed by Automerger Merge Worker
parent 8513ac2afc a2da145ff6
commit b70296653d
2 changed files with 3 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java
View File

@@ -35,7 +35,6 @@ import androidx.preference.PreferenceViewHolder;
import com.android.settingslib.R; import com.android.settingslib.R;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.wifitrackerlib.WifiEntry; import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiEntry.ConnectedInfo;
/** /**
* Preference to display a WifiEntry in a wifi picker. * Preference to display a WifiEntry in a wifi picker.
@@ -138,11 +137,7 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt
public void refresh() { public void refresh() {
setTitle(mWifiEntry.getTitle()); setTitle(mWifiEntry.getTitle());
final int level = mWifiEntry.getLevel(); final int level = mWifiEntry.getLevel();
final ConnectedInfo connectedInfo = mWifiEntry.getConnectedInfo(); final boolean showX = mWifiEntry.shouldShowXLevelIcon();
boolean showX = false;
if (connectedInfo != null) {
showX = !connectedInfo.isDefaultNetwork || !connectedInfo.isValidated;
}
if (level != mLevel || showX != mShowX) { if (level != mLevel || showX != mShowX) {
mLevel = level; mLevel = level;
mShowX = showX; mShowX = showX;

40
packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiEntryPreferenceTest.java
View File

@@ -17,7 +17,6 @@ package com.android.settingslib.wifi;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
@@ -30,7 +29,6 @@ import androidx.preference.PreferenceViewHolder;
import com.android.settingslib.R; import com.android.settingslib.R;
import com.android.wifitrackerlib.WifiEntry; import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiEntry.ConnectedInfo;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -179,43 +177,9 @@ public class WifiEntryPreferenceTest {
} }
@Test @Test
public void levelChanged_notDefaultWifiRefresh_shouldUpdateLevelIcon() { public void levelChanged_showXWifiRefresh_shouldUpdateLevelIcon() {
final List<Drawable> iconList = new ArrayList<>(); final List<Drawable> iconList = new ArrayList<>();
final ConnectedInfo mockConnectedInfo = mock(ConnectedInfo.class); when(mMockWifiEntry.shouldShowXLevelIcon()).thenReturn(true);
mockConnectedInfo.isDefaultNetwork = false;
when(mMockWifiEntry.getConnectedInfo()).thenReturn(mockConnectedInfo);
final WifiEntryPreference pref =
new WifiEntryPreference(mContext, mMockWifiEntry, mMockIconInjector);
when(mMockWifiEntry.getLevel()).thenReturn(0);
pref.refresh();
iconList.add(pref.getIcon());
when(mMockWifiEntry.getLevel()).thenReturn(1);
pref.refresh();
iconList.add(pref.getIcon());
when(mMockWifiEntry.getLevel()).thenReturn(2);
pref.refresh();
iconList.add(pref.getIcon());
when(mMockWifiEntry.getLevel()).thenReturn(3);
pref.refresh();
iconList.add(pref.getIcon());
when(mMockWifiEntry.getLevel()).thenReturn(4);
pref.refresh();
iconList.add(pref.getIcon());
when(mMockWifiEntry.getLevel()).thenReturn(-1);
pref.refresh();
iconList.add(pref.getIcon());
assertThat(iconList).containsExactly(mMockShowXDrawable0, mMockShowXDrawable1,
mMockShowXDrawable2, mMockShowXDrawable3, mMockShowXDrawable4, null);
}
@Test
public void levelChanged_notValidatedWifiRefresh_shouldUpdateLevelIcon() {
final List<Drawable> iconList = new ArrayList<>();
final ConnectedInfo mockConnectedInfo = mock(ConnectedInfo.class);
mockConnectedInfo.isValidated = false;
when(mMockWifiEntry.getConnectedInfo()).thenReturn(mockConnectedInfo);
final WifiEntryPreference pref = final WifiEntryPreference pref =
new WifiEntryPreference(mContext, mMockWifiEntry, mMockIconInjector); new WifiEntryPreference(mContext, mMockWifiEntry, mMockIconInjector);