From 203931d038a50414ede3cdb8f08afdccd40b7379 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Tue, 21 Nov 2023 20:20:20 +0800 Subject: [PATCH] Show Hotspot network in Network & internet settings - Show Hotspot icons - Show getAlternateSummary instead of original getSummary Fix: 308187592 Test: unit test atest -c InternetPreferenceControllerTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a9ea40dc71362b372c5adc89b82dbe2024253688) Merged-In: I8afe54edebc904c9ec936f5851a33c6c20f13e29 Change-Id: I8afe54edebc904c9ec936f5851a33c6c20f13e29 --- .../network/InternetPreferenceController.java | 70 ++++++++++++++++--- .../settings/wifi/WifiSummaryUpdater.java | 2 +- .../InternetPreferenceControllerTest.java | 62 +++++++++++++--- 3 files changed, 115 insertions(+), 19 deletions(-) diff --git a/src/com/android/settings/network/InternetPreferenceController.java b/src/com/android/settings/network/InternetPreferenceController.java index bc2e71e0688..71acd4b1398 100644 --- a/src/com/android/settings/network/InternetPreferenceController.java +++ b/src/com/android/settings/network/InternetPreferenceController.java @@ -24,6 +24,7 @@ import static com.android.settings.network.InternetUpdater.INTERNET_ETHERNET; import static com.android.settings.network.InternetUpdater.INTERNET_NETWORKS_AVAILABLE; import static com.android.settings.network.InternetUpdater.INTERNET_OFF; import static com.android.settings.network.InternetUpdater.INTERNET_WIFI; +import static com.android.settingslib.wifi.WifiUtils.getHotspotIconResource; import android.content.Context; import android.graphics.drawable.Drawable; @@ -40,11 +41,15 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.widget.SummaryUpdater; +import com.android.settings.wifi.WifiPickerTrackerHelper; import com.android.settings.wifi.WifiSummaryUpdater; import com.android.settingslib.Utils; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity; import com.android.settingslib.utils.ThreadUtils; +import com.android.wifitrackerlib.HotspotNetworkEntry; +import com.android.wifitrackerlib.WifiEntry; +import com.android.wifitrackerlib.WifiPickerTracker; import java.util.ArrayList; import java.util.HashMap; @@ -57,12 +62,14 @@ import java.util.Map; public class InternetPreferenceController extends AbstractPreferenceController implements LifecycleObserver, SummaryUpdater.OnSummaryChangeListener, InternetUpdater.InternetChangeListener, MobileNetworkRepository.MobileNetworkCallback, - DefaultSubscriptionReceiver.DefaultSubscriptionListener { + DefaultSubscriptionReceiver.DefaultSubscriptionListener, + WifiPickerTracker.WifiPickerTrackerCallback { public static final String KEY = "internet_settings"; private Preference mPreference; - private final WifiSummaryUpdater mSummaryHelper; + @VisibleForTesting + WifiSummaryUpdater mSummaryHelper; private InternetUpdater mInternetUpdater; private @InternetUpdater.InternetType int mInternetType; private LifecycleOwner mLifecycleOwner; @@ -70,6 +77,8 @@ public class InternetPreferenceController extends AbstractPreferenceController i private List mSubInfoEntityList = new ArrayList<>(); private int mDefaultDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; private DefaultSubscriptionReceiver mDataSubscriptionChangedReceiver; + @VisibleForTesting + WifiPickerTrackerHelper mWifiPickerTrackerHelper; @VisibleForTesting static Map sIconMap = new HashMap<>(); @@ -102,6 +111,7 @@ public class InternetPreferenceController extends AbstractPreferenceController i mLifecycleOwner = lifecycleOwner; mMobileNetworkRepository = MobileNetworkRepository.getInstance(context); mDataSubscriptionChangedReceiver = new DefaultSubscriptionReceiver(context, this); + mWifiPickerTrackerHelper = new WifiPickerTrackerHelper(lifecycle, context, this); lifecycle.addObserver(this); } @@ -111,20 +121,27 @@ public class InternetPreferenceController extends AbstractPreferenceController i mPreference = screen.findPreference(KEY); } + private void drawIcon(int iconResId) { + Drawable drawable = mContext.getDrawable(iconResId); + if (drawable != null) { + drawable.setTintList(Utils.getColorAttr(mContext, android.R.attr.colorControlNormal)); + mPreference.setIcon(drawable); + } + } + @Override public void updateState(Preference preference) { if (mPreference == null) { return; } + if (mInternetType == INTERNET_WIFI && updateHotspotNetwork()) { + return; + } + final @IdRes int icon = sIconMap.get(mInternetType); if (icon != 0) { - final Drawable drawable = mContext.getDrawable(icon); - if (drawable != null) { - drawable.setTintList( - Utils.getColorAttr(mContext, android.R.attr.colorControlNormal)); - mPreference.setIcon(drawable); - } + drawIcon(icon); } if (mInternetType == INTERNET_WIFI) { @@ -143,6 +160,17 @@ public class InternetPreferenceController extends AbstractPreferenceController i } } + @VisibleForTesting + boolean updateHotspotNetwork() { + WifiEntry entry = mWifiPickerTrackerHelper.getWifiPickerTracker().getConnectedWifiEntry(); + if (!(entry instanceof HotspotNetworkEntry)) { + return false; + } + drawIcon(getHotspotIconResource(((HotspotNetworkEntry) entry).getDeviceType())); + mPreference.setSummary(((HotspotNetworkEntry) entry).getAlternateSummary()); + return true; + } + @Override public boolean isAvailable() { return true; @@ -200,8 +228,8 @@ public class InternetPreferenceController extends AbstractPreferenceController i @Override public void onSummaryChanged(String summary) { - if (mInternetType == INTERNET_WIFI && mPreference != null) { - mPreference.setSummary(summary); + if (mInternetType == INTERNET_WIFI) { + updateState(mPreference); } } @@ -256,4 +284,26 @@ public class InternetPreferenceController extends AbstractPreferenceController i mDefaultDataSubId = defaultDataSubId; updateState(mPreference); } + + @Override + public void onWifiEntriesChanged() { + if (mInternetType == INTERNET_WIFI) { + updateState(mPreference); + } + } + + @Override + public void onWifiStateChanged() { + // Do nothing + } + + @Override + public void onNumSavedNetworksChanged() { + // Do nothing + } + + @Override + public void onNumSavedSubscriptionsChanged() { + // Do nothing + } } diff --git a/src/com/android/settings/wifi/WifiSummaryUpdater.java b/src/com/android/settings/wifi/WifiSummaryUpdater.java index 93bbe0f8b15..645d2eaf57a 100644 --- a/src/com/android/settings/wifi/WifiSummaryUpdater.java +++ b/src/com/android/settings/wifi/WifiSummaryUpdater.java @@ -36,7 +36,7 @@ import com.android.settingslib.wifi.WifiStatusTracker; * Helper class that listeners to wifi callback and notify client when there is update in * wifi summary info. */ -public final class WifiSummaryUpdater extends SummaryUpdater { +public class WifiSummaryUpdater extends SummaryUpdater { private final WifiStatusTracker mWifiTracker; private final BroadcastReceiver mReceiver; diff --git a/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java index 4e9339f8ec1..5af2da0cf12 100644 --- a/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java @@ -22,9 +22,7 @@ import static com.android.settings.network.InternetUpdater.INTERNET_WIFI; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -38,7 +36,6 @@ import android.net.NetworkScoreManager; import android.net.wifi.WifiManager; import android.os.Handler; import android.os.Looper; -import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -53,13 +50,19 @@ import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.settings.testutils.ResourcesUtils; +import com.android.settings.wifi.WifiPickerTrackerHelper; +import com.android.settings.wifi.WifiSummaryUpdater; import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity; +import com.android.wifitrackerlib.HotspotNetworkEntry; +import com.android.wifitrackerlib.StandardWifiEntry; +import com.android.wifitrackerlib.WifiPickerTracker; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Spy; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; @@ -70,6 +73,7 @@ import java.util.List; public class InternetPreferenceControllerTest { private static final String TEST_SUMMARY = "test summary"; + private static final String TEST_ALTERNATE_SUMMARY = "test alternate summary"; private static final String NOT_CONNECTED = "Not connected"; private static final String SUB_ID_1 = "1"; private static final String SUB_ID_2 = "2"; @@ -85,6 +89,8 @@ public class InternetPreferenceControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + @Spy + private Context mContext = ApplicationProvider.getApplicationContext(); @Mock private SubscriptionInfoEntity mActiveSubInfo; @Mock @@ -93,10 +99,19 @@ public class InternetPreferenceControllerTest { private ConnectivityManager mConnectivityManager; @Mock private LifecycleOwner mLifecycleOwner; + @Mock + private WifiManager mWifiManager; + @Mock + private WifiSummaryUpdater mSummaryHelper; + @Mock + private WifiPickerTrackerHelper mWifiPickerTrackerHelper; + @Mock + private WifiPickerTracker mWifiPickerTracker; + @Mock + private HotspotNetworkEntry mHotspotNetworkEntry; private LifecycleRegistry mLifecycleRegistry; - private Context mContext; private MockInternetPreferenceController mController; private PreferenceScreen mScreen; private Preference mPreference; @@ -104,13 +119,15 @@ public class InternetPreferenceControllerTest { @Before public void setUp() { - mContext = spy(ApplicationProvider.getApplicationContext()); when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager); when(mContext.getSystemService(NetworkScoreManager.class)) .thenReturn(mock(NetworkScoreManager.class)); - final WifiManager wifiManager = mock(WifiManager.class); - when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(wifiManager); - when(wifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED); + when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); + when(mWifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED); + when(mWifiPickerTrackerHelper.getWifiPickerTracker()).thenReturn(mWifiPickerTracker); + when(mWifiPickerTracker.getConnectedWifiEntry()).thenReturn(null /* WifiEntry */); + when(mHotspotNetworkEntry.getAlternateSummary()).thenReturn(TEST_ALTERNATE_SUMMARY); + if (Looper.myLooper() == null) { Looper.prepare(); } @@ -119,6 +136,7 @@ public class InternetPreferenceControllerTest { mController = new MockInternetPreferenceController(mContext, mock(Lifecycle.class), mLifecycleOwner); mController.sIconMap.put(INTERNET_WIFI, 0); + mController.mWifiPickerTrackerHelper = mWifiPickerTrackerHelper; final PreferenceManager preferenceManager = new PreferenceManager(mContext); mScreen = preferenceManager.createPreferenceScreen(mContext); @@ -200,6 +218,8 @@ public class InternetPreferenceControllerTest { @Test public void onSummaryChanged_internetWifi_updateSummary() { + when(mSummaryHelper.getSummary()).thenReturn(TEST_SUMMARY); + mController.mSummaryHelper = mSummaryHelper; mController.onInternetTypeChanged(INTERNET_WIFI); mController.displayPreference(mScreen); @@ -210,6 +230,8 @@ public class InternetPreferenceControllerTest { @Test public void onSummaryChanged_internetNetworksAvailable_notUpdateSummary() { + when(mSummaryHelper.getSummary()).thenReturn(TEST_SUMMARY); + mController.mSummaryHelper = mSummaryHelper; mController.onInternetTypeChanged(INTERNET_NETWORKS_AVAILABLE); mController.displayPreference(mScreen); mPreference.setSummary(NOT_CONNECTED); @@ -252,4 +274,28 @@ public class InternetPreferenceControllerTest { mController.updateCellularSummary(); assertThat(mPreference.getSummary()).isEqualTo(expectedSummary); } + + @Test + public void updateHotspotNetwork_isHotspotNetworkEntry_updateAlternateSummary() { + when(mWifiPickerTracker.getConnectedWifiEntry()).thenReturn(mHotspotNetworkEntry); + mController.onInternetTypeChanged(INTERNET_WIFI); + mController.displayPreference(mScreen); + mPreference.setSummary(TEST_SUMMARY); + + mController.updateHotspotNetwork(); + + assertThat(mPreference.getSummary().toString()).isEqualTo(TEST_ALTERNATE_SUMMARY); + } + + @Test + public void updateHotspotNetwork_notHotspotNetworkEntry_notChangeSummary() { + when(mWifiPickerTracker.getConnectedWifiEntry()).thenReturn(mock(StandardWifiEntry.class)); + mController.onInternetTypeChanged(INTERNET_WIFI); + mController.displayPreference(mScreen); + mPreference.setSummary(TEST_SUMMARY); + + mController.updateHotspotNetwork(); + + assertThat(mPreference.getSummary().toString()).isEqualTo(TEST_SUMMARY); + } }