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

Commit adc5555a authored by Matthew Fritze's avatar Matthew Fritze
Browse files

Support dialog disclaimer text now appears properly 

The string override between Settings and SettigsGoogle was not properly
distinguishing, and was defaulting to the AOSP version.

Bug: 31827726
Test: Manual
Change-Id: Iebd8681fb4f040e956f05fb0f5d96deae9eec26f
parent 59d2b185

res/layout/support_disclaimer_content.xml

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

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -7669,9 +7669,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>

































src/com/android/settings/overlay/SupportFeatureProvider.java



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









}
























src/com/android/settings/support/SupportDisclaimerDialogFragment.java



+4
−0






























Original line number
Diff line number
Diff line







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