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

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

Merge changes Id3e883cf,I23b1a8db into main 

* changes:
  [PM] Rename fragments and fix some issues in PIA
  [PM] Support material AlertDialog (13/N)
parents 518fe5ed 4c118a8d

packages/PackageInstaller/res/drawable/lock_24px.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ 
    android:viewportWidth="960"

    android:viewportHeight="960">

  <path

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

      android:fillColor="@color/primaryColor"

      android:pathData="M240,880Q207,880 183.5,856.5Q160,833 160,800L160,400Q160,367 183.5,343.5Q207,320 240,320L280,320L280,240Q280,157 338.5,98.5Q397,40 480,40Q563,40 621.5,98.5Q680,157 680,240L680,320L720,320Q753,320 776.5,343.5Q800,367 800,400L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM240,800L720,800Q720,800 720,800Q720,800 720,800L720,400Q720,400 720,400Q720,400 720,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800ZM480,680Q513,680 536.5,656.5Q560,633 560,600Q560,567 536.5,543.5Q513,520 480,520Q447,520 423.5,543.5Q400,567 400,600Q400,633 423.5,656.5Q447,680 480,680ZM360,320L600,320L600,240Q600,190 565,155Q530,120 480,120Q430,120 395,155Q360,190 360,240L360,320ZM240,800Q240,800 240,800Q240,800 240,800L240,400Q240,400 240,400Q240,400 240,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800Z"/>

</vector>

packages/PackageInstaller/res/layout/install_blocked_custom_title_layout.xml

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
        android:layout_height="wrap_content"

        android:gravity="center"

        android:layout_marginTop="16dp"

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

        android:text="@string/title_install_failed_blocked"

        style="?attr/textAppearanceInstallerTitle"/>



</LinearLayout>

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-night/themes.xml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
        <item name="textAppearanceInstallerCustomMessage">@style/TextAppearance.PackageInstaller.CustomMessage</item>

        <item name="textAppearanceInstallerKeepDataHeading">@style/TextAppearance.PackageInstaller.KeepData.Heading</item>

        <item name="textAppearanceInstallerKeepDataSubHeading">@style/TextAppearance.PackageInstaller.KeepData.SubHeading</item>

        <item name="textAppearanceInstallerTitle">@style/TextAppearance.PackageInstaller.Title</item>

    </style>



</resources>

packages/PackageInstaller/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
    </declare-styleable>

    <!-- END: Ported from WearableSupport -->



    <!-- Text color, typeface, size, and style for "app label" text. -->

    <attr name="textAppearanceInstallerTitle" format="reference" />

    <!-- Text color, typeface, size, and style for "app label" text. -->

    <attr name="textAppearanceInstallerAppLabel" format="reference" />

    <!-- Text color, typeface, size, and style for "custom message" text. -->