Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 126e629c authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge "Home Controls: Add conditional copy for setting." into tm-dev

parents a5f29f2e c138118d

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -13461,6 +13461,8 @@ 
    <string name="lockscreen_trivial_controls_setting_toggle">Control from locked device</string>

    <!-- Trivial Device controls summary [CHAR LIMIT=NONE] -->

    <string name="lockscreen_trivial_controls_summary">Control external devices without unlocking your phone or tablet if allowed by the device controls app</string>

    <!-- Trivial Device disabled controls summary [CHAR LIMIT=NONE] -->

    <string name="lockscreen_trivial_disabled_controls_summary">To use, first turn on \u0022Show device controls\u0022</string>

    <!-- Lockscreen double-line clock summary [CHAR LIMIT=NONE] -->

    <string name="lockscreen_double_line_clock_summary">Show double-line clock when available</string>

    <!-- Lockscreen double-line clock toggle [CHAR LIMIT=60] -->

src/com/android/settings/display/ControlsTrivialPrivacyPreferenceController.java

+3 −0
Original line number Diff line number Diff line
@@ -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);

    }

tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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