diff --git a/res/layout/support_disclaimer_content.xml b/res/layout/support_disclaimer_content.xml index 44e5bcd0184..d6697c36571 100644 --- a/res/layout/support_disclaimer_content.xml +++ b/res/layout/support_disclaimer_content.xml @@ -24,8 +24,7 @@ android:id="@+id/support_disclaimer_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingBottom="24dp" - android:text="@string/support_disclaimer_content"/> + android:paddingBottom="24dp"/> Send system information - - To help address your issue quickly, we need system information for diagnosis. - Do not show again diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java index 45713e4eef3..f211c1292f8 100644 --- a/src/com/android/settings/overlay/SupportFeatureProvider.java +++ b/src/com/android/settings/overlay/SupportFeatureProvider.java @@ -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(); } diff --git a/src/com/android/settings/support/SupportDisclaimerDialogFragment.java b/src/com/android/settings/support/SupportDisclaimerDialogFragment.java index db74f0fb979..f8b859ca39b 100644 --- a/src/com/android/settings/support/SupportDisclaimerDialogFragment.java +++ b/src/com/android/settings/support/SupportDisclaimerDialogFragment.java @@ -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)