| commit | b1cea4f1bc199dd59068890c587da751a46e7b34 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jun 29 14:14:47 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jun 29 14:14:47 2020 +0000 |
| tree | 1d29df131cf9aeb37ca61196f7245eb47d17c9bb | |
| parent | 5733d3a31a3a6090e4108a6886ae5b0fd507eaaf [diff] | |
| parent | ad243904dbc9dc59f41ab6941a68433798ced94b [diff] |
Merge "Settings: Fix fallback summary for power_button_instantly_locks preference"
diff --git a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java index ffd0183..d3c10b0 100644 --- a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java +++ b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
@@ -78,7 +78,7 @@ R.string.lockpattern_settings_power_button_instantly_locks_summary, trustAgentLabel)); } else { - preference.setSummary(R.string.summary_placeholder); + preference.setSummary(R.string.summary_empty); } }
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java index 7c44561..8884ab8 100644 --- 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 @@ mController.updateState(mPreference); assertThat(mPreference.isChecked()).isFalse(); assertThat(mPreference.getSummary()).isEqualTo(mContext.getString( - R.string.summary_placeholder)); + R.string.summary_empty)); } @Test