| commit | b7dde576412b5d6498c5a98e377a902c4537ee6a | [log] [tgz] |
|---|---|---|
| author | Shen Lin <shhenlin@gmail.com> | Wed Nov 09 02:16:06 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 09 02:16:06 2022 +0000 |
| tree | f886808316183785d80ec2902ce3ae6498b89fc4 | |
| parent | 6eed90606dad69db73185ffcb1a3ed2cd7da67a8 [diff] | |
| parent | 6ab057927f7310d1fedee563351154fed382fe12 [diff] |
Modify ambiguous getId method in LinkSpan am: 6ab057927f Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2248394 Change-Id: I839ff03aff733249b395141f3108415b204e7661 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/main/src/com/google/android/setupdesign/span/LinkSpan.java b/main/src/com/google/android/setupdesign/span/LinkSpan.java index 7d91012..7defbf9 100644 --- a/main/src/com/google/android/setupdesign/span/LinkSpan.java +++ b/main/src/com/google/android/setupdesign/span/LinkSpan.java
@@ -73,10 +73,10 @@ /* non-static section */ - private final String id; + private final String link; - public LinkSpan(String id) { - this.id = id; + public LinkSpan(String link) { + this.link = link; } @Override @@ -137,7 +137,16 @@ drawState.setUnderlineText(false); } + public String getLink() { + return link; + } + + /** + * @deprecated Method's return type clashes with its superclass. Use {@link #getLink()} instead. + * This will be removed in the future. + */ + @Deprecated public String getId() { - return id; + return link; } }