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

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

Merge "Use device default theme for ConfirmationDialog" into rvc-dev

parents 580ef47f 28ddc996

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ 
        </receiver>



        <activity android:name="com.android.permissioncontroller.incident.ConfirmationActivity"

                android:theme="@style/Theme.AppCompat.DayNight.Dialog.Alert"

                android:theme="@style/Theme.DeviceDefault.Dialog.Alert.DayNight"

                android:exported="false"

                android:excludeFromRecents="true"

                android:noHistory="true" />

res/values-night/themes.xml

+2 −0
Original line number Diff line number Diff line
@@ -41,4 +41,6 @@ 
    <style name="AutoRevokeDivider">

        <item name="android:background">@color/divider_color_secondary</item>

    </style>



    <style name="Theme.DeviceDefault.Dialog.Alert.DayNight" parent="@android:style/Theme.DeviceDefault.Dialog.Alert" />

</resources>
 
 No newline at end of file

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ 
    <string name="incident_report_notification_text"><xliff:g id="app_name" example="Gmail">%1$s</xliff:g> would like to upload debugging information.</string>



    <!-- Title for the incident / bug report confirmation dialog. [CHAR LIMIT=50] -->

    <string name="incident_report_dialog_title">Share Debugging Data</string>

    <string name="incident_report_dialog_title">Share debugging data?</string>



    <!-- Title text for introduction to incident / bug report confirmation dialog.

    Following this text is a bulleted list of reasons that a bug is being collected (e.g. "bad

res/values/themes.xml

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
        <item name="android:background">@color/divider_color_primary</item>

    </style>





    <style name="Theme.DeviceDefault.Dialog.Alert.DayNight" parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" />





<!-- Do not allow OEMs to overlay these themes.