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

Commit 3df8cf56 authored by Sumedh Sen's avatar Sumedh Sen
Browse files

Minor UI bug fixes 

Bug: 274120822
Test: Manual. Follow manual test plan
Flag: android.content.pm.use_pia_v2

Change-Id: Ia854d68fa1602b475ac0b52ef2f6db0c6115b9b4
parent 6ccd18fe

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>

packages/PackageInstaller/res/values/strings_v2.xml

+20 −20
Original line number Diff line number Diff line
@@ -45,19 +45,19 @@ 
    <string name="title_install_failed_less_storage">Not enough storage</string>

    <string name="title_install_failed_not_installed">App not installed</string>



    <!-- TODO: These strings are placeholders, until UX finalizes strings for Uninstall flow. -->

    <string name="title_uninstall">Uninstall this app?</string>

    <string name="title_uninstall_clone">Uninstall this app clone?</string>

    <string name="title_uninstall_updates_system_app">Uninstall updates?</string>

    <string name="title_uninstall_clone">Delete this app clone?</string>

    <string name="title_uninstall_updates_system_app">Uninstall app updates?</string>

    <string name="title_uninstall_updates_system_app_all_users">Uninstall app updates for all users?</string>

    <string name="title_uninstall_all_users">Uninstall this app for all users?</string>

    <string name="title_uninstall_other_user">Uninstall this app for another user?</string>

    <string name="title_uninstall_other_user">Uninstall this app for user \'<xliff:g id="user_name">%1$s</xliff:g>\'?</string>

    <string name="title_uninstall_app_not_found">App not found</string>

    <string name="title_uninstall_user_not_allowed">Can\'t uninstall this app</string>

    <string name="title_uninstall_failed">App not uninstalled</string>



    <string name="title_archive">Archive this app?</string>

    <string name="title_archive_other_user">Archive this app for another user?</string>

    <!-- End of placeholder strings -->

    <string name="title_archive_all_users">Archive this app for all users?</string>

    <string name="title_archive_other_user">Archive this app for user \'<xliff:g id="user_name">%1$s</xliff:g>\'?</string>

    <!-- Dialog Titles end -->



    <!-- Dialog Messages -->
@@ -69,33 +69,32 @@ 
    <string name="message_install_failed_conflict">This app conflicts with an app already on your device</string>

    <string name="message_install_failed_incompatible">This app is not compatible with your device</string>

    <string name="message_install_failed_invalid">There\'s a problem with this app\'s installation file</string>

    <string name="message_install_failed_less_storage">To install this app, free up &lt;b><xliff:g id="required_space" example="100MB">%1$s</xliff:g>&lt;/b>, then try again</string>

    <string name="message_install_failed_less_storage">To install this app, free up some space and try again</string>



    <string name="message_parse_failed">There is a problem with the app file</string>



    <string name="message_no_install_apps_restriction">Installing apps has been restricted</string>

    <string name="message_no_install_unknown_apps_restriction">Installing unknown apps has been restricted</string>



    <!-- TODO: These strings are placeholders, until UX finalizes strings for Uninstall flow. -->

    <string name="message_uninstall_keep_data">Keep <xliff:g id="size" example="1.5MB">%1$s</xliff:g> of app data.</string>

    <string name="message_uninstall_with_clone_instance">A clone of this app exists and will also be deleted</string>

    <string name="message_uninstall_with_clone_instance">A clone of this app also exists and will be deleted</string>

    <string name="message_delete_clone_app">This app is a clone of <xliff:g id="app_label" example="Example App">%1$s</xliff:g></string>

    <string name="message_uninstall_activity"><xliff:g id="activity_name">%1$s</xliff:g> is part of the following app: <xliff:g id="app_name">%2$s</xliff:g></string>

    <string name="message_uninstall_updates_system_app">This app will be replaced with the factory version and all app data will be removed</string>

    <string name="message_uninstall_updates_system_app_all_users">This app will be replaced with the factory version and all app data will be removed. This will affect all users on the device, including those with work profiles.</string>

    <string name="message_uninstall_all_users">This app and its data will be removed for all users on this device</string>

    <string name="message_uninstall_other_user">This app will be uninstalled for user named \'<xliff:g id="user_name">%1$s</xliff:g>\'</string>

    <string name="message_uninstall_updates_system_app">This app will be replaced with the factory version. All app data will be removed.</string>

    <string name="message_uninstall_updates_system_app_all_users">This app will be replaced with the factory version for all users on the device. All app data will be removed.</string>

    <string name="message_uninstall_work_profile">This app will be uninstalled from your work profile</string>

    <string name="message_uninstall_private_space">This app will be uninstalled from your private space</string>

    <string name="message_uninstall_app_not_found">This app wasn\'t found in the list of installed apps, or has been already uninstalled</string>

    <string name="message_uninstall_user_not_allowed">The current user is not allowed to perform this uninstallation</string>

    <string name="message_uninstall_failed">This app could not be uninstalled</string>

    <string name="message_uninstall_keep_data">Keep app data</string>



    <string name="message_archive">Your app data will be saved</string>

    <string name="message_archive_all_users">This app will be archived for all users. App data will be saved</string>

    <string name="message_archive_other_user">This app will be archived for user named \'<xliff:g id="user_name">%1$s</xliff:g>\'. App data will be saved</string>

    <string name="message_archive_work_profile">This app will be archived from your work profile. App data will be saved</string>

    <string name="message_archive_private_space">This app will be archived from your private space. App data will be saved</string>

    <string name="message_archive_all_users">All app data will be saved</string>

    <string name="message_archive_other_user">App data will be saved</string>

    <string name="message_archive_work_profile">This app will be archived from your work profile. Your app data will be saved.</string>

    <string name="message_archive_private_space">This app will be archived from your private space. Your app data will be saved.</string>



    <!-- TODO: These strings are placeholders, until UX finalizes strings for Uninstall flow. -->

    <string name="message_uninstall_activity"><xliff:g id="activity_name">%1$s</xliff:g> is part of the following app: <xliff:g id="app_name">%2$s</xliff:g></string>

    <!-- End of placeholder strings -->

    <!-- Dialog Messages end -->
@@ -109,6 +108,7 @@ 
    <string name="button_continue">Continue</string>

    <string name="button_close">Close</string>

    <string name="button_uninstall">Uninstall</string>

    <string name="button_delete">Delete</string>

    <string name="button_reinstall">Reinstall</string>

    <string name="button_manage_apps">Manage apps</string>

    <string name="button_archive">Archive</string>