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

Commit cb75b545 authored by Saige McVea's avatar Saige McVea
Browse files

Change String to CharSequence in #loadSummary. 

Per API council review, localized strings should return CharSequence. Also
updated doc.

Test: ag/1813674

Bug: 37723508

Change-Id: I5ae868c2dda64d3756ad477578c65708242fde8c
parent e15f9127

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2830,7 +2830,7 @@ package android.accessibilityservice { 
    method public android.content.pm.ResolveInfo getResolveInfo();

    method public java.lang.String getSettingsActivityName();

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

    method public java.lang.String loadSummary(android.content.pm.PackageManager);

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

    method public void writeToParcel(android.os.Parcel, int);

    field public static final int CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES = 64; // 0x40

    field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2955,7 +2955,7 @@ package android.accessibilityservice { 
    method public android.content.pm.ResolveInfo getResolveInfo();

    method public java.lang.String getSettingsActivityName();

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

    method public java.lang.String loadSummary(android.content.pm.PackageManager);

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

    method public void writeToParcel(android.os.Parcel, int);

    field public static final int CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES = 64; // 0x40

    field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2830,7 +2830,7 @@ package android.accessibilityservice { 
    method public android.content.pm.ResolveInfo getResolveInfo();

    method public java.lang.String getSettingsActivityName();

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

    method public java.lang.String loadSummary(android.content.pm.PackageManager);

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

    method public void writeToParcel(android.os.Parcel, int);

    field public static final int CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES = 64; // 0x40

    field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+3 −2
Original line number Diff line number Diff line
@@ -693,9 +693,10 @@ public class AccessibilityServiceInfo implements Parcelable { 
     *    <strong>Statically set from

     *    {@link AccessibilityService#SERVICE_META_DATA meta-data}.</strong>

     * </p>

     * @return The localized summary.

     * @return The localized summary if available, and {@code null} if a summary

     * has not been provided.

     */

    public String loadSummary(PackageManager packageManager) {

    public CharSequence loadSummary(PackageManager packageManager) {

        if (mSummaryResId == 0) {

            return mNonLocalizedSummary;

        }