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

Commit d04b4964 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add a "Do not show" checkbox in support disclaimer dialog." into nyc-mr1-dev

parents 2a817d97 0beb6959

res/layout/support_disclaimer_content.xml

+8 −0
Original line number Diff line number Diff line
@@ -24,6 +24,14 @@ 
        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"/>



    <CheckBox

        android:id="@+id/support_disclaimer_do_not_show_again"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:text="@string/support_disclaimer_do_not_show"

        android:textColor="?android:attr/textColorSecondary"/>



</LinearLayout>

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -7546,6 +7546,9 @@ 
    <!-- Dialog content displayed before initiating real time support  [CHAR LIMIT=NONE]-->

    <string name="support_disclaimer_content">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>



























    <!-- [CHAR LIMIT=60] Title of work profile setting page -->















    <string name="managed_profile_settings_title">Work profile settings</string>















    <!-- [CHAR LIMIT=60] The preference title for enabling cross-profile remote contact search -->

























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



+5
−0




























Original line number
Diff line number
Diff line








@@ -58,6 +58,11 @@ public interface SupportFeatureProvider {













     */















    boolean shouldShowDisclaimerDialog(Context context);





























    /**













     * Sets whether or not a disclaimer dialog should be displayed.













     */













    void setShouldShowDisclaimerDialog(Context context, boolean shouldShow);





























    /**















     * Returns an {@link Account} that's eligible for support options.















     */

































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



+6
−2




























Original line number
Diff line number
Diff line








@@ -29,6 +29,7 @@ import android.text.method.LinkMovementMethod;













import android.text.style.URLSpan;















import android.view.LayoutInflater;















import android.view.View;













import android.widget.CheckBox;















import android.widget.TextView;































import com.android.settings.R;










@@ -74,8 +75,11 @@ public final class SupportDisclaimerDialogFragment extends DialogFragment implem













    @Override















    public void onClick(DialogInterface dialog, int which) {















        final Activity activity = getActivity();













        final CheckBox doNotShow =













                (CheckBox) getDialog().findViewById(R.id.support_disclaimer_do_not_show_again);















        final SupportFeatureProvider supportFeatureProvider =















                FeatureFactory.getFactory(activity).getSupportFeatureProvider(activity);













        supportFeatureProvider.setShouldShowDisclaimerDialog(getContext(), !doNotShow.isChecked());















        final Bundle bundle = getArguments();















        supportFeatureProvider.startSupport(getActivity(),















                (Account) bundle.getParcelable(EXTRA_ACCOUNT), bundle.getInt(EXTRA_TYPE));