From adc5555acfb214b172571d0ff6a4e56cdb9da6c9 Mon Sep 17 00:00:00 2001
From: Matthew Fritze <mfritze@google.com>
Date: Thu, 29 Sep 2016 15:03:28 -0700
Subject: [PATCH] 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
---
 res/layout/support_disclaimer_content.xml                            | 3 +--
 res/values/strings.xml                                               | 3 ---
 src/com/android/settings/overlay/SupportFeatureProvider.java         | 5 +++++
 .../android/settings/support/SupportDisclaimerDialogFragment.java    | 4 ++++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/res/layout/support_disclaimer_content.xml b/res/layout/support_disclaimer_content.xml
index 44e5bcd018..d6697c3657 100644
--- a/res/layout/support_disclaimer_content.xml
+++ b/res/layout/support_disclaimer_content.xml
@@ -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"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 299ef24847..05739df30c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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>
 
diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java
index 45713e4eef..f211c1292f 100644
--- a/src/com/android/settings/overlay/SupportFeatureProvider.java
+++ b/src/com/android/settings/overlay/SupportFeatureProvider.java
@@ -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();
 }
diff --git a/src/com/android/settings/support/SupportDisclaimerDialogFragment.java b/src/com/android/settings/support/SupportDisclaimerDialogFragment.java
index db74f0fb97..f8b859ca39 100644
--- a/src/com/android/settings/support/SupportDisclaimerDialogFragment.java
+++ b/src/com/android/settings/support/SupportDisclaimerDialogFragment.java
@@ -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)
-- 
2.11.0