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

Commit b7844e8e authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Change String to CharSequence in #loadSummary." into oc-dev am: 63827ce6 

am: f0d14afa

Change-Id: Ib99d458b6f14dba8c3a62a14fb2d845feea611c4
parents d2b9f2f2 f0d14afa

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2828,7 +2828,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_CONTROL_MAGNIFICATION = 16; // 0x10

    field public static final int CAPABILITY_CAN_PERFORM_GESTURES = 32; // 0x20

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2958,7 +2958,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_CONTROL_MAGNIFICATION = 16; // 0x10

    field public static final int CAPABILITY_CAN_PERFORM_GESTURES = 32; // 0x20

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2828,7 +2828,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_CONTROL_MAGNIFICATION = 16; // 0x10

    field public static final int CAPABILITY_CAN_PERFORM_GESTURES = 32; // 0x20

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+3 −2
Original line number Diff line number Diff line
@@ -670,9 +670,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;

        }