Support dialog disclaimer text now appears properly am: adc5555acf

am: bbe0e8a30b

Change-Id: I42f693c150af45e2a6c57d82c30d0b5ffc9dd0ed

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();
 }

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)