From 0937c24f8f907ee4c65901823ec7d2dfcf4e53b8 Mon Sep 17 00:00:00 2001
From: Chaohui Wang <chaohuiw@google.com>
Date: Thu, 1 Jun 2023 15:25:57 +0800
Subject: [PATCH] Unify the strings for Erase eSIM / eUICC

erase_sim_confirm_button & erase_euicc_data_button are the same string
and with same meanings, but since the description of
erase_euicc_data_button is wrong and causes translate issue, clean up
erase_euicc_data_button then.

Fix: 279600315
Test: Visual check on Erase eSIMs dialog
Change-Id: I5dec3dd5c1e851f84dd401dddd5416a27cb1a428
---
 res/values/strings.xml                                         | 2 --
 .../android/settings/network/EraseEuiccDataDialogFragment.java | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a90a3f7bd03..86be7311748 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3020,8 +3020,6 @@
     <string name="reset_bluetooth_wifi_complete_toast">Bluetooth &amp; Wi\u2011Fi have been reset</string>
 
     <!-- Erase Euicc -->
-    <!-- Confirmation button of dialog to confirm resetting user's app preferences [CHAR LIMIT=NONE] -->
-    <string name="erase_euicc_data_button">Erase</string>
     <!-- Erase Euicc dialog and SD card & phone storage settings screen, title for the menu option and checkbox to let user decide whether erase eSIM data together [CHAR LIMIT=50] -->
     <string name="reset_esim_title">Erase eSIMs</string>
     <!-- Erase Euicc dialog and SD card & phone storage settings screen, message for the checkbox to let user decide whether erase eSIM data together [CHAR LIMIT=NONE] -->
diff --git a/src/com/android/settings/network/EraseEuiccDataDialogFragment.java b/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
index 32903bde7ba..0200e524b07 100644
--- a/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
+++ b/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
@@ -23,7 +23,6 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.RecoverySystem;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -62,7 +61,7 @@ public class EraseEuiccDataDialogFragment extends InstrumentedDialogFragment imp
         return new AlertDialog.Builder(getActivity())
                 .setTitle(R.string.reset_esim_title)
                 .setMessage(R.string.reset_esim_desc)
-                .setPositiveButton(R.string.erase_euicc_data_button, this)
+                .setPositiveButton(R.string.erase_sim_confirm_button, this)
                 .setNegativeButton(R.string.cancel, null)
                 .setOnDismissListener(this)
                 .create();