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
This commit is contained in:
Andrew Sapperstein
2019-03-07 14:18:15 -08:00
parent b4ae464e99
commit 88930e373e
10 changed files with 287 additions and 17 deletions

View File

@@ -40,6 +40,8 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import androidx.annotation.VisibleForTesting;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -62,9 +64,9 @@ import com.google.android.setupdesign.GlifLayout;
public class MasterClearConfirm extends InstrumentedFragment {
private final static String TAG = "MasterClearConfirm";
private View mContentView;
@VisibleForTesting View mContentView;
private boolean mEraseSdCard;
private boolean mEraseEsims;
@VisibleForTesting boolean mEraseEsims;
/**
* The user has gone through the multiple confirmation, so now we go ahead
@@ -199,6 +201,7 @@ public class MasterClearConfirm extends InstrumentedFragment {
setUpActionBarAndTitle();
establishFinalConfirmationState();
setAccessibilityTitle();
setSubtitle();
return mContentView;
}
@@ -212,6 +215,14 @@ public class MasterClearConfirm extends InstrumentedFragment {
}
}
@VisibleForTesting
void setSubtitle() {
if (mEraseEsims) {
((TextView) mContentView.findViewById(R.id.master_clear_confirm))
.setText(R.string.master_clear_final_desc_esim);
}
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);