[Provider Model] Internet Panel UI update

- Add gear icon to connected non-carrier network

- Update "View airplane mode networks" wording

- Update "Turn off airplane mode" wording

- Check WiFi disable to show airplane mode message

- Screenshot
  https://screenshot.googleplex.com/BRjcKyMaMS4ujYN

Bug: 173413889
Test:
- Manual Test
- adb shell am start -a
android.settings.panel.action.INTERNET_CONNECTIVITY

Change-Id: Icf7b77e514cffa68cf103dbc9e7df93d58f9f762
This commit is contained in:
Weng Su
2021-01-05 18:16:35 +00:00
parent 88d1033150
commit e9f4928ef1
4 changed files with 9 additions and 9 deletions

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