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

Commit 4b825c07 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Actually relabel emergency affordance"

parents c06bbbfe 7a1091f2
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -1655,8 +1655,8 @@

    <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
    <string name="lockscreen_pattern_instructions">Draw pattern to unlock</string>
    <!-- Button at the bottom of the unlock screen to make an emergency call. -->
    <string name="lockscreen_emergency_call">Emergency call</string>
    <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
    <string name="lockscreen_emergency_call">Emergency</string>
    <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
    <string name="lockscreen_return_to_call">Return to call</string>
    <!-- Shown to confirm that the user entered their lock pattern correctly. -->
@@ -3438,8 +3438,6 @@
    <string name="display_manager_overlay_display_secure_suffix">, secure</string>

    <!-- Keyguard strings -->
    <!-- Label shown on emergency call button in keyguard -->
    <string name="kg_emergency_call_label">Emergency call</string>
    <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
    <string name="kg_forgot_pattern_button_text">Forgot Pattern</string>
    <!-- Message shown when user enters wrong pattern -->
+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@
        android:layout_height="wrap_content"
        android:layout_weight="1"
        android:layout_marginTop="@dimen/eca_overlap"
        android:text="@string/kg_emergency_call_label"
        android:text="@*android:string/lockscreen_emergency_call"
        style="?android:attr/buttonBarButtonStyle"
        android:textAppearance="?android:attr/textAppearanceMedium"
        android:textSize="@dimen/kg_status_line_font_size"
+0 −2
Original line number Diff line number Diff line
@@ -122,8 +122,6 @@
    <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
    <string name="keyboardview_keycode_enter">Enter</string>

    <!-- Label shown on emergency call button in keyguard -->
    <string name="kg_emergency_call_label">Emergency</string>
    <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
    <string name="kg_forgot_pattern_button_text">Forgot Pattern</string>
    <!-- Message shown when user enters wrong pattern -->