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

Commit 0b16fbfc authored by Song Chun Fan's avatar Song Chun Fan
Browse files

[ADI][50/N] move developer verification into installation fragment 

+ Also move the strings to strings_v2.xml
+ Also removes the last installation failure dialog as per UX
  requirement

BUG: 360129657
FLAG: android.content.pm.verification_service
Test: manual

Change-Id: Ib82b8bd2d745a2a2ef4f75b7ae8032e97d6297d3
parent 18d73a38

packages/PackageInstaller/res/drawable/ic_keyboard_arrow_down.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
        android:height="32dp"

        android:viewportHeight="48"

        android:viewportWidth="48"

        android:width="20dp">

        android:width="32dp">

    <path

        android:fillAlpha="1.0"

        android:fillType="nonZero"

packages/PackageInstaller/res/layout/install_fragment_layout.xml

+54 −0
Original line number Diff line number Diff line
@@ -57,6 +57,60 @@ 
            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: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"

                android:layout_weight="1"

                android:selectable="false"

                android:gravity="center_vertical"

                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:gravity="center_vertical"

                android:selectable="false" />

        </LinearLayout>



        <LinearLayout

            android:id="@+id/more_details_expanded_layout"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:visibility="gone">



            <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="start"

                android:text="@string/install_without_verifying_summary"

                style="?attr/textAppearanceInstallerCustomMessage"/>



            <TextView

                android:id="@+id/install_without_verifying_text"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="start"

                android:text="@string/install_without_verifying"

                android:paddingTop="@dimen/install_without_verifying_text_padding"

                android:textColor="@color/primaryColor"

                style="?attr/textAppearanceInstallerCustomMessage"/>



        </LinearLayout>



    </LinearLayout>



</ScrollView>

packages/PackageInstaller/res/layout/install_fragment_material_layout.xml

+53 −0
Original line number Diff line number Diff line
@@ -53,6 +53,59 @@ 
            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: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"

                android:layout_weight="1"

                android:selectable="false"

                android:gravity="center_vertical"

                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:gravity="center_vertical"

                android:selectable="false" />

        </LinearLayout>



        <LinearLayout

            android:id="@+id/more_details_expanded_layout"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:visibility="gone">



            <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="start"

                android:text="@string/install_without_verifying_summary"

                style="?attr/textAppearanceInstallerCustomMessage"/>



            <TextView

                android:id="@+id/install_without_verifying_text"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="start"

                android:text="@string/install_without_verifying"

                android:paddingTop="@dimen/install_without_verifying_text_padding"

                android:textColor="@color/primaryColor"

                style="?attr/textAppearanceInstallerCustomMessage"/>



        </LinearLayout>

    </LinearLayout>



</ScrollView>

packages/PackageInstaller/res/layout/verification_confirmation_fragment_layout.xml

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

  Copyright (C) 2025 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/verification_confirmation_fragment_layout"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:orientation="vertical"

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

    android:paddingBottom="@dimen/alert_dialog_inner_padding">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical">



        <include layout="@layout/app_snippet_layout" />



        <TextView

            style="?attr/textAppearanceInstallerCustomMessage"

            android:id="@+id/custom_message"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:layout_marginTop="@dimen/dialog_inter_element_margin"/>



        <!-- 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:gravity="center_vertical"

            android:orientation="horizontal"

            android:visibility="gone">



            <TextView

                android:id="@+id/more_details_button"

                android:text="@string/more_details"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:selectable="false"

                android:gravity="center_vertical"

                style="?attr/textAppearanceInstallerCustomMessage"/>



            <ImageView

                android:src="@drawable/ic_keyboard_arrow_down"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:gravity="center_vertical"

                android:selectable="false" />

        </LinearLayout>



        <LinearLayout

            android:id="@+id/more_details_expanded_layout"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:visibility="gone">



            <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="start"

                android:text="@string/install_without_verifying_summary"

                style="?attr/textAppearanceInstallerCustomMessage"/>



            <TextView

                android:id="@+id/install_without_verifying_text"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="start"

                android:text="@string/install_without_verifying"

                android:paddingTop="@dimen/install_without_verifying_text_padding"

                android:textColor="@color/primaryColor"

                style="?attr/textAppearanceInstallerCustomMessage"/>



        </LinearLayout>



    </LinearLayout>



</ScrollView>

packages/PackageInstaller/res/values/dimens.xml

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


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

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

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

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



</resources>