USB: move help config flag to FW
Note: This cl is copied from aosp/1785174 since
merge conflict issue.
Move the flag for the indication of the validity of help links
to framework because it is also needed for SystemUI.
config_has_help will be replaced by config_settingsHelpLinksEnabled
in frameworks.
Test: $ adb shell dumpsys usb add-port "matrix" ufp
$ adb shell dumpsys usb set-contaminant-status "matrix" true
Bug: 195448626
Change-Id: Id9b0c196c9a07085c790d5f4366bb1fec635d6b1
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 31a7970..0e7f38c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3882,7 +3882,7 @@
android:theme="@style/Transparent"
android:permission="android.permission.DUMP"
android:excludeFromRecents="true"
- android:enabled="@bool/config_has_help" />
+ android:enabled="@*android:bool/config_settingsHelpLinksEnabled" />
<activity android:name=".applications.autofill.AutofillPickerActivity"
android:excludeFromRecents="true"
diff --git a/res/values/config.xml b/res/values/config.xml
index d83e10d..a97e0b2 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -312,9 +312,6 @@
<!-- Whether swipe security option is hidden or not -->
<bool name="config_hide_swipe_security_option">false</bool>
- <!--Whether help links are defined. -->
- <bool name="config_has_help">false</bool>
-
<!-- Whether Wi-Fi settings should be shown or not.
This also controls whether Wi-fi related sub-settings (e.g. Wi-Fi preferences) will
surface in search results or not.-->