From a2bd32b397a751f7e1d7257d1051b88f7a443f12 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Thu, 12 May 2016 13:25:54 -0700 Subject: [PATCH] Display disclaimer dialog before starting support. Bug: 28656426 Bug: 28141203 Change-Id: I4fc0d922170badcf5f215fe906fb616c11cf8270 --- res/layout/support_disclaimer_content.xml | 29 +++++ res/values/strings.xml | 7 ++ .../dashboard/SupportItemAdapter.java | 61 +++++++--- .../overlay/SupportFeatureProvider.java | 12 +- .../SupportDisclaimerDialogFragment.java | 114 ++++++++++++++++++ 5 files changed, 202 insertions(+), 21 deletions(-) create mode 100644 res/layout/support_disclaimer_content.xml create mode 100644 src/com/android/settings/support/SupportDisclaimerDialogFragment.java diff --git a/res/layout/support_disclaimer_content.xml b/res/layout/support_disclaimer_content.xml new file mode 100644 index 00000000000..c7a56891c77 --- /dev/null +++ b/res/layout/support_disclaimer_content.xml @@ -0,0 +1,29 @@ + + + + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index 07f36e1b803..9e6f77e401b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7532,6 +7532,13 @@ Can\'t access your account? + + + Send system information + + + To help address your issue quickly, we need system information for diagnosis. + Work profile settings diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java index d3862b4ecd9..4956464d5fb 100644 --- a/src/com/android/settings/dashboard/SupportItemAdapter.java +++ b/src/com/android/settings/dashboard/SupportItemAdapter.java @@ -20,6 +20,7 @@ import android.annotation.DrawableRes; import android.annotation.LayoutRes; import android.annotation.StringRes; import android.app.Activity; +import android.app.DialogFragment; import android.content.Intent; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -30,6 +31,7 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settings.overlay.SupportFeatureProvider; +import com.android.settings.support.SupportDisclaimerDialogFragment; import java.util.ArrayList; import java.util.List; @@ -247,26 +249,45 @@ public final class SupportItemAdapter extends RecyclerView.Adapter