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

Commit 39479987 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Settings: Fix fallback summary for power_button_instantly_locks... 

Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1 am: fce601ea

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

Change-Id: I5fc5d8b00e9b6e0c28389754cd4cf7eeb9bdc969
parents d22c1f15 fce601ea

src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class PowerButtonInstantLockPreferenceController extends AbstractPreferen 
                    R.string.lockpattern_settings_power_button_instantly_locks_summary,

                    trustAgentLabel));

        } else {

            preference.setSummary(R.string.summary_placeholder);

            preference.setSummary(R.string.summary_empty);

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public class PowerButtonInstantLockPreferenceControllerTest { 
        mController.updateState(mPreference);

        assertThat(mPreference.isChecked()).isFalse();

        assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(

                R.string.summary_placeholder));

                R.string.summary_empty));

    }



    @Test