diff --git a/res/values/strings.xml b/res/values/strings.xml index 3d7cfdbad3b..23d5e35946c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -13461,6 +13461,8 @@ Control from locked device Control external devices without unlocking your phone or tablet if allowed by the device controls app + + To use, first turn on \u0022Show device controls\u0022 Show double-line clock when available diff --git a/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceController.java b/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceController.java index a6c8e03d53c..57f717b9913 100644 --- a/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceController.java +++ b/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceController.java @@ -50,6 +50,9 @@ public class ControlsTrivialPrivacyPreferenceController extends TogglePreference @Override public CharSequence getSummary() { + if (getAvailabilityStatus() == DISABLED_DEPENDENT_SETTING) { + return mContext.getText(R.string.lockscreen_trivial_disabled_controls_summary); + } return mContext.getText(R.string.lockscreen_trivial_controls_summary); } diff --git a/tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java index 2c53d4e1457..3d4bc2e1933 100644 --- a/tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java @@ -109,7 +109,7 @@ public class ControlsTrivialPrivacyPreferenceControllerTest { Settings.Secure.putInt(mContentResolver, DEPENDENCY_SETTING_KEY, 0); assertThat(mController.getSummary().toString()).isEqualTo( - mContext.getText(R.string.lockscreen_trivial_controls_summary)); + mContext.getText(R.string.lockscreen_trivial_disabled_controls_summary)); } @Test