PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed spans getting stripped from disclaimer

Browse Source 
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
This commit is contained in:
Salvador Martinez
2016-10-06 19:26:51 -07:00
parent ced3676723
commit 896c870b09
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/overlay/SupportFeatureProvider.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.overlay;
import android.accounts.Account; import android.accounts.Account;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.StringRes;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -141,5 +142,6 @@ public interface SupportFeatureProvider {
/** /**
* Returns the string for the disclaimer in the Support dialog * Returns the string for the disclaimer in the Support dialog
*/ */
String getDisclaimerString(); @StringRes
int getDisclaimerStringResId();
} }

4
src/com/android/settings/support/SupportDisclaimerDialogFragment.java
View File

@@ -25,7 +25,6 @@ import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
import android.text.Spannable; import android.text.Spannable;
import android.text.TextPaint; import android.text.TextPaint;
import android.text.method.LinkMovementMethod;
import android.text.style.URLSpan; import android.text.style.URLSpan;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@@ -67,11 +66,10 @@ public final class SupportDisclaimerDialogFragment extends InstrumentedDialogFra
final View content = LayoutInflater.from(builder.getContext()) final View content = LayoutInflater.from(builder.getContext())
.inflate(R.layout.support_disclaimer_content, null); .inflate(R.layout.support_disclaimer_content, null);
final TextView disclaimer = (TextView) content.findViewById(R.id.support_disclaimer_text); final TextView disclaimer = (TextView) content.findViewById(R.id.support_disclaimer_text);
disclaimer.setMovementMethod(LinkMovementMethod.getInstance());
final Activity activity = getActivity(); final Activity activity = getActivity();
final SupportFeatureProvider supportFeatureProvider = final SupportFeatureProvider supportFeatureProvider =
FeatureFactory.getFactory(activity).getSupportFeatureProvider(activity); FeatureFactory.getFactory(activity).getSupportFeatureProvider(activity);
disclaimer.setText(supportFeatureProvider.getDisclaimerString()); disclaimer.setText(supportFeatureProvider.getDisclaimerStringResId());
stripUnderlines((Spannable) disclaimer.getText()); stripUnderlines((Spannable) disclaimer.getText());
return builder return builder
.setView(content) .setView(content)