PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a am: 3947998755

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: Ia665650c897801e914d9c580e4f2f59e9fe2ec28
This commit is contained in:
Treehugger Robot
2020-06-29 15:01:17 +00:00
committed by Automerger Merge Worker
parent d49caa29b9 3947998755
commit d1051792b1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
View File

@@ -78,7 +78,7 @@ public class PowerButtonInstantLockPreferenceController extends AbstractPreferen
R.string.lockpattern_settings_power_button_instantly_locks_summary, R.string.lockpattern_settings_power_button_instantly_locks_summary,
trustAgentLabel)); trustAgentLabel));
} else { } else {
preference.setSummary(R.string.summary_placeholder); preference.setSummary(R.string.summary_empty);
} }
} }

2
tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
View File

@@ -119,7 +119,7 @@ public class PowerButtonInstantLockPreferenceControllerTest {
mController.updateState(mPreference); mController.updateState(mPreference);
assertThat(mPreference.isChecked()).isFalse(); assertThat(mPreference.isChecked()).isFalse();
assertThat(mPreference.getSummary()).isEqualTo(mContext.getString( assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(
R.string.summary_placeholder)); R.string.summary_empty));
} }
@Test @Test