From 896c870b096ebb9ee4748de60ff978ffd47fa7f7 Mon Sep 17 00:00:00 2001
From: Salvador Martinez <dehboxturtle@google.com>
Date: Thu, 6 Oct 2016 19:26:51 -0700
Subject: [PATCH] Fixed spans getting stripped from disclaimer

In the support disclaimer the text
"Privacy Policy" and "Terms of Service"
will no longer have their url spans
stripped.

Test: Instrumentation Test
Bug: 31939039
Change-Id: Ifdd9c3b5249d4678b30e677b909d0b58dd2c5edc
---
 src/com/android/settings/overlay/SupportFeatureProvider.java  | 4 +++-
 .../settings/support/SupportDisclaimerDialogFragment.java     | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java
index f211c1292f8..506d1bc8399 100644
--- a/src/com/android/settings/overlay/SupportFeatureProvider.java
+++ b/src/com/android/settings/overlay/SupportFeatureProvider.java
@@ -18,6 +18,7 @@ package com.android.settings.overlay;
 
 import android.accounts.Account;
 import android.annotation.IntDef;
+import android.annotation.StringRes;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -141,5 +142,6 @@ public interface SupportFeatureProvider {
     /**
      * Returns the string for the disclaimer in the Support dialog
      */
-    String getDisclaimerString();
+    @StringRes
+    int getDisclaimerStringResId();
 }
diff --git a/src/com/android/settings/support/SupportDisclaimerDialogFragment.java b/src/com/android/settings/support/SupportDisclaimerDialogFragment.java
index 6ccd23af091..f7149f79889 100644
--- a/src/com/android/settings/support/SupportDisclaimerDialogFragment.java
+++ b/src/com/android/settings/support/SupportDisclaimerDialogFragment.java
@@ -25,7 +25,6 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.text.Spannable;
 import android.text.TextPaint;
-import android.text.method.LinkMovementMethod;
 import android.text.style.URLSpan;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -67,11 +66,10 @@ public final class SupportDisclaimerDialogFragment extends InstrumentedDialogFra
         final View content = LayoutInflater.from(builder.getContext())
                 .inflate(R.layout.support_disclaimer_content, null);
         final TextView disclaimer = (TextView) content.findViewById(R.id.support_disclaimer_text);
-        disclaimer.setMovementMethod(LinkMovementMethod.getInstance());
         final Activity activity = getActivity();
         final SupportFeatureProvider supportFeatureProvider =
                 FeatureFactory.getFactory(activity).getSupportFeatureProvider(activity);
-        disclaimer.setText(supportFeatureProvider.getDisclaimerString());
+        disclaimer.setText(supportFeatureProvider.getDisclaimerStringResId());
         stripUnderlines((Spannable) disclaimer.getText());
         return builder
                 .setView(content)