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

Merge "[Provider Model] Internet Panel UI update"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-06 06:55:24 +00:00
committed by Android (Google) Code Review
parent 5ccae0635d e9f4928ef1
commit e0f2957e49
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -12523,9 +12523,9 @@
<!-- Search keywords for "Internet" settings [CHAR_LIMIT=NONE] -->
<string name="keywords_internet">network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte</string>
<!-- Label text to view airplane-safe networks. [CHAR LIMIT=40] -->
<string name="view_airplane_safe_networks">View airplane-safe networks</string>
<string name="view_airplane_safe_networks">View airplane mode networks</string>
<!-- Label text to turn off airplane mode. [CHAR LIMIT=40] -->
<string name="turn_off_airplane_mode">Turn off Airplane Mode</string>
<string name="turn_off_airplane_mode">Turn off airplane mode</string>
<!-- Summary text separator for preferences including a short description
(eg. "Connected / 5G"). [CHAR LIMIT=50] -->

2
src/com/android/settings/network/ProviderModelSlice.java
View File

@@ -82,7 +82,7 @@ public class ProviderModelSlice extends WifiSlice {
// Third section: Add the Wi-Fi items which are not connected.
// Fourth section: If device has connection problem, this row show the message for user.
if (mHelper.isAirplaneModeEnabled()) {
if (mHelper.isAirplaneModeEnabled() && !mWifiManager.isWifiEnabled()) {
log("Airplane mode is enabled.");
// ToDo Next CL will add the Airplane mode Message.
return mHelper.createListBuilder(getUri()).build();

2
src/com/android/settings/wifi/slice/WifiSlice.java
View File

@@ -183,7 +183,7 @@ public class WifiSlice implements CustomSliceable {
private IconCompat getEndIcon(WifiSliceItem wifiSliceItem) {
if (wifiSliceItem.getConnectedState() != WifiEntry.CONNECTED_STATE_DISCONNECTED) {
return null;
return IconCompat.createWithResource(mContext, R.drawable.ic_settings_24dp);
}
if (wifiSliceItem.getSecurity() != WifiEntry.SECURITY_NONE) {

10
tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java
View File

@@ -35,6 +35,7 @@ import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.testutils.AirplaneModeRule;
import com.android.settings.testutils.ResourcesUtils;
import org.junit.Before;
import org.junit.Rule;
@@ -47,9 +48,6 @@ import org.mockito.junit.MockitoRule;
@RunWith(AndroidJUnit4.class)
public class AirplaneSafeNetworksSliceTest {
private static final String VIEW_AIRPLANE_SAFE_NETWORKS = "View airplane-safe networks";
private static final String TURN_OFF_AIRPLANE_MODE = "Turn off Airplane Mode";
@Rule
public MockitoRule mMocks = MockitoJUnit.rule();
@Rule
@@ -88,7 +86,8 @@ public class AirplaneSafeNetworksSliceTest {
assertThat(slice).isNotNull();
final SliceItem sliceTitle =
SliceMetadata.from(mContext, slice).getListContent().getHeader().getTitleItem();
assertThat(sliceTitle.getText()).isEqualTo(VIEW_AIRPLANE_SAFE_NETWORKS);
assertThat(sliceTitle.getText()).isEqualTo(
ResourcesUtils.getResourcesString(mContext, "view_airplane_safe_networks"));
}
@Test
@@ -101,7 +100,8 @@ public class AirplaneSafeNetworksSliceTest {
assertThat(slice).isNotNull();
final SliceItem sliceTitle =
SliceMetadata.from(mContext, slice).getListContent().getHeader().getTitleItem();
assertThat(sliceTitle.getText()).isEqualTo(TURN_OFF_AIRPLANE_MODE);
assertThat(sliceTitle.getText()).isEqualTo(
ResourcesUtils.getResourcesString(mContext, "turn_off_airplane_mode"));
}
@Test