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

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

Merge changes I5ba45a43,I152447bf into main 

* changes:
  [PM] Support material AlertDialog (5/N)
  [PM] Support material AlertDialog (4/N)
parents 7eb97fee b876d5f2

packages/PackageInstaller/res/layout/app_snippet_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -36,6 +36,6 @@ 
        android:id="@+id/app_label"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        style="@style/Widget.PackageInstaller.TextView.AppLabel"/>

        style="?attr/textAppearanceInstallerAppLabel"/>



</LinearLayout>

packages/PackageInstaller/res/layout/install_fragment_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
            android:visibility="gone" />



        <TextView

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

            style="?attr/textAppearanceInstallerCustomMessage"

            android:id="@+id/custom_message"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

packages/PackageInstaller/res/layout/install_fragment_material_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
            android:visibility="gone" />



        <TextView

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

            style="?attr/textAppearanceInstallerCustomMessage"

            android:id="@+id/custom_message"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

packages/PackageInstaller/res/layout/keep_data_option_layout.xml

+13 −7
Original line number Diff line number Diff line
@@ -23,11 +23,17 @@ 
    android:orientation="horizontal"

    android:visibility="gone" >



    <FrameLayout

        android:layout_width="40dp"

        android:layout_height="40dp">



        <CheckBox

            android:id="@+id/keep_data_checkbox"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

        android:layout_margin="@dimen/checkbox_margin" />

            android:layout_gravity="center" />



    </FrameLayout>



    <LinearLayout

        android:layout_height="wrap_content"
@@ -36,13 +42,13 @@ 
        android:layout_marginStart="@dimen/dialog_inter_element_vertical_margin">



        <TextView

            style="@style/Widget.PackageInstaller.TextView.KeepData.Heading"

            style="?attr/textAppearanceInstallerKeepDataHeading"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:text="@string/message_uninstall_keep_data" />



        <TextView

            style="@style/Widget.PackageInstaller.TextView.KeepData.SubHeading"

            style="?attr/textAppearanceInstallerKeepDataSubHeading"

            android:id="@+id/keep_data_bytes"

            android:layout_height="wrap_content"

            android:layout_width="match_parent" />

packages/PackageInstaller/res/layout/uninstall_fragment_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        <include layout="@layout/app_snippet_layout" />



        <TextView

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

            style="?attr/textAppearanceInstallerCustomMessage"

            android:id="@+id/custom_message"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"