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

Commit a258e424 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add summary text to Lock screen preferences." into oc-dev

parents a9acbd92 cee83e4b

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -750,8 +750,6 @@ 
    <string name="encryption_and_credential_settings_summary">Phone encrypted</string>

    <!-- Security Settings screen setting option title for the item to take you to the lock screen preference screen [CHAR LIMIT=60] -->

    <string name="lockscreen_settings_title">Lock screen preferences</string>

    <!-- Security Settings screen setting option summary for the item to take you to the lock screen preference screen -->

    <string name="lockscreen_settings_summary">Show all notification content</string>









    <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->









    <string name="security_settings_summary">Set My Location, screen unlock, SIM card lock, credential storage lock</string>
































res/xml/security_settings_chooser.xml



+0
−1






























Original line number
Diff line number
Diff line







@@ -31,7 +31,6 @@

















        <Preference android:key="lockscreen_preferences"









            android:title="@string/lockscreen_settings_title"









            android:summary="@string/lockscreen_settings_summary"









            android:fragment="com.android.settings.security.LockscreenDashboardFragment"/>



















    </PreferenceCategory>
































res/xml/security_settings_password.xml



+0
−1






























Original line number
Diff line number
Diff line







@@ -30,7 +30,6 @@

















        <Preference android:key="lockscreen_preferences"









            android:title="@string/lockscreen_settings_title"









            android:summary="@string/lockscreen_settings_summary"









            android:fragment="com.android.settings.security.LockscreenDashboardFragment"/>



















    </PreferenceCategory>
































res/xml/security_settings_pattern.xml



+0
−1






























Original line number
Diff line number
Diff line







@@ -30,7 +30,6 @@

















        <Preference android:key="lockscreen_preferences"









            android:title="@string/lockscreen_settings_title"









            android:summary="@string/lockscreen_settings_summary"









            android:fragment="com.android.settings.security.LockscreenDashboardFragment"/>



















    </PreferenceCategory>
































res/xml/security_settings_pin.xml



+0
−1






























Original line number
Diff line number
Diff line







@@ -30,7 +30,6 @@

















        <Preference android:key="lockscreen_preferences"









            android:title="@string/lockscreen_settings_title"









            android:summary="@string/lockscreen_settings_summary"









            android:fragment="com.android.settings.security.LockscreenDashboardFragment"/>



















    </PreferenceCategory>