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

[Provider Model] Update internet preference icon and summary

Browse Source 
- Airplane mode icon/summary

- Airplane mode networks icon/summary

- Wi-Fi network connected icon/SSID

- Cellular network connected icon/carrier-name

- Ethernet network connected icon/summary

- Screenshot:
  https://screenshot.googleplex.com/AzhCEX2HjwYUMtJ
  https://screenshot.googleplex.com/9BRfQLMW4UvHqqq
  https://screenshot.googleplex.com/5jdi8oEjMPUURdT

Bug: 176796623
Test: manual test
- atest -c InternetUpdaterTest \
           InternetPreferenceControllerTest

Change-Id: Icc8944dabdac597f12b67cffa72cb0be02d9671d
This commit is contained in:
Weng Su
2021-01-19 08:46:36 +00:00
parent f4e71b0019
commit 46837dc4d5
7 changed files with 518 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.network;
import static com.android.settings.network.InternetUpdater.INTERNET_WIFI;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -35,53 +37,54 @@ import android.net.wifi.WifiManager;
import android.os.Handler;
import android.os.Looper;
import androidx.lifecycle.Lifecycle;
import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
@RunWith(AndroidJUnit4.class)
public class InternetPreferenceControllerTest {
private static final String TEST_SUMMARY = "test summary";
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Mock
private ConnectivityManager mConnectivityManager;
private Context mContext;
private InternetPreferenceController mController;
private PreferenceScreen mScreen;
private Preference mPreference;
@Mock
private ConnectivityManager mConnectivityManager;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(ApplicationProvider.getApplicationContext());
when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
when(mContext.getSystemService(NetworkScoreManager.class))
.thenReturn(mock(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);
mController = new InternetPreferenceController(mContext);
mController = new InternetPreferenceController(mContext, mock(Lifecycle.class));
if (Looper.myLooper() == null) {
Looper.prepare();
}
final PreferenceManager preferenceManager = new PreferenceManager(mContext);
mScreen = preferenceManager.createPreferenceScreen(mContext);
mPreference = new Preference(mContext);
mPreference.setKey(InternetPreferenceController.KEY_INTERNET_SETTINGS);
mPreference.setKey(InternetPreferenceController.KEY);
mScreen.addPreference(mPreference);
}
@@ -113,6 +116,7 @@ public class InternetPreferenceControllerTest {
@Test
public void onSummaryChanged_shouldUpdatePreferenceSummary() {
mController.onInternetTypeChanged(INTERNET_WIFI);
mController.displayPreference(mScreen);
mController.onSummaryChanged(TEST_SUMMARY);

158
tests/unit/src/com/android/settings/network/InternetUpdaterTest.java Normal file
View File

@@ -0,0 +1,158 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.network;
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static com.android.settings.network.InternetUpdater.INTERNET_APM;
import static com.android.settings.network.InternetUpdater.INTERNET_APM_NETWORKS;
import static com.android.settings.network.InternetUpdater.INTERNET_CELLULAR;
import static com.android.settings.network.InternetUpdater.INTERNET_ETHERNET;
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.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.IntentFilter;
import android.net.ConnectivityManager;
import android.net.wifi.WifiManager;
import androidx.lifecycle.Lifecycle;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.AirplaneModeEnabler;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
@RunWith(AndroidJUnit4.class)
public class InternetUpdaterTest {
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Mock
private ConnectivityManager mConnectivityManager;
@Mock
private WifiManager mWifiManager;
@Mock
private AirplaneModeEnabler mAirplaneModeEnabler;
private Context mContext;
private InternetUpdater mInternetUpdater;
@Before
public void setUp() {
mContext = spy(ApplicationProvider.getApplicationContext());
doReturn(mConnectivityManager).when(mContext).getSystemService(
Context.CONNECTIVITY_SERVICE);
doReturn(mWifiManager).when(mContext).getSystemService(Context.WIFI_SERVICE);
final Lifecycle lifecycle = mock(Lifecycle.class);
mInternetUpdater = new InternetUpdater(mContext, lifecycle, null);
mInternetUpdater.mAirplaneModeEnabler = mAirplaneModeEnabler;
}
@Test
public void onResume_shouldRegisterCallback() {
mInternetUpdater.onResume();
verify(mAirplaneModeEnabler).start();
verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
verify(mConnectivityManager).registerDefaultNetworkCallback(
any(ConnectivityManager.NetworkCallback.class));
// Unregister callbacks
mInternetUpdater.onPause();
}
@Test
public void onPause_shouldUnregisterCallback() {
// Register callbacks first for testing
mInternetUpdater.onResume();
mInternetUpdater.onPause();
verify(mAirplaneModeEnabler).stop();
verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
verify(mConnectivityManager).unregisterNetworkCallback(
any(ConnectivityManager.NetworkCallback.class));
}
@Test
public void update_apmOnWifiOff_getInternetApm() {
doReturn(true).when(mAirplaneModeEnabler).isAirplaneModeOn();
doReturn(false).when(mWifiManager).isWifiEnabled();
mInternetUpdater.update();
assertThat(mInternetUpdater.getInternetType()).isEqualTo(INTERNET_APM);
}
@Test
public void update_apmOnWifiOn_getInternetApmNetworks() {
doReturn(true).when(mAirplaneModeEnabler).isAirplaneModeOn();
doReturn(true).when(mWifiManager).isWifiEnabled();
mInternetUpdater.update();
assertThat(mInternetUpdater.getInternetType()).isEqualTo(INTERNET_APM_NETWORKS);
}
@Test
public void update_apmOffWifiConnected_getInternetWifi() {
doReturn(false).when(mAirplaneModeEnabler).isAirplaneModeOn();
mInternetUpdater.mTransport = TRANSPORT_WIFI;
mInternetUpdater.update();
assertThat(mInternetUpdater.getInternetType()).isEqualTo(INTERNET_WIFI);
}
@Test
public void update_apmOffCellularConnected_getInternetCellular() {
doReturn(false).when(mAirplaneModeEnabler).isAirplaneModeOn();
mInternetUpdater.mTransport = TRANSPORT_CELLULAR;
mInternetUpdater.update();
assertThat(mInternetUpdater.getInternetType()).isEqualTo(INTERNET_CELLULAR);
}
@Test
public void update_apmOffEthernetConnected_getInternetEthernet() {
doReturn(false).when(mAirplaneModeEnabler).isAirplaneModeOn();
mInternetUpdater.mTransport = TRANSPORT_ETHERNET;
mInternetUpdater.update();
assertThat(mInternetUpdater.getInternetType()).isEqualTo(INTERNET_ETHERNET);
}
}