Merge "Fixed spans getting stripped from disclaimer"

import android.accounts.Account;

import android.annotation.IntDef;

import android.annotation.StringRes;

import android.app.Activity;

import android.content.Context;

import android.content.Intent;

    /**

     * Returns the string for the disclaimer in the Support dialog

     */

    String getDisclaimerString();

    @StringRes

    int getDisclaimerStringResId();

}

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;

        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)