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

Commit 4c118a8d authored by Ivan Chiang's avatar Ivan Chiang
Browse files

[PM] Rename fragments and fix some issues in PIA 

- Rename SimpleErrorFragment to InstallRestrictionFragment
- Rename VerificationConfirmationFragment to
  DeveloperVerificationConfirmationFragment
- Add new ABORT_READON_UNKNOWN to show the dialog
- Change the order of setting the attirbutes of the ProgressBar
- Fix touch area size for buttons
- FIx touch area size for keep data checkbox

Flag: android.content.pm.use_pia_v2
Test: manual
Bug: 274120822
Change-Id: Id3e883cf5d201e508adf1165803ce49d34f335a2
parent 9282c46b

packages/PackageInstaller/res/layout/keep_data_option_layout.xml

+7 −2
Original line number Diff line number Diff line
@@ -19,7 +19,10 @@ 
    android:id="@+id/keep_data_layout"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:layout_marginTop="@dimen/dialog_inter_element_margin"

    android:layout_marginTop="8dp"

    android:paddingTop="8dp"

    android:clickable="true"

    android:focusable="true"

    android:orientation="horizontal"

    android:visibility="gone" >
@@ -31,7 +34,9 @@ 
            android:id="@+id/keep_data_checkbox"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_gravity="center" />

            android:layout_gravity="center"

            android:clickable="false"

            android:focusable="false" />



    </FrameLayout>

packages/PackageInstaller/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -49,13 +49,13 @@ 
    <dimen name="app_label_padding">18dp</dimen>

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

    <dimen name="alert_dialog_inner_padding">24dp</dimen>

    <dimen name="button_min_height">40dp</dimen>

    <dimen name="button_min_height">48dp</dimen>

    <dimen name="dialog_inter_element_vertical_margin">12dp</dimen>

    <dimen name="alert_dialog_radius">28dp</dimen>

    <dimen name="alert_dialog_dim_amount">0.6</dimen>

    <!-- 24dp + 364dp + 24dp for the portrait mode -->

    <dimen name="alert_dialog_min_width_minor">412dp</dimen>

    <!-- Override the values for the buttonbar paddings in M3 MaterialAlertDialog -->

    <dimen name="m3_alert_dialog_action_top_padding">8dp</dimen>

    <dimen name="m3_alert_dialog_action_top_padding">0dp</dimen>

    <dimen name="m3_alert_dialog_action_bottom_padding">8dp</dimen>

</resources>

packages/PackageInstaller/res/values/styles.xml

+3 −2
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ 
    </style>



    <style name="Widget.PackageInstaller.Material.Button" parent="@style/Widget.Material3.Button.TextButton.Dialog">

        <item name="android:insetTop">8dp</item>

        <item name="android:layout_marginStart">8dp</item>

        <item name="android:minHeight">@dimen/button_min_height</item>

        <item name="android:textAppearance">@style/TextAppearance.PackageInstaller.LabelLarge</item>
@@ -88,7 +89,7 @@ 


    <style name="Widget.PackageInstaller.Material.Button.Colored" parent="@style/Widget.Material3.Button">

        <item name="android:insetBottom">0dp</item>

        <item name="android:insetTop">0dp</item>

        <item name="android:insetTop">8dp</item>

        <item name="android:layout_marginStart">8dp</item>

        <item name="android:minHeight">@dimen/button_min_height</item>

        <item name="android:paddingHorizontal">16dp</item>
@@ -99,7 +100,7 @@ 


    <style name="Widget.PackageInstaller.Material.Button.Outlined" parent="@style/Widget.Material3.Button.OutlinedButton">

        <item name="android:insetBottom">0dp</item>

        <item name="android:insetTop">0dp</item>

        <item name="android:insetTop">8dp</item>

        <item name="android:layout_marginStart">8dp</item>

        <item name="android:minHeight">@dimen/button_min_height</item>

        <item name="android:paddingHorizontal">16dp</item>

packages/PackageInstaller/src/com/android/packageinstaller/v2/model/UninstallStages.kt

+7 −6
Original line number Diff line number Diff line
@@ -97,24 +97,25 @@ data class UninstallAborted(val abortReason: Int) : UninstallStage(STAGE_ABORTED 
                dialogTextResource = R.string.message_uninstall_app_not_found

            }



            ABORT_REASON_UNKNOWN -> {

                dialogTitleResource = R.string.title_uninstall_failed

                dialogTextResource = R.string.message_uninstall_failed

            }



            ABORT_REASON_USER_NOT_ALLOWED -> {

                dialogTitleResource = R.string.title_uninstall_user_not_allowed

                dialogTextResource = R.string.message_uninstall_user_not_allowed

            }



            ABORT_REASON_UNINSTALL_DONE -> {

            else -> {

                dialogTitleResource = 0

                dialogTextResource = 0

            }



            else -> {

                dialogTitleResource = R.string.title_uninstall_failed

                dialogTextResource = R.string.message_uninstall_failed

            }

        }

    }



    companion object {

        const val ABORT_REASON_UNKNOWN = -1

        const val ABORT_REASON_GENERIC_ERROR = 0

        const val ABORT_REASON_APP_UNAVAILABLE = 1

        const val ABORT_REASON_USER_NOT_ALLOWED = 2

packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/InstallLaunch.kt

+5 −5
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ import com.android.packageinstaller.v2.ui.fragments.InstallInstallingFragment 
import com.android.packageinstaller.v2.ui.fragments.InstallStagingFragment

import com.android.packageinstaller.v2.ui.fragments.InstallSuccessFragment

import com.android.packageinstaller.v2.ui.fragments.ParseErrorFragment

import com.android.packageinstaller.v2.ui.fragments.SimpleErrorFragment

import com.android.packageinstaller.v2.ui.fragments.VerificationConfirmationFragment

import com.android.packageinstaller.v2.ui.fragments.InstallRestrictionFragment

import com.android.packageinstaller.v2.ui.fragments.DeveloperVerificationConfirmationFragment

import com.android.packageinstaller.v2.viewmodel.InstallViewModel

import com.android.packageinstaller.v2.viewmodel.InstallViewModelFactory
@@ -167,7 +167,7 @@ class InstallLaunch : FragmentActivity(), InstallActionListener { 
                    }



                    InstallUserActionRequired.USER_ACTION_REASON_VERIFICATION_CONFIRMATION -> {

                        val actionDialog = VerificationConfirmationFragment(uar)

                        val actionDialog = DeveloperVerificationConfirmationFragment(uar)

                        showDialogInner(actionDialog)

                    }
@@ -258,11 +258,11 @@ class InstallLaunch : FragmentActivity(), InstallActionListener { 
        }

        return when (restriction) {

            UserManager.DISALLOW_INSTALL_APPS ->

                SimpleErrorFragment.newInstance(R.string.message_no_install_apps_restriction)

                InstallRestrictionFragment.newInstance(R.string.message_no_install_apps_restriction)



            UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES,

            UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY ->

                SimpleErrorFragment.newInstance(R.string.message_no_install_unknown_apps_restriction)

                InstallRestrictionFragment.newInstance(R.string.message_no_install_unknown_apps_restriction)



            else -> null

        }