PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fan Zhang
2016-06-20 16:35:51 +00:00
committed by Android (Google) Code Review
parent 2a817d97fe 0beb695999
commit d04b49649e
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/layout/support_disclaimer_content.xml
View File

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

3
res/values/strings.xml
View File

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

5
src/com/android/settings/overlay/SupportFeatureProvider.java
View File

@@ -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.
*/

4
src/com/android/settings/support/SupportDisclaimerDialogFragment.java
View File

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