Merge "Settings: Fix fallback summary for power_button_instantly_locks preference"

2020-06-29 14:14:47 +00:00
parent 5733d3a31a ad243904db
commit b1cea4f1bc
2 changed files with 2 additions and 2 deletions
--- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
@@ -119,7 +119,7 @@ public class PowerButtonInstantLockPreferenceControllerTest {
        mController.updateState(mPreference);
        assertThat(mPreference.isChecked()).isFalse();
        assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(
-                R.string.summary_placeholder));
+                R.string.summary_empty));
    }

    @Test