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

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

Merge changes from topic "pic_cuj_v2_mapping" into main 

* changes:
  Implement Unarchival dialogs in new UI
  Implement Updating dialogs in new UI
  Revert "Implement Reinstall dialogs in new UI"
  Minor UI bug fixes
  Add ability to cancel staging an APK
parents 58eda5ea 56f2bf41

packages/PackageInstaller/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ 


        <activity android:name=".v2.ui.UnarchiveLaunch"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:theme="@style/Theme.AlertDialogActivity"

            android:theme="@style/Theme.PackageInstaller"

            android:exported="false"/>

    </application>

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

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

      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_fragment_layout.xml

+1 −6
Original line number Diff line number Diff line
@@ -38,11 +38,6 @@ 
        android:layout_width="match_parent"

        android:visibility="gone" />



    <CheckBox

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

        android:id="@+id/keep_data"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:visibility="gone" />

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



</LinearLayout>

packages/PackageInstaller/res/layout/keep_data_option_layout.xml

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

  Copyright (C) 2015 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:id="@+id/keep_data_layout"

    android:orientation="horizontal"

    android:visibility="gone"

    style="@style/Widget.PackageInstaller.ViewGroup.KeepData">



    <CheckBox

        style="@style/Widget.PackageInstaller.CheckBox"

        android:id="@+id/keep_data_checkbox"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content" />



    <LinearLayout

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:orientation="vertical"

        android:layout_marginStart="@dimen/dialog_inter_element_vertical_margin">



        <TextView

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

            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"

            android:id="@+id/keep_data_bytes"

            android:layout_height="wrap_content"

            android:layout_width="match_parent" />

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

packages/PackageInstaller/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -62,4 +62,6 @@ 
    <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="checkbox_margin">4dp</dimen>

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

</resources>