| commit | 6f5bbe475f6f8091975b7c4e21712b2c8d0dc78d | [log] [tgz] |
|---|---|---|
| author | Shen Lin <shhenlin@gmail.com> | Wed Nov 09 03:02:48 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 09 03:02:48 2022 +0000 |
| tree | 8e2a722b37399fe1ab17ae130bbcce1e7be45b7c | |
| parent | 66966e50b8fac97896bf9af55bc8afed0ee2e73a [diff] | |
| parent | 2d2419304912067d91830cda396457cff6c8962d [diff] |
Modify ambiguous getId method in LinkSpan am: 6ab057927f am: 2d24193049 Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2248394 Change-Id: I935b541e129244781cccc462d56c84bece3230b5 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; } }