Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05a98e79 authored by Salvador Martinez's avatar Salvador Martinez Committed by android-build-merger
Browse files

Fixed spans getting stripped from disclaimer am: e0b74a6d

am: e3c31f3a

Change-Id: Ia05205f27bdaccd7f08e311ef0c24a0af1776f64
parents d4abdb67 e3c31f3a
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -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();
}
+1 −3
Original line number Diff line number Diff line
@@ -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 DialogFragment implem
        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)