| commit | ad243904dbc9dc59f41ab6941a68433798ced94b | [log] [tgz] |
|---|---|---|
| author | LuK1337 <priv.luk@gmail.com> | Fri May 01 12:07:02 2020 +0200 |
| committer | LuK1337 <priv.luk@gmail.com> | Mon Jun 29 12:27:06 2020 +0200 |
| tree | 1fc33476d12cdb5f159f1b5a1f34238794bc634e | |
| parent | 6819a64e4537fb6b6d73cff6b51a2c33a5673cdf [diff] |
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
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