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

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

Merge "Crash dialog improvements, move crash code to AppErrors"

parents 5407f1e6 20d7df3c

core/res/res/layout/app_error_dialog_dont_show_again.xml→core/res/res/layout/app_error_dialog.xml

+70 −0
Original line number Diff line number Diff line
@@ -18,23 +18,53 @@ 
*/

-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="14dp"

        android:paddingEnd="10dp"

        android:gravity="center_vertical"

        android:orientation="vertical"

        android:paddingTop="@dimen/dialog_list_padding_vertical_material"

        android:paddingBottom="@dimen/dialog_list_padding_vertical_material"

>

    <CheckBox

            android:id="@+id/checkbox"

            android:layout_width="wrap_content"





    <TextView

            android:id="@+id/aerr_restart"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/aerr_restart"

            style="@style/aerr_list_item"

    />



    <TextView

            android:id="@+id/text"

            android:layout_width="wrap_content"

            android:id="@+id/aerr_reset"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="8dp"

            android:layout_marginBottom="8dp"

            android:text="@string/aerr_reset"

            style="@style/aerr_list_item"

    />



    <TextView

            android:id="@+id/aerr_report"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/aerr_report"

            style="@style/aerr_list_item"

    />



    <TextView

            android:id="@+id/aerr_close"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/aerr_close"

            style="@style/aerr_list_item"

    />



    <TextView

            android:id="@+id/aerr_mute"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/aerr_mute"

            style="@style/aerr_list_item"

    />





</LinearLayout>

core/res/res/values/strings.xml

+20 −9
Original line number Diff line number Diff line
@@ -2588,16 +2588,27 @@ 
    <!-- Text to display when there are no activities found to display in the

         activity chooser. See the "Select an action" title. -->

    <string name="noApplications">No apps can perform this action.</string>

    <!-- Title of the alert when an application has crashed. -->

    <string name="aerr_title"></string>

    <!-- Text of the alert that is displayed when an application has crashed. -->

    <string name="aerr_application">Unfortunately, <xliff:g id="application">%1$s</xliff:g> has stopped.</string>

    <!-- Text of the alert that is displayed when an application has crashed. -->

    <string name="aerr_process">Unfortunately, the process <xliff:g id="process">%1$s</xliff:g> has

        stopped.</string>

    <!-- Text of the alert that is displayed when an application has crashed. -->

    <string name="aerr_process_silence">Silence crashes from <xliff:g id="process">%1$s</xliff:g>

        until reboot.</string>

    <string name="aerr_application"><xliff:g id="application">%1$s</xliff:g> has stopped</string>

    <!-- Text of the alert that is displayed when a process has crashed. -->

    <string name="aerr_process"><xliff:g id="process">%1$s</xliff:g> has

        stopped</string>

    <!-- Text of the alert that is displayed when an application has crashed repeatedly. -->

    <string name="aerr_application_repeated"><xliff:g id="application">%1$s</xliff:g> is repeatedly stopping</string>

    <!-- Text of the alert that is displayed when a process has crashed repeatedly. -->

    <string name="aerr_process_repeated"><xliff:g id="process">%1$s</xliff:g> is

        repeatedly stopping</string>

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

    <string name="aerr_restart">Restart app</string>

    <!-- Button that clears cache and restarts a crashed application -->

    <string name="aerr_reset">Reset and restart app</string>

    <!-- Button that sends feedback about a crashed application -->

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

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

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

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

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



    <!-- Title of the alert when an application is not responding. -->

    <string name="anr_title"></string>

    <!-- Text of the alert that is displayed when an application is not responding. -->

core/res/res/values/styles.xml

+10 −0
Original line number Diff line number Diff line
@@ -1397,6 +1397,16 @@ please see styles_device_defaults.xml. 
        <item name="pointerIconGrabbing">@drawable/pointer_grabbing_large_icon</item>

    </style>



    <!-- @hide -->

    <style name="aerr_list_item" parent="Widget.Material.Light.TextView">

        <item name="minHeight">?attr/listPreferredItemHeightSmall</item>

        <item name="textAppearance">?attr/textAppearanceListItemSmall</item>

        <item name="textColor">?attr/textColorAlertDialogListItem</item>

        <item name="gravity">center_vertical</item>

        <item name="paddingStart">?attr/listPreferredItemPaddingStart</item>

        <item name="paddingEnd">?attr/listPreferredItemPaddingEnd</item>

    </style>



    <!-- Wifi dialog styles -->

    <!-- @hide -->

    <style name="wifi_item">

core/res/res/values/symbols.xml

+9 −3
Original line number Diff line number Diff line
@@ -1763,7 +1763,7 @@ 
  <java-symbol type="layout" name="launch_warning" />

  <java-symbol type="layout" name="safe_mode" />

  <java-symbol type="layout" name="simple_list_item_2_single_choice" />

  <java-symbol type="layout" name="app_error_dialog_dont_show_again" />

  <java-symbol type="layout" name="app_error_dialog" />

  <java-symbol type="plurals" name="wifi_available" />

  <java-symbol type="plurals" name="wifi_available_detailed" />

  <java-symbol type="string" name="accessibility_binding_label" />
@@ -1777,8 +1777,8 @@ 
  <java-symbol type="string" name="remote_bugreport_progress_notification_message_can_cancel" />

  <java-symbol type="string" name="aerr_application" />

  <java-symbol type="string" name="aerr_process" />

  <java-symbol type="string" name="aerr_process_silence" />

  <java-symbol type="string" name="aerr_title" />

  <java-symbol type="string" name="aerr_application_repeated" />

  <java-symbol type="string" name="aerr_process_repeated" />

  <java-symbol type="string" name="android_upgrading_fstrim" />

  <java-symbol type="string" name="android_upgrading_apk" />

  <java-symbol type="string" name="android_upgrading_complete" />
@@ -2429,6 +2429,12 @@ 
  <java-symbol type="id" name="work_widget_app_icon" />

  <java-symbol type="drawable" name="work_widget_mask_view_background" />



  <java-symbol type="id" name="aerr_report" />

  <java-symbol type="id" name="aerr_reset" />

  <java-symbol type="id" name="aerr_restart" />

  <java-symbol type="id" name="aerr_close" />

  <java-symbol type="id" name="aerr_mute" />



  <!-- Framework-private Material.DayNight styles. -->

  <java-symbol type="style" name="Theme.Material.DayNight" />

  <java-symbol type="style" name="Theme.Material.DayNight.DarkActionBar" />

services/core/java/com/android/server/am/ActiveServices.java

+1 −1
Original line number Diff line number Diff line
@@ -2775,7 +2775,7 @@ public final class ActiveServices { 
        }



        if (anrMessage != null) {

            mAm.appNotResponding(proc, null, null, false, anrMessage);

            mAm.mAppErrors.appNotResponding(proc, null, null, false, anrMessage);

        }

    }