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

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

Merge "[PM] Fix A11y issue (2/N)" into main

parents aba473b9 e8974f6f

packages/PackageInstaller/AndroidManifest.xml

+0 −3
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
        </receiver>



        <activity android:name=".v2.ui.InstallLaunch"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:exported="false"/>



        <activity android:name=".InstallStart"
@@ -122,7 +121,6 @@ 
        </activity>



        <activity android:name=".v2.ui.UninstallLaunch"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:excludeFromRecents="true"

            android:noHistory="true"

            android:exported="false" />
@@ -181,7 +179,6 @@ 
        </activity>



        <activity android:name=".v2.ui.UnarchiveLaunch"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:exported="false"/>

    </application>

packages/PackageInstaller/res/values/strings_v2.xml

+2 −2
Original line number Diff line number Diff line
@@ -49,14 +49,14 @@ 
    <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 user \'<xliff:g id="user_name">%1$s</xliff:g>\'?</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_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>

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

    <string name="title_restore">Restore this app?</string>

    <string name="title_restore_error_user_action_needed">Action required</string>

    <string name="title_restore_error_less_storage">Not enough storage</string>

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

+0 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.content.pm.ResolveInfo; 
import android.graphics.Typeface;

import android.os.Bundle;

import android.text.Html;

import android.text.method.ScrollingMovementMethod;

import android.util.Log;

import android.view.View;

import android.widget.Button;
@@ -620,7 +619,6 @@ public class InstallationFragment extends DialogFragment { 
                        installStage.getExistingUpdateOwnerLabel());

                mCustomMessageTextView.setText(

                        Html.fromHtml(updateOwnerString, Html.FROM_HTML_MODE_LEGACY));

                mCustomMessageTextView.setMovementMethod(new ScrollingMovementMethod());

            } else {

                title = getString(R.string.title_update);

                positiveBtnTextRes = R.string.button_update;