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

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

Merge "Update crash dialog options."

parents adb4fc73 5b679c4d

core/java/android/provider/Settings.java

+13 −0
Original line number Diff line number Diff line
@@ -11906,6 +11906,19 @@ public final class Settings { 
         * @hide

         */

        public static final String SHOW_FIRST_CRASH_DIALOG = "show_first_crash_dialog";



        /**

         * If nonzero, crash dialogs will show an option to restart the app.

         * @hide

         */

        public static final String SHOW_RESTART_IN_CRASH_DIALOG = "show_restart_in_crash_dialog";



        /**

         * If nonzero, crash dialogs will show an option to mute all future crash dialogs for

         * this app.

         * @hide

         */

        public static final String SHOW_MUTE_IN_CRASH_DIALOG = "show_mute_in_crash_dialog";

    }



    /**

core/proto/android/providers/settings.proto

+3 −1
Original line number Diff line number Diff line
@@ -392,8 +392,10 @@ message GlobalSettingsProto { 
    optional SettingProto enable_smart_replies_in_notifications = 348;

    optional SettingProto show_first_crash_dialog = 349;

    optional SettingProto wifi_connected_mac_randomization_enabled = 350;

    optional SettingProto show_restart_in_crash_dialog = 351;

    optional SettingProto show_mute_in_crash_dialog = 352;



    // Next tag = 351;

    // Next tag = 353;

}



message SecureSettingsProto {

core/res/res/drawable/ic_info_outline_24.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  Copyright (C) 2018 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License

  -->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>

</vector>

core/res/res/layout/app_error_dialog.xml

+35 −33
Original line number Diff line number Diff line
@@ -24,15 +24,21 @@ 
    android:paddingTop="@dimen/aerr_padding_list_top"

    android:paddingBottom="@dimen/aerr_padding_list_bottom">





    <Button

        android:id="@+id/aerr_restart"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:text="@string/aerr_restart"

        android:drawableStart="@drawable/ic_refresh"

            style="@style/aerr_list_item"

    />

        style="@style/aerr_list_item" />



    <Button

        android:id="@+id/aerr_app_info"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:text="@string/app_info"

        android:drawableStart="@drawable/ic_info_outline_24"

        style="@style/aerr_list_item" />



    <Button

        android:id="@+id/aerr_close"
@@ -40,8 +46,7 @@ 
        android:layout_height="wrap_content"

        android:text="@string/aerr_close_app"

        android:drawableStart="@drawable/ic_close"

            style="@style/aerr_list_item"

    />

        style="@style/aerr_list_item" />



    <Button

        android:id="@+id/aerr_report"
@@ -49,8 +54,7 @@ 
        android:layout_height="wrap_content"

        android:text="@string/aerr_report"

        android:drawableStart="@drawable/ic_feedback"

            style="@style/aerr_list_item"

    />

        style="@style/aerr_list_item" />



    <Button

        android:id="@+id/aerr_mute"
@@ -58,8 +62,6 @@ 
        android:layout_height="wrap_content"

        android:text="@string/aerr_mute"

        android:drawableStart="@drawable/ic_eject_24dp"

            style="@style/aerr_list_item"

    />



        style="@style/aerr_list_item" />



</LinearLayout>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2653,6 +2653,7 @@ 
  <java-symbol type="id" name="aerr_report" />

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

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

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

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



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