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

Commit d1ef274f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[PM] Refactor the layout for PIA V2" into main

parents 4d7e9d87 91b38731

packages/PackageInstaller/res/layout/install_blocked_custom_title_layout.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


<LinearLayout

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

    android:id="@+id/customTitle"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center"

packages/PackageInstaller/res/layout/install_fragment_layout.xml

+1 −3
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  Copyright (C) 2015 The Android Open Source Project

  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.
@@ -41,6 +41,4 @@ 
        android:layout_marginTop="@dimen/dialog_inter_element_margin"

        android:visibility="gone" />



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



</LinearLayout>

packages/PackageInstaller/res/layout/keep_data_option_layout.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  Copyright (C) 2015 The Android Open Source Project

  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.

packages/PackageInstaller/res/layout/uninstall_fragment_layout.xml

0 → 100644
+36 −0
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.

  -->



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

    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">



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



    <TextView

        style="@style/Widget.PackageInstaller.TextView.CustomMessage"

        android:id="@+id/custom_message"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_marginTop="@dimen/dialog_inter_element_margin"

        android:visibility="gone" />



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



</LinearLayout>

packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/UnarchiveConfirmationFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class UnarchiveConfirmationFragment extends DialogFragment { 


        Log.i(LOG_TAG, "Creating " + LOG_TAG + "\n" + mDialogData);



        View dialogView = getLayoutInflater().inflate(R.layout.install_fragment_layout, null);

        View dialogView = getLayoutInflater().inflate(R.layout.uninstall_fragment_layout, null);

        dialogView.requireViewById(R.id.app_snippet).setVisibility(View.VISIBLE);

        ((ImageView) dialogView.requireViewById(R.id.app_icon))

            .setImageDrawable(mDialogData.getAppIcon());