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

Commit 04babef0 authored by Joe Onorato's avatar Joe Onorato Committed by android-build-merger
Browse files

Merge "Show reason text from incident report in incident confirmation dialog." into qt-dev 

am: 0ebde2fb

Change-Id: Ia3393fa85933d7e044d2813ffe47e66be99c326a
parents 800f7848 0ebde2fb

res/layout/incident_image_confirmation.xml→res/layout/incident_confirmation.xml

+33 −2
Original line number Diff line number Diff line
@@ -27,11 +27,39 @@ 
        android:layout_height="wrap_content"

        android:orientation="vertical">



        <TextView

            android:id="@+id/reasonIntro"

            android:visibility="gone"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="18dp"

            android:paddingEnd="?android:attr/dialogPreferredPadding"

            android:paddingStart="?android:attr/dialogPreferredPadding"

            android:textSize="18sp"

            style="@android:style/TextAppearance.Material.Subhead"

            android:text="@string/incident_report_dialog_intro"

            />



        <TextView

            android:id="@+id/reasons"

            android:visibility="gone"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="18dp"

            android:paddingEnd="?android:attr/dialogPreferredPadding"

            android:paddingStart="@dimen/incident_reason_padding"

            android:textSize="18sp"

            style="@android:style/TextAppearance.Material.Subhead"

            android:text="@string/incident_report_dialog_intro"

            />



        <HorizontalScrollView

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

            android:id="@+id/imageScrollView"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:clipToPadding="false">

            android:paddingTop="18dp"

            android:clipToPadding="false"

            android:visibility="gone">



            <LinearLayout

                android:id="@+id/imageList"
@@ -48,8 +76,11 @@ 
            android:id="@+id/message"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="18dp"

            android:paddingEnd="?android:attr/dialogPreferredPadding"

            android:paddingStart="?android:attr/dialogPreferredPadding"

            android:textSize="18sp"

            style="@android:style/TextAppearance.Material.Subhead"

            />

    </LinearLayout>

</ScrollView>

res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -36,4 +36,5 @@ 
    <!-- START: Car Settings Preferences -->

    <attr name="carDividerColor" format="color"/>

    <!-- END: Car Settings Preferences -->



</resources>

res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,4 +19,5 @@ 
    <color name="bigIconColor">#C8CCCE</color>

    <color name="google_grey_800">#3C4043</color>

    <color name="system_notification_accent_color">#ff607D8B</color>

    <color name="incident_reason_bullet_color">#de000000</color>

</resources>

res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ 
    <!-- Incident report confirmation -->

    <dimen name="incident_image_width">150dp</dimen>

    <dimen name="incident_image_height">200dp</dimen>

    <dimen name="incident_reason_padding">32dp</dimen>

    <dimen name="incident_reason_bullet_size">3dp</dimen>

    <dimen name="incident_reason_bullet_indent">10dp</dimen>



    <!-- Auto related dimensions -->

    <dimen name="car_action_bar_height">@*android:dimen/car_app_bar_height</dimen>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -815,6 +815,12 @@ 
    <!-- Title for the incident / bug report confirmation dialog. [CHAR LIMIT=50] -->

    <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

    battery life detected"). Please try to keep this as short as possible (<40 chars if possible).

    The dialog is getting full, but going over is ok if necessary.  [CHAR LIMIT=60] -->

    <string name="incident_report_dialog_intro">The system has detected a problem.</string>



    <!-- Content for dialog shown when the user should confirm an incident / bug report.

    [CHAR LIMIT=none] -->

    <string name="incident_report_dialog_text">"<xliff:g id="app_name" example="Gmail">%1$s</xliff:g> is requesting to upload a bug report from this device taken on <xliff:g id="date" example="December 26, 2018">%2$s</xliff:g> at <xliff:g id="time" example="1:20 PM">%3$s</xliff:g>. Bug reports include personal information about your device or logged by apps, for example, user names, location data, device identifiers, and network information. Only share bug reports with people and apps you trust with this information.