From 146a3e36652a1dde44696ad5b7ceb0f8e30d5696 Mon Sep 17 00:00:00 2001 From: Santos Cordon Date: Mon, 21 Jul 2014 00:00:44 -0700 Subject: [PATCH] Change display Strings to CharSequence (1/3) Bug: 16416927 Change-Id: Id8b6e5029a8a1f61bbbf71661abe4d487c01002a --- api/current.txt | 10 ++++----- .../java/android/telecomm/PhoneAccount.java | 22 +++++++++---------- .../java/android/telecomm/StatusHints.java | 10 ++++----- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/api/current.txt b/api/current.txt index e736d78aa24ba..966d1fb680ada 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28594,15 +28594,15 @@ package android.telecomm { } public class PhoneAccount implements android.os.Parcelable { - ctor public PhoneAccount(android.telecomm.PhoneAccountHandle, android.net.Uri, java.lang.String, int, int, java.lang.String, java.lang.String, boolean); + ctor public PhoneAccount(android.telecomm.PhoneAccountHandle, android.net.Uri, java.lang.String, int, int, java.lang.CharSequence, java.lang.CharSequence, boolean); method public int describeContents(); method public android.telecomm.PhoneAccountHandle getAccountHandle(); method public int getCapabilities(); method public android.net.Uri getHandle(); method public android.graphics.drawable.Drawable getIcon(android.content.Context); method public int getIconResId(); - method public java.lang.String getLabel(); - method public java.lang.String getShortDescription(); + method public java.lang.CharSequence getLabel(); + method public java.lang.CharSequence getShortDescription(); method public java.lang.String getSubscriptionNumber(); method public boolean isVideoCallingSupported(); method public void writeToParcel(android.os.Parcel, int); @@ -28697,13 +28697,13 @@ package android.telecomm { } public final class StatusHints implements android.os.Parcelable { - ctor public StatusHints(android.content.ComponentName, java.lang.String, int, android.os.Bundle); + ctor public StatusHints(android.content.ComponentName, java.lang.CharSequence, int, android.os.Bundle); method public int describeContents(); method public android.content.ComponentName getComponentName(); method public android.os.Bundle getExtras(); method public android.graphics.drawable.Drawable getIcon(android.content.Context); method public int getIconId(); - method public java.lang.String getLabel(); + method public java.lang.CharSequence getLabel(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; } diff --git a/telecomm/java/android/telecomm/PhoneAccount.java b/telecomm/java/android/telecomm/PhoneAccount.java index 5a7753ccd87bc..1f9071e6c3c28 100644 --- a/telecomm/java/android/telecomm/PhoneAccount.java +++ b/telecomm/java/android/telecomm/PhoneAccount.java @@ -71,8 +71,8 @@ public class PhoneAccount implements Parcelable { private final String mSubscriptionNumber; private final int mCapabilities; private final int mIconResId; - private final String mLabel; - private final String mShortDescription; + private final CharSequence mLabel; + private final CharSequence mShortDescription; private boolean mVideoCallingSupported; public PhoneAccount( @@ -81,8 +81,8 @@ public class PhoneAccount implements Parcelable { String subscriptionNumber, int capabilities, int iconResId, - String label, - String shortDescription, + CharSequence label, + CharSequence shortDescription, boolean supportsVideoCalling) { mAccountHandle = account; mHandle = handle; @@ -136,11 +136,11 @@ public class PhoneAccount implements Parcelable { } /** - * A short string label describing a {@code PhoneAccount}. + * A short label describing a {@code PhoneAccount}. * * @return A label for this {@code PhoneAccount}. */ - public String getLabel() { + public CharSequence getLabel() { return mLabel; } @@ -149,7 +149,7 @@ public class PhoneAccount implements Parcelable { * * @return A description for this {@code PhoneAccount}. */ - public String getShortDescription() { + public CharSequence getShortDescription() { return mShortDescription; } @@ -214,8 +214,8 @@ public class PhoneAccount implements Parcelable { out.writeString(mSubscriptionNumber); out.writeInt(mCapabilities); out.writeInt(mIconResId); - out.writeString(mLabel); - out.writeString(mShortDescription); + out.writeCharSequence(mLabel); + out.writeCharSequence(mShortDescription); out.writeInt(mVideoCallingSupported ? 1 : 0); } @@ -238,8 +238,8 @@ public class PhoneAccount implements Parcelable { mSubscriptionNumber = in.readString(); mCapabilities = in.readInt(); mIconResId = in.readInt(); - mLabel = in.readString(); - mShortDescription = in.readString(); + mLabel = in.readCharSequence(); + mShortDescription = in.readCharSequence(); mVideoCallingSupported = in.readInt() == 1; } } diff --git a/telecomm/java/android/telecomm/StatusHints.java b/telecomm/java/android/telecomm/StatusHints.java index 5e64bff9dfafa..50f525aa45e08 100644 --- a/telecomm/java/android/telecomm/StatusHints.java +++ b/telecomm/java/android/telecomm/StatusHints.java @@ -34,11 +34,11 @@ import java.util.MissingResourceException; public final class StatusHints implements Parcelable { private final ComponentName mComponentName; - private final String mLabel; + private final CharSequence mLabel; private final int mIconId; private final Bundle mExtras; - public StatusHints(ComponentName componentName, String label, int iconId, Bundle extras) { + public StatusHints(ComponentName componentName, CharSequence label, int iconId, Bundle extras) { mComponentName = componentName; mLabel = label; mIconId = iconId; @@ -55,7 +55,7 @@ public final class StatusHints implements Parcelable { /** * @return The label displayed in the in-call UI. */ - public String getLabel() { + public CharSequence getLabel() { return mLabel; } @@ -88,7 +88,7 @@ public final class StatusHints implements Parcelable { @Override public void writeToParcel(Parcel out, int flags) { out.writeParcelable(mComponentName, flags); - out.writeString(mLabel); + out.writeCharSequence(mLabel); out.writeInt(mIconId); out.writeParcelable(mExtras, 0); } @@ -106,7 +106,7 @@ public final class StatusHints implements Parcelable { private StatusHints(Parcel in) { mComponentName = in.readParcelable(getClass().getClassLoader()); - mLabel = in.readString(); + mLabel = in.readCharSequence(); mIconId = in.readInt(); mExtras = (Bundle) in.readParcelable(getClass().getClassLoader()); }