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

Commit c52f1336 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update ownership text revision" into udc-dev am: e4a4cdde 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22139550



Change-Id: I7322c6011d3125d8637d89292f0d7560121f7110
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ad8cad8 e4a4cdde

packages/PackageInstaller/res/values/strings.xml

+4 −3
Original line number Diff line number Diff line
@@ -37,9 +37,8 @@ 
    <string name="install_confirm_question">Do you want to install this app?</string>

    <!-- Message for updating an existing app [CHAR LIMIT=NONE] -->

    <string name="install_confirm_question_update">Do you want to update this app?</string>

    <!-- TODO(b/244413073) Revise the description after getting UX input and UXR on this. -->

    <!-- Message for updating an existing app with update owner reminder [DO NOT TRANSLATE][CHAR LIMIT=NONE] -->

    <string name="install_confirm_question_update_owner_reminder">Updates to this app are currently managed by <xliff:g id="existing_update_owner">%1$s</xliff:g>.\n\nDo you want to install this update from <xliff:g id="new_update_owner">%2$s</xliff:g>?</string>

    <!-- Message for updating an existing app with update owner reminder [CHAR LIMIT=NONE] -->

    <string name="install_confirm_question_update_owner_reminder">Update this app from <xliff:g id="new_update_owner">%1$s</xliff:g>?\n\nThis app normally receives updates from <xliff:g id="existing_update_owner">%2$s</xliff:g>. By updating from a different source, you may receive future updates from any source on your phone. App functionality may change.</string>

    <!-- [CHAR LIMIT=100] -->

    <string name="install_failed">App not installed.</string>

    <!-- Reason displayed when installation fails because the package was blocked
@@ -82,6 +81,8 @@ 


    <!-- [CHAR LIMIT=15] -->

    <string name="ok">OK</string>

    <!-- [CHAR LIMIT=30] -->

    <string name="update_anyway">Update anyway</string>

    <!-- [CHAR LIMIT=15] -->

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

    <!-- [CHAR LIMIT=30] -->

packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java

+4 −3
Original line number Diff line number Diff line
@@ -148,10 +148,11 @@ public class PackageInstallerActivity extends AlertActivity { 
                    && mPendingUserActionReason == PackageInstaller.REASON_REMIND_OWNERSHIP) {

                viewToEnable.setText(

                        getString(R.string.install_confirm_question_update_owner_reminder,

                                existingUpdateOwnerLabel, requestedUpdateOwnerLabel));

            }



                                requestedUpdateOwnerLabel, existingUpdateOwnerLabel));

                mOk.setText(R.string.update_anyway);

            } else {

                mOk.setText(R.string.update);

            }

        } else {

            // This is a new application with no permissions.

            viewToEnable = requireViewById(R.id.install_confirm_question);