Merge "Import translations. DO NOT MERGE"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e42715f..f9522ea 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2058,7 +2058,7 @@
<activity
android:name="Settings$PowerUsageSummaryActivity"
android:label="@string/power_usage_summary_title"
- android:icon="@drawable/ic_homepage_battery"
+ android:icon="@drawable/ic_settings_battery"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index af0bf5a..d95320f 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -381,7 +381,11 @@
}
private void updateEid() {
- mDialog.setText(EID_INFO_VALUE_ID, mEuiccManager.getEid());
+ if (mEuiccManager.isEnabled()) {
+ mDialog.setText(EID_INFO_VALUE_ID, mEuiccManager.getEid());
+ } else {
+ mDialog.removeSettingFromScreen(EID_INFO_VALUE_ID);
+ }
}
private void updateImsRegistrationState() {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
index 07e4270..5a4a809 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -124,6 +124,7 @@
doReturn("").when(mController).getPhoneNumber();
doReturn(mSignalStrength).when(mController).getSignalStrength();
+ when(mEuiccManager.isEnabled()).thenReturn(true);
when(mEuiccManager.getEid()).thenReturn("");
ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
ReflectionHelpers.setField(mController, "mCarrierConfigManager", mCarrierConfigManager);
@@ -352,6 +353,17 @@
mController.initialize();
verify(mDialog).setText(EID_INFO_VALUE_ID, eid);
+ verify(mDialog, never()).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
+ }
+
+ @Test
+ public void initialize_showEid_euiccManagerIsNotEnabled() {
+ when(mEuiccManager.isEnabled()).thenReturn(false);
+
+ mController.initialize();
+
+ verify(mDialog, never()).setText(eq(EID_INFO_VALUE_ID), any());
+ verify(mDialog).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
}
@Test