From 8e49d1bb6f4a0c2ab60e9e7d10079e36b8de9344 Mon Sep 17 00:00:00 2001
From: Tsung-Mao Fang <tmfang@google.com>
Date: Wed, 17 Nov 2021 13:41:19 +0800
Subject: [PATCH] USB: add help link config flag from Settings

Note: This cl is copied from the aosp/1783637 since
merge conflict issue.

Move the flag for the indication of the validity of help links to
the framework, as it is required here as well.

Set the visibility of help text in SystemUI for USB contamination
under this newly introduced flag.

Bug: 195448626
Test: adb shell dumpsys usb add-port "matrix" ufp
adb shell dumpsys usb set-contaminant-status "matrix" true

Change-Id: I50b7b447616f6b84fa170091c4e4a9dbf7ce6e45
---
 core/res/res/values/config.xml                                | 3 +++
 core/res/res/values/symbols.xml                               | 1 +
 packages/SystemUI/res/layout/contaminant_dialog.xml           | 3 ++-
 .../src/com/android/systemui/usb/UsbContaminantActivity.java  | 4 ++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 7d8bceaf89e94..14a556a472faf 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -5557,4 +5557,7 @@
 
     <!-- Determines whether SafetyCenter feature is enabled. -->
     <bool name="config_enableSafetyCenter">true</bool>
+
+    <!-- Flag indicating if help links for Settings app should be enabled. -->
+    <bool name="config_settingsHelpLinksEnabled">false</bool>
 </resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index ba4aa81766e0e..1b0fcd7ce2d67 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2338,6 +2338,7 @@
   <java-symbol type="string" name="nas_upgrade_notification_disable_action" />
   <java-symbol type="string" name="nas_upgrade_notification_learn_more_action" />
   <java-symbol type="string" name="nas_upgrade_notification_learn_more_content" />
+  <java-symbol type="bool" name="config_settingsHelpLinksEnabled" />
 
   <!-- ImfTest -->
   <java-symbol type="layout" name="auto_complete_list" />
diff --git a/packages/SystemUI/res/layout/contaminant_dialog.xml b/packages/SystemUI/res/layout/contaminant_dialog.xml
index ea6d900e8fa7f..5f8c305322552 100644
--- a/packages/SystemUI/res/layout/contaminant_dialog.xml
+++ b/packages/SystemUI/res/layout/contaminant_dialog.xml
@@ -63,7 +63,8 @@
 
         <TextView
             android:id="@+id/learnMore"
-            style="@style/USBContaminant.UserAction" />
+            style="@style/USBContaminant.UserAction"
+            android:visibility="gone" />
 
         <View
             android:layout_width="match_parent"
diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java
index aec14be9c39ea..d10e890f3c027 100644
--- a/packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java
@@ -70,6 +70,10 @@ public class UsbContaminantActivity extends Activity implements View.OnClickList
         mEnableUsb.setText(getString(R.string.usb_disable_contaminant_detection));
         mGotIt.setText(getString(R.string.got_it));
         mLearnMore.setText(getString(R.string.learn_more));
+        if (getResources().getBoolean(
+                com.android.internal.R.bool.config_settingsHelpLinksEnabled)) {
+            mLearnMore.setVisibility(View.VISIBLE);
+        }
 
         mEnableUsb.setOnClickListener(this);
         mGotIt.setOnClickListener(this);