commit e9ca51918c1c9f26722a8b8a6ac76a0359636c1b
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jan 13 08:38:44 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 13 08:38:44 2022 +0000
tree 62b67cf45c5cf7311c29802e7c659430fa47b973
parent b95618bed076476b7830ff859f1d54b04df38a86
parent 98b9b3438d9ceba5f5842af5211a67b063cb9220

Merge "USB: move help config flag to FW"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8e3378a..66e4442 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3976,7 +3976,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"

res/values/config.xml

diff --git a/res/values/config.xml b/res/values/config.xml
index 0065a65..fe9f42d 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.-->