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

Commit 9fd877b9 authored by Patrick Baumann's avatar Patrick Baumann
Browse files

Update ownership text revision 

This change modifies the update ownership confirmation dialog text to
match the latest revisions.

Test: Manual; verify text matches mocks
Bug: 271577016
Change-Id: Ib2d38e2c918638810a1ea770601808ce1b492388
parent 61de1e2e

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);