Merge "[Settings] Learn more link should be removed when not supported." into rvc-dev

2 files changed, 21 insertions, 1 deletions

diff --git a/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java b/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
index 4077e91ae8..3911fb8038 100644
--- a/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
+++ b/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
@@ -69,7 +69,7 @@ public class NrDisabledInDsdsFooterPreferenceController extends BasePreferenceCo
         if (linkInfo.isActionable()) {
             return AnnotationSpan.linkify(mContext.getText(R.string.no_5g_in_dsds_text), linkInfo);
         } else {
-            return mContext.getText(R.string.no_5g_in_dsds_text);
+            return AnnotationSpan.textWithoutLink(mContext.getText(R.string.no_5g_in_dsds_text));
         }
     }
 
diff --git a/src/com/android/settings/utils/AnnotationSpan.java b/src/com/android/settings/utils/AnnotationSpan.java
index 1b8179d759..98256a00cb 100644
--- a/src/com/android/settings/utils/AnnotationSpan.java
+++ b/src/com/android/settings/utils/AnnotationSpan.java
@@ -27,6 +27,9 @@ import android.text.style.URLSpan;
 import android.util.Log;
 import android.view.View;
 
+import java.util.Arrays;
+import java.util.Comparator;
+
 /**
  * This class is used to add {@link View.OnClickListener} for the text been wrapped by
  * annotation.
@@ -76,6 +79,23 @@ public class AnnotationSpan extends URLSpan {
     }
 
     /**
+     * get the text part without having text for link part
+     */
+    public static CharSequence textWithoutLink(CharSequence encodedText) {
+        SpannableString msg = new SpannableString(encodedText);
+        Annotation[] spans = msg.getSpans(0, msg.length(), Annotation.class);
+        if (spans == null) {
+            return encodedText;
+        }
+        Arrays.sort(spans, Comparator.comparingInt(span -> -msg.getSpanStart(span)));
+        StringBuilder msgWithoutLink = new StringBuilder(msg.toString());
+        for (Annotation span : spans) {
+            msgWithoutLink.delete(msg.getSpanStart(span), msg.getSpanEnd(span));
+        }
+        return msgWithoutLink.toString();
+    }
+
+    /**
      * Data class to store the annotation and the click action
      */
     public static class LinkInfo {