Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fb386ac authored by Matthew Fritze's avatar Matthew Fritze Committed by android-build-merger
Browse files

Support dialog disclaimer text now appears properly am: adc5555a am: bbe0e8a3

am: 1869973e

Change-Id: I780f4b595fe276a3898237eb42d0852e7a7a5321
parents 91a4c542 1869973e
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -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"/>

    <CheckBox
        android:id="@+id/support_disclaimer_do_not_show_again"
+0 −3
Original line number Diff line number Diff line
@@ -7758,9 +7758,6 @@
    <!-- 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>
+5 −0
Original line number Diff line number Diff line
@@ -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();
}
+4 −0
Original line number Diff line number Diff line
@@ -68,6 +68,10 @@ public final class SupportDisclaimerDialogFragment extends InstrumentedDialogFra
                .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)