| commit | 268371c44eb32ee401a39468756c20812c4195bc | [log] [tgz] |
|---|---|---|
| author | vichang <vichang@google.com> | Thu Jul 02 10:25:54 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jul 02 10:25:54 2020 +0000 |
| tree | 2c69338a11dbe6e7d4609d27c2e5f4c176db8686 | |
| parent | b1cea4f1bc199dd59068890c587da751a46e7b34 [diff] | |
| parent | b07e53c1c84e016c53e574b231d83baf371afbe0 [diff] |
Merge "Move libcore.timezone to the i18n module - Final part"
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