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

Commit 9ae43474 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "App Crashes: Clarify mute option" into nyc-dev 

am: a41849c8

* commit 'a41849c8':
  App Crashes: Clarify mute option
parents 511a3b3d a41849c8

core/res/res/layout/app_error_dialog.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ 
            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/aerr_mute"

            android:text="@string/aerr_mute"

            android:drawableStart="@drawable/ic_close"

            android:drawableStart="@drawable/ic_eject_24dp"

            style="@style/aerr_list_item"

            style="@style/aerr_list_item"

    />

    />

core/res/res/values/strings.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -2608,8 +2608,8 @@ 
    <string name="aerr_report">Send feedback</string>

    <string name="aerr_report">Send feedback</string>

    <!-- Button that closes a crashed application -->

    <!-- Button that closes a crashed application -->

    <string name="aerr_close">Close</string>

    <string name="aerr_close">Close</string>

    <!-- Button that mutes further crashes of the crashed application-->

    <!-- Button that mutes further crashes of the crashed application. Note that this only appears on engineering builds. -->

    <string name="aerr_mute">Mute</string>

    <string name="aerr_mute">Mute until device restarts</string>

    <!-- Button that waits a bit more for an unresponsive app -->

    <!-- Button that waits a bit more for an unresponsive app -->

    <string name="aerr_wait">Wait</string>

    <string name="aerr_wait">Wait</string>

    <!-- Button that closes an unresponsive application -->

    <!-- Button that closes an unresponsive application -->