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

Commit cd94c187 authored by PETER LIANG's avatar PETER LIANG Committed by Android (Google) Code Review
Browse files

Merge "Revise the parameter of public API for allow rich content."

parents 876a4ab9 f532a235

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2992,7 +2992,7 @@ package android.accessibilityservice { 
    method public int getNonInteractiveUiTimeoutMillis();

    method public android.content.pm.ResolveInfo getResolveInfo();

    method public String getSettingsActivityName();

    method @Nullable public android.graphics.drawable.Drawable loadAnimatedImage(@NonNull android.content.pm.PackageManager);

    method @Nullable public android.graphics.drawable.Drawable loadAnimatedImage(@NonNull android.content.Context);

    method public String loadDescription(android.content.pm.PackageManager);

    method @Nullable public String loadHtmlDescription(@NonNull android.content.pm.PackageManager);

    method public CharSequence loadSummary(android.content.pm.PackageManager);

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -803,11 +803,12 @@ public class AccessibilityServiceInfo implements Parcelable { 
     * @return The animated image drawable.

     */

    @Nullable

    public Drawable loadAnimatedImage(@NonNull PackageManager packageManager)  {

    public Drawable loadAnimatedImage(@NonNull Context context)  {

        if (mAnimatedImageRes == /* invalid */ 0) {

            return null;

        }



        final PackageManager packageManager = context.getPackageManager();

        final String packageName = mComponentName.getPackageName();

        final ApplicationInfo applicationInfo = mResolveInfo.serviceInfo.applicationInfo;

core/java/android/accessibilityservice/AccessibilityShortcutInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -208,11 +208,12 @@ public final class AccessibilityShortcutInfo { 
     * @return The animated image drawable.

     */

    @Nullable

    public Drawable loadAnimatedImage(@NonNull PackageManager packageManager) {

    public Drawable loadAnimatedImage(@NonNull Context context) {

        if (mAnimatedImageRes == /* invalid */ 0) {

            return null;

        }



        final PackageManager packageManager = context.getPackageManager();

        final String packageName = mComponentName.getPackageName();

        final ApplicationInfo applicationInfo = mActivityInfo.applicationInfo;

core/tests/coretests/src/android/accessibilityservice/AccessibilityShortcutInfoTest.java

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ public class AccessibilityShortcutInfoTest { 
    @Test

    public void testLoadAnimatedImage() {

        assertNotNull("Can't find animated image",

                mShortcutInfo.loadAnimatedImage(mPackageManager));

                mShortcutInfo.loadAnimatedImage(mTargetContext));

    }



    @Test