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

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

Merge "[PM] Update the Update-ownership dialog" into main

parents 217df7f6 e00cb97d

packages/PackageInstaller/res/values/strings_v2.xml

+4 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
    <string name="title_reinstalled">App reinstalled</string>



    <string name="title_update">Update this app?</string>

    <string name="title_update_ownership_change">Update this app with <xliff:g id="new_update_owner">%1$s</xliff:g>?</string>

    <string name="title_update_ownership_change">Update this app using <xliff:g id="new_update_owner">%1$s</xliff:g>?</string>

    <string name="title_updating">Updating&#8230;</string>

    <string name="title_updated">App updated</string>
@@ -70,11 +70,11 @@ 


    <!-- Dialog Messages -->

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

    <string name="message_update_owner_change" product="tablet">This app normally receives updates from &lt;b><xliff:g id="existing_update_owner">%1$s</xliff:g>&lt;/b>. By updating from a different source, you may receive future updates from any source on your tablet. App functionality may change.</string>

    <string name="message_update_owner_change" product="tablet">This app normally receives updates from &lt;b><xliff:g id="existing_update_owner">%1$s</xliff:g>&lt;/b>. By updating using 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="message_update_owner_change" product="tv">This app normally receives updates from &lt;b><xliff:g id="existing_update_owner">%1$s</xliff:g>&lt;/b>. By updating from a different source, you may receive future updates from any source on your TV. App functionality may change.</string>

    <string name="message_update_owner_change" product="tv">This app normally receives updates from &lt;b><xliff:g id="existing_update_owner">%1$s</xliff:g>&lt;/b>. By updating using 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="message_update_owner_change" product="default">This app normally receives updates from &lt;b><xliff:g id="existing_update_owner">%1$s</xliff:g>&lt;/b>. By updating from a different source, you may receive future updates from any source on your phone. App functionality may change.</string>

    <string name="message_update_owner_change" product="default">This app normally receives updates from &lt;b><xliff:g id="existing_update_owner">%1$s</xliff:g>&lt;/b>. By updating using a different source, you may receive future updates from any source on your phone. App functionality may change.</string>



    <!-- Text to show in warning dialog on the tablet when the app source is not trusted [CHAR LIMIT=NONE] -->

    <string name="message_external_source_blocked" product="tablet">For your security, your tablet currently isn’t allowed to install unknown apps from this source. You can change this in Settings.</string>

packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallConfirmationFragment.java

+3 −1
Original line number Diff line number Diff line
@@ -105,9 +105,11 @@ public class InstallConfirmationFragment extends DialogFragment { 


        int positiveBtnTextRes;

        String title;

        int themeResId = 0;

        if (mDialogData.isAppUpdating()) {

            if (mDialogData.getExistingUpdateOwnerLabel() != null

                    && mDialogData.getRequestedUpdateOwnerLabel() != null) {

                themeResId = UiUtil.getTextButtonThemeResId(requireContext());

                title = getString(R.string.title_update_ownership_change,

                    mDialogData.getRequestedUpdateOwnerLabel());

                positiveBtnTextRes = R.string.button_update_anyway;
@@ -132,7 +134,7 @@ public class InstallConfirmationFragment extends DialogFragment { 
                (dialogInt, which) -> mInstallActionListener.onPositiveResponse(

                        InstallUserActionRequired.USER_ACTION_REASON_INSTALL_CONFIRMATION),

                (dialogInt, which) -> mInstallActionListener.onNegativeResponse(

                                mDialogData.getStageCode()));

                                mDialogData.getStageCode()), themeResId);



        return mDialog;

    }