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

Commit dc9947a6 authored by Yao Chen's avatar Yao Chen Committed by Android (Google) Code Review
Browse files

Merge "Let PermissionController display images during incident report confirmation."

parents bc678fde bf67844d

OWNERS

+3 −0
Original line number Diff line number Diff line
@@ -8,3 +8,6 @@ eugenesusla@google.com 
# For automotive related changes

stenning@google.com

davidln@google.com



# For incident report related changes

joeo@google.com

PermissionController.mk

+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ LOCAL_USE_AAPT2 := true 
LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := \

    $(call all-java-files-under, src)

    $(call all-java-files-under, src) \

    $(call all-proto-files-under, src)



LOCAL_STATIC_ANDROID_LIBRARIES += \

    iconloader \
@@ -43,6 +44,7 @@ LOCAL_SDK_VERSION := system_current 
LOCAL_MIN_SDK_VERSION := 28

LOCAL_PRIVILEGED_MODULE := true

LOCAL_CERTIFICATE := platform

LOCAL_PROTOC_OPTIMIZE_TYPE := lite



LOCAL_PROGUARD_FLAG_FILES := proguard.flags

res/layout/incident_image_confirmation.xml

0 → 100644
+56 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2019 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.

-->



<ScrollView

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

    android:id="@+id/scrollView"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:clipToPadding="false">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical">



        <HorizontalScrollView

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

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:clipToPadding="false">



            <LinearLayout

                android:id="@+id/imageList"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

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

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

                >

            </LinearLayout>

        </HorizontalScrollView>



        <TextView

            android:id="@+id/message"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

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

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

            />

    </LinearLayout>

</ScrollView>

res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -52,4 +52,8 @@ 
    <dimen name="accessibility_service_dialog_app_icon_size">32dp</dimen>

    <dimen name="accessibility_service_dialog_text_padding">16dp</dimen>



    <!-- Incident report confirmation -->

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

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



</resources>

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -787,6 +787,10 @@ 


Allow <xliff:g id="app_name" example="Gmail">%4$s</xliff:g> to upload a bug report?"</string>



    <!-- Content for dialog shown when there was an error parsing the incident / bug report.

    [CHAR LIMIT=none] -->

    <string name="incident_report_error_dialog_text">"There was an error processing the bug report for <xliff:g id="app_name" example="Gmail">%1$s</xliff:g>. So sharing the detailed debugging data data has been denied. Sorry for the interruption."</string>



    <!-- Label for the button to allow sharing of the report. [CHAR LIMIT=20]-->

    <string name="incident_report_dialog_allow_label">Allow</string>