Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev

        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"/>

    <CheckBox

        android:id="@+id/support_disclaimer_do_not_show_again"

    <!-- Dialog title displayed before initiating real time support [CHAR LIMIT=80]-->

    <string name="support_disclaimer_title">Send system information</string>

    <!-- Dialog content displayed before initiating real time support  [CHAR LIMIT=NONE]-->

    <string name="support_disclaimer_content" product="default">To help address your issue quickly, we need system information for diagnosis.</string>

    <!-- Checkbox text, when checked dialog will not show again [CHAR LIMIT=80] -->

    <string name="support_disclaimer_do_not_show">Do not show again</string>

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

}

                .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)