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

Commit 912e4320 authored by Ivan Chiang's avatar Ivan Chiang
Browse files

[PM] Fine tine the UI of ADI 

- Remove <p> in some strings
- Update the touch area and the gap between the link and the more
  details
- Update the gap between expanded part and the link
- Do some refactor

Bug: 434769846
Bug: 360129657
FLAG: android.content.pm.verification_service
Test: manual
Change-Id: I54c0a1757c7bbc3e9c10a756408710cba8fbc2a3
parent 608bfda6

packages/PackageInstaller/res/drawable/ic_keyboard_arrow_down.xml

+3 −3
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ 
-->



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

        android:height="32dp"

        android:height="20dp"

        android:viewportHeight="48"

        android:viewportWidth="48"

        android:width="32dp">

        android:width="20dp">

    <path

        android:fillAlpha="1.0"

        android:fillType="nonZero"

        android:fillColor="?android:attr/colorAccent"

        android:fillColor="@color/onSurfaceVariantColor"

        android:pathData="M14.83,16.42L24,25.59l9.17,-9.17L36,19.25l-12,12 -12,-12z"/>

</vector>

packages/PackageInstaller/res/layout/install_fragment_layout.xml

+7 −6
Original line number Diff line number Diff line
@@ -57,17 +57,17 @@ 
            android:layout_marginTop="@dimen/dialog_inter_element_margin"

            android:visibility="gone" />



        <!-- TODO(b/360129657): set touch area as current height does not meet a11y requirement -->

        <LinearLayout

            android:id="@+id/more_details_clickable_layout"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:minHeight="@dimen/button_min_height"

            android:paddingTop="@dimen/alert_dialog_inner_padding"

            android:gravity="center_vertical"

            android:orientation="horizontal"

            android:visibility="gone">



            <TextView

                android:id="@+id/more_details_text"

                android:text="@string/more_details"

                android:layout_width="0dp"

                android:layout_height="wrap_content"
@@ -77,10 +77,9 @@ 
                style="?attr/textAppearanceInstallerCustomMessage"/>



            <ImageView

                android:id="@+id/keyboard_arrow_down"

                android:src="@drawable/ic_keyboard_arrow_down"

                android:layout_width="wrap_content"

                android:layout_height="@dimen/keyboard_arrow_down_height"

                android:layout_height="wrap_content"

                android:gravity="center_vertical"

                android:selectable="false" />

        </LinearLayout>
@@ -89,6 +88,7 @@ 
            android:id="@+id/more_details_expanded_layout"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/alert_dialog_inner_padding"

            android:orientation="vertical"

            android:visibility="gone">
@@ -104,9 +104,10 @@ 
                android:id="@+id/install_without_verifying_text"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="start"

                android:layout_marginTop="@dimen/dialog_inter_element_margin"

                android:minHeight="@dimen/button_min_height"

                android:gravity="start|center_vertical"

                android:text="@string/install_without_verifying"

                android:paddingTop="@dimen/install_without_verifying_text_padding"

                android:textColor="@color/primaryColor"

                style="?attr/textAppearanceInstallerCustomMessage"/>

packages/PackageInstaller/res/layout/install_fragment_material_layout.xml

+7 −6
Original line number Diff line number Diff line
@@ -53,17 +53,17 @@ 
            android:layout_marginTop="@dimen/dialog_inter_element_margin"

            android:visibility="gone" />



        <!-- TODO(b/360129657): set touch area as current height does not meet a11y requirement -->

        <LinearLayout

            android:id="@+id/more_details_clickable_layout"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:minHeight="@dimen/button_min_height"

            android:paddingTop="@dimen/alert_dialog_inner_padding"

            android:gravity="center_vertical"

            android:orientation="horizontal"

            android:visibility="gone">



            <TextView

                android:id="@+id/more_details_text"

                android:text="@string/more_details"

                android:layout_width="0dp"

                android:layout_height="wrap_content"
@@ -73,10 +73,9 @@ 
                style="?attr/textAppearanceInstallerCustomMessage"/>



            <ImageView

                android:id="@+id/keyboard_arrow_down"

                android:src="@drawable/ic_keyboard_arrow_down"

                android:layout_width="wrap_content"

                android:layout_height="@dimen/keyboard_arrow_down_height"

                android:layout_height="wrap_content"

                android:gravity="center_vertical"

                android:selectable="false" />

        </LinearLayout>
@@ -85,6 +84,7 @@ 
            android:id="@+id/more_details_expanded_layout"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/alert_dialog_inner_padding"

            android:orientation="vertical"

            android:visibility="gone">
@@ -100,9 +100,10 @@ 
                android:id="@+id/install_without_verifying_text"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="start"

                android:layout_marginTop="@dimen/dialog_inter_element_margin"

                android:minHeight="@dimen/button_min_height"

                android:gravity="start|center_vertical"

                android:text="@string/install_without_verifying"

                android:paddingTop="@dimen/install_without_verifying_text_padding"

                android:textColor="@color/primaryColor"

                style="?attr/textAppearanceInstallerCustomMessage"/>

packages/PackageInstaller/res/values/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -63,6 +63,5 @@ 


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

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

    <dimen name="keyboard_arrow_down_height">20dp</dimen>



</resources>

packages/PackageInstaller/res/values/strings_v2.xml

+8 −8
Original line number Diff line number Diff line
@@ -153,11 +153,11 @@ 
    <!-- Message presented in a dialog box when the verifier blocked an app from being installed. [CHAR LIMIT=none]-->

    <string name="cannot_install_app_blocked_summary">&lt;p>This app was blocked. To help keep your

        device and data safe, only apps from verified developers can be installed.&lt;/p>

        &lt;p>&lt;a href="">Learn more about developer verification&lt;/a>&lt;/p></string>

        &lt;a href="">Learn more about developer verification&lt;/a></string>

    <!-- Message presented in a dialog box when the verifier blocked an app from being updated. [CHAR LIMIT=none]-->

    <string name="cannot_update_app_blocked_summary">&lt;p>This app was not updated. To help keep your

        device and data safe, only updates from verified developers can be installed.&lt;/p>

        &lt;p>&lt;a href="">Learn more about developer verification&lt;/a>&lt;/p>

        &lt;a href="">Learn more about developer verification&lt;/a>

    </string>

    <!-- Message presented in a dialog box when verification failed due to problems with the network during installation. [CHAR LIMIT=none]-->

    <string name="cannot_install_verification_no_internet_summary">&lt;p>This app was not installed.
@@ -165,35 +165,35 @@ 
        &lt;p>An internet connection is required to verify the app developer.

            Make sure your device is connected to the internet, then try installing the app again.

        &lt;/p>

        &lt;p>&lt;a href="">Learn more about developer verification&lt;/a>&lt;p></string>

        &lt;a href="">Learn more about developer verification&lt;/a></string>

    <!-- Message presented in a dialog box when verification failed due to problems with the network during update. [CHAR LIMIT=none]-->

    <string name="cannot_update_verification_no_internet_summary">&lt;p>This app was not updated.

        Updates from unverified developers may be unsafe.&lt;/p>

        &lt;p>An internet connection is required to verify the app developer.

            Make sure your device is connected to the internet, then try updating the app again.

        &lt;/p>

        &lt;p>&lt;a href="">Learn more about developer verification&lt;/a>&lt;p></string>

        &lt;a href="">Learn more about developer verification&lt;/a></string>



    <!-- Message presented in a dialog box when verification failed due to internal failures during installation. [CHAR LIMIT=none]-->

    <string name="cannot_install_verification_unavailable_summary">&lt;p>There was a problem verifying

        this app\'s developer. Apps from unverified developers may be unsafe,

        so the app was not installed.&lt;/p>

        &lt;p>&lt;a href="">Learn more about developer verification&lt;/a>&lt;/p></string>

        &lt;a href="">Learn more about developer verification&lt;/a></string>

    <!-- Message presented in a dialog box when verification failed due to problems with the network during update. [CHAR LIMIT=none]-->

    <string name="cannot_update_verification_unavailable_summary">&lt;p>There was a problem verifying

        this app\'s developer. Updates from unverified developers may be unsafe,

        so the app was not updated.&lt;/p>

        &lt;p>&lt;a href="">Learn more about developer verification&lt;/a>&lt;/p></string>

        &lt;a href="">Learn more about developer verification&lt;/a></string>

    <!-- Message presented in a dialog box when verification failed due to internal failures during installation for fail closed policy. [CHAR LIMIT=none]-->

    <string name="cannot_install_verification_unavailable_fail_closed_summary">&lt;p>This app was blocked

        because there was a problem verifying the developer. To help keep your device and data safe,

        only apps from verified developers can be installed.&lt;/p>

        &lt;p>&lt;a href="">Learn more about developer verification&lt;/a>&lt;/p></string>

        &lt;a href="">Learn more about developer verification&lt;/a></string>

    <!-- Message presented in a dialog box when verification failed due to internal failures during update for fail closed policy. [CHAR LIMIT=none]-->

    <string name="cannot_update_verification_unavailable_fail_closed_summary">&lt;p>This app was not updated

        because there was a problem verifying the developer. To help keep your device and data safe,

        only updates from verified developers can be installed.&lt;/p>

        &lt;p>&lt;a href="">Learn more about developer verification&lt;/a>&lt;/p></string>

        &lt;a href="">Learn more about developer verification&lt;/a></string>



    <string name="more_details_expanded_install_summary">If you install without verifying, keep in

        mind apps from unverified developers may put your device and data at risk.</string>