From ad243904dbc9dc59f41ab6941a68433798ced94b Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Fri, 1 May 2020 12:07:02 +0200 Subject: [PATCH] Settings: Fix fallback summary for power_button_instantly_locks preference * Using summary_placeholder instead of summary_empty leaves an ugly empty space. Change-Id: I73a90f1b3203d6cb17e1875dc8163eb67140de89 --- .../screenlock/PowerButtonInstantLockPreferenceController.java | 2 +- .../PowerButtonInstantLockPreferenceControllerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java index ffd01830dae..d3c10b01c87 100644 --- a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java +++ b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java @@ -78,7 +78,7 @@ public class PowerButtonInstantLockPreferenceController extends AbstractPreferen 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 7c44561a1f6..8884ab80460 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 @@ 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