Loading src/com/android/settings/overlay/SupportFeatureProvider.java +3 −1 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -141,5 +142,6 @@ public interface SupportFeatureProvider { /** * Returns the string for the disclaimer in the Support dialog */ String getDisclaimerString(); @StringRes int getDisclaimerStringResId(); } src/com/android/settings/support/SupportDisclaimerDialogFragment.java +1 −3 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -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) Loading Loading
src/com/android/settings/overlay/SupportFeatureProvider.java +3 −1 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -141,5 +142,6 @@ public interface SupportFeatureProvider { /** * Returns the string for the disclaimer in the Support dialog */ String getDisclaimerString(); @StringRes int getDisclaimerStringResId(); }
src/com/android/settings/support/SupportDisclaimerDialogFragment.java +1 −3 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -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) Loading