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

Commit c4c434c3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add appropriate form-factor variants of update owner confirmation... 

Merge "Add appropriate form-factor variants of update owner confirmation dialog string" into udc-qpr-dev am: dbfeeae0

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



Change-Id: I7df8f2d0762d0aa90292c7ab6425f379c0cd035e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b809c7a dbfeeae0

packages/PackageInstaller/res/values/strings.xml

+5 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,11 @@ 
    <!-- Message for updating an existing app [CHAR LIMIT=NONE] -->

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

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

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

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

    <!-- 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>

    <string name="install_confirm_question_update_owner_reminder" product="tablet">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 tablet. App functionality may change.</string>

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

    <string name="install_confirm_question_update_owner_reminder" product="tv">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 TV. App functionality may change.</string>

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

    <string name="install_confirm_question_update_owner_reminder" product="default">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] -->

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

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

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

    <!-- Reason displayed when installation fails because the package was blocked

    <!-- Reason displayed when installation fails because the package was blocked