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

Add checkbox to let user wipe eSIM data together with FDR

Browse Source 
This CL add a check box for eSIM enabled devices to reset eSIM data
during factory reset of the phone.

Bug: 67500470
Test: make RunSettingsRoboTests
Change-Id: I5a81d43f23ae55f8549a5b807fdf41f36c9d3acd
This commit is contained in:
Qingxi Li
2018-01-11 11:35:07 -08:00
parent aaf307e71d
commit c8a2b040a1
8 changed files with 78 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/master_clear.xml
View File

@@ -115,6 +115,10 @@
android:text="@string/erase_external_storage_description" />
</LinearLayout>
</LinearLayout>
<include layout="@layout/reset_esim_checkbox"
android:id="@+id/erase_esim_container"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</ScrollView>
<Button

12
res/layout/reset_esim_checkbox.xml
View File

@@ -13,7 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
@@ -21,7 +22,8 @@
android:clickable="true"
android:visibility="gone">
<CheckBox android:id="@+id/erase_esim"
<CheckBox
android:id="@+id/erase_esim"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@@ -30,12 +32,14 @@
android:clickable="false"
android:duplicateParentState="true" />
<LinearLayout android:layout_width="match_parent"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:orientation="vertical">
<TextView android:id="@+id/erase_esim_title"
<TextView
android:id="@+id/erase_esim_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="@dimen/reset_checkbox_title_padding_top"

2
res/values/strings.xml
View File

@@ -3248,7 +3248,7 @@
<!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
<string name="master_clear_desc_also_erases_external">"<li>Music</li>\n<li>Photos</li>\n<li>Other user data</li>"</string>
<!-- SD card & phone storage settings screen, list of items on an eSIM (embedded SIM) that will be erased during this operation [CHAR LIMIT=NONE] -->
<string name="master_clear_desc_also_erases_esim">"<li>Carriers on eSIM</li>"</string>
<string name="master_clear_desc_also_erases_esim">"<li>eSIMs</li>"</string>
<!-- SD card & phone storage settings screen, notification if there are eSIM (embedded SIM) profiles present that the user's mobile service plan will not be canceled [CHAR LIMIT=NONE] -->
<string name="master_clear_desc_no_cancel_mobile_plan">"\n\nThis will not cancel your mobile service plan.</string>
<!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->