Support dialog disclaimer text now appears properly

am: adc5555acf

Change-Id: I8eefba43b0e919f502c91f5f770d446c1d17a4e3
This commit is contained in:
Matthew Fritze
2016-09-30 00:20:27 +00:00
committed by android-build-merger
4 changed files with 10 additions and 5 deletions

View File

@@ -137,4 +137,9 @@ public interface SupportFeatureProvider {
* Returns an intent that will launch the tips and tricks UI.
*/
Intent getTipsAndTricksIntent(Context context);
/**
* Returns the string for the disclaimer in the Support dialog
*/
String getDisclaimerString();
}

View File

@@ -68,6 +68,10 @@ public final class SupportDisclaimerDialogFragment extends DialogFragment implem
.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());
stripUnderlines((Spannable) disclaimer.getText());
return builder
.setView(content)