Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc
am: fce601ea2a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027 Change-Id: I5fc5d8b00e9b6e0c28389754cd4cf7eeb9bdc969
This commit is contained in:
@@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -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
|
||||||
|
Reference in New Issue
Block a user