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

Commit db15d8e2 authored by Maria Garcia Puyol's avatar Maria Garcia Puyol Committed by Android (Google) Code Review
Browse files

Merge "Remove emergency info subtitle" into nyc-dev

parents 48732303 1f8665f5

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -5409,8 +5409,6 @@ 
    <string name="user_enable_calling_and_sms_confirm_message">Call and SMS history will be shared with this user.</string>

    <!-- Title for the emergency info preference [CHAR LIMIT=40] -->

    <string name="emergency_info_title">Emergency information</string>

    <!-- Description of the emergency info preference [CHAR LIMIT=none] -->

    <string name="emergency_info_subtitle">Accessible by anyone from the emergency dialer without unlocking your phone</string>















    <!-- Application Restrictions screen title [CHAR LIMIT=45] -->















    <string name="application_restrictions">Allow apps and content</string>

































res/xml/user_settings.xml



+1
−2




























Original line number
Diff line number
Diff line








@@ -38,6 +38,5 @@













    </PreferenceCategory>















    <Preference















        android:key="emergency_info"













        android:title="@string/emergency_info_title"













        android:summary="@string/emergency_info_subtitle"/>













        android:title="@string/emergency_info_title" />















</PreferenceScreen>