Update eSIM deletion strings.

Adds some conditional behavior for the confirmation screens.
When the erase eSIM option is visible and checked, shows alternate string.

Fixes: 126262481
Fixes: 118751918
Test: visual inspection & make -j RunSettingsRoboTests
Change-Id: I40f983b03ad470d785bf104e645dbc92e7897d2d

tests/robotests/src/com/android/settings/MasterClearConfirmTest.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2019 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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.Activity;
+import android.view.LayoutInflater;
+import android.widget.TextView;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class MasterClearConfirmTest {
+    private Activity mActivity;
+
+    @Before
+    public void setUp() {
+        mActivity = Robolectric.setupActivity(Activity.class);
+    }
+
+    @Test
+    public void setSubtitle_eraseEsim() {
+        MasterClearConfirm masterClearConfirm = new MasterClearConfirm();
+        masterClearConfirm.mEraseEsims = true;
+        masterClearConfirm.mContentView =
+                LayoutInflater.from(mActivity).inflate(R.layout.master_clear_confirm, null);
+
+        masterClearConfirm.setSubtitle();
+
+        assertThat(((TextView) masterClearConfirm.mContentView
+                .findViewById(R.id.master_clear_confirm)).getText())
+                .isEqualTo(mActivity.getString(R.string.master_clear_final_desc_esim));
+    }
+
+    @Test
+    public void setSubtitle_notEraseEsim() {
+        MasterClearConfirm masterClearConfirm = new MasterClearConfirm();
+        masterClearConfirm.mEraseEsims = false;
+        masterClearConfirm.mContentView =
+                LayoutInflater.from(mActivity).inflate(R.layout.master_clear_confirm, null);
+
+        masterClearConfirm.setSubtitle();
+
+        assertThat(((TextView) masterClearConfirm.mContentView
+                .findViewById(R.id.master_clear_confirm)).getText())
+                .isEqualTo(mActivity.getString(R.string.master_clear_final_desc));
+    }
+}

tests/robotests/src/com/android/settings/MasterClearTest.java

@@ -108,12 +108,14 @@ public class MasterClearTest {
     }
 
     @Test
-    public void testShowFinalConfirmation_eraseEsimChecked() {
+    public void testShowFinalConfirmation_eraseEsimVisible_eraseEsimChecked() {
         final Context context = mock(Context.class);
         when(mMasterClear.getContext()).thenReturn(context);
 
         mMasterClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
         mMasterClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
+        mMasterClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+        mMasterClear.mEsimStorageContainer.setVisibility(View.VISIBLE);
         mMasterClear.mEsimStorage.setChecked(true);
         mMasterClear.showFinalConfirmation();
 
@@ -126,12 +128,14 @@ public class MasterClearTest {
     }
 
     @Test
-    public void testShowFinalConfirmation_eraseEsimUnchecked() {
+    public void testShowFinalConfirmation_eraseEsimVisible_eraseEsimUnchecked() {
         final Context context = mock(Context.class);
         when(mMasterClear.getContext()).thenReturn(context);
 
         mMasterClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
         mMasterClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
+        mMasterClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+        mMasterClear.mEsimStorageContainer.setVisibility(View.VISIBLE);
         mMasterClear.mEsimStorage.setChecked(false);
         mMasterClear.showFinalConfirmation();
         final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
@@ -142,6 +146,45 @@ public class MasterClearTest {
                 .isFalse();
     }
 
+    @Test
+    public void testShowFinalConfirmation_eraseEsimGone_eraseEsimChecked() {
+        final Context context = mock(Context.class);
+        when(mMasterClear.getContext()).thenReturn(context);
+
+        mMasterClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
+        mMasterClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
+        mMasterClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+        mMasterClear.mEsimStorageContainer.setVisibility(View.GONE);
+        mMasterClear.mEsimStorage.setChecked(true);
+        mMasterClear.showFinalConfirmation();
+
+        final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
+
+        verify(context).startActivity(intent.capture());
+        assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
+            .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
+            .isFalse();
+    }
+
+    @Test
+    public void testShowFinalConfirmation_eraseEsimGone_eraseEsimUnchecked() {
+        final Context context = mock(Context.class);
+        when(mMasterClear.getContext()).thenReturn(context);
+
+        mMasterClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
+        mMasterClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
+        mMasterClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+        mMasterClear.mEsimStorageContainer.setVisibility(View.GONE);
+        mMasterClear.mEsimStorage.setChecked(false);
+        mMasterClear.showFinalConfirmation();
+        final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
+
+        verify(context).startActivity(intent.capture());
+        assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
+            .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
+            .isFalse();
+    }
+
     @Test
     public void testShowWipeEuicc_euiccDisabled() {
         prepareEuiccState(

tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java

@@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.spy;
 
 import android.app.Activity;
+import android.view.LayoutInflater;
+import android.widget.TextView;
 
 import com.android.settings.testutils.shadow.ShadowRecoverySystem;
 import com.android.settings.testutils.shadow.ShadowWifiP2pManager;
@@ -86,4 +88,30 @@ public class ResetNetworkConfirmTest {
 
         assertThat(ShadowWifiP2pManager.getFactoryResetCount()).isEqualTo(1);
     }
+
+    @Test
+    public void setSubtitle_eraseEsim() {
+        mResetNetworkConfirm.mEraseEsim = true;
+        mResetNetworkConfirm.mContentView =
+            LayoutInflater.from(mActivity).inflate(R.layout.reset_network_confirm, null);
+
+        mResetNetworkConfirm.setSubtitle();
+
+        assertThat(((TextView) mResetNetworkConfirm.mContentView
+            .findViewById(R.id.reset_network_confirm)).getText())
+            .isEqualTo(mActivity.getString(R.string.reset_network_final_desc_esim));
+    }
+
+    @Test
+    public void setSubtitle_notEraseEsim() {
+        mResetNetworkConfirm.mEraseEsim = false;
+        mResetNetworkConfirm.mContentView =
+            LayoutInflater.from(mActivity).inflate(R.layout.reset_network_confirm, null);
+
+        mResetNetworkConfirm.setSubtitle();
+
+        assertThat(((TextView) mResetNetworkConfirm.mContentView
+            .findViewById(R.id.reset_network_confirm)).getText())
+            .isEqualTo(mActivity.getString(R.string.reset_network_final_desc));
+    }
 }

tests/robotests/src/com/android/settings/ResetNetworkTest.java

@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2019 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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.robolectric.Shadows.shadowOf;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.view.View;
+import android.widget.CheckBox;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class ResetNetworkTest {
+    private Activity mActivity;
+    private ResetNetwork mResetNetwork;
+
+    @Before
+    public void setUp() {
+        mActivity = Robolectric.setupActivity(Activity.class);
+        mResetNetwork = spy(new ResetNetwork());
+        when(mResetNetwork.getContext()).thenReturn(mActivity);
+        mResetNetwork.mEsimContainer = new View(mActivity);
+        mResetNetwork.mEsimCheckbox = new CheckBox(mActivity);
+    }
+
+    @Test
+    public void showFinalConfirmation_checkboxVisible_eraseEsimChecked() {
+        mResetNetwork.mEsimContainer.setVisibility(View.VISIBLE);
+        mResetNetwork.mEsimCheckbox.setChecked(true);
+
+        mResetNetwork.showFinalConfirmation();
+
+        Intent intent = shadowOf(mActivity).getNextStartedActivity();
+        assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
+                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isTrue();
+    }
+
+    @Test
+    public void showFinalConfirmation_checkboxVisible_eraseEsimUnchecked() {
+        mResetNetwork.mEsimContainer.setVisibility(View.VISIBLE);
+        mResetNetwork.mEsimCheckbox.setChecked(false);
+
+        mResetNetwork.showFinalConfirmation();
+
+        Intent intent = shadowOf(mActivity).getNextStartedActivity();
+        assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
+                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isFalse();
+    }
+
+    @Test
+    public void showFinalConfirmation_checkboxGone_eraseEsimChecked() {
+        mResetNetwork.mEsimContainer.setVisibility(View.GONE);
+        mResetNetwork.mEsimCheckbox.setChecked(true);
+
+        mResetNetwork.showFinalConfirmation();
+
+        Intent intent = shadowOf(mActivity).getNextStartedActivity();
+        assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
+                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isFalse();
+    }
+
+    @Test
+    public void showFinalConfirmation_checkboxGone_eraseEsimUnchecked() {
+        mResetNetwork.mEsimContainer.setVisibility(View.GONE);
+        mResetNetwork.mEsimCheckbox.setChecked(false);
+
+        mResetNetwork.showFinalConfirmation();
+
+        Intent intent = shadowOf(mActivity).getNextStartedActivity();
+        assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
+                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isFalse();
+    }
+}