Merge "USB: move help config flag to FW"
This commit is contained in:
committed by
Android (Google) Code Review
commit
e9ca51918c
@@ -3976,7 +3976,7 @@
|
|||||||
android:theme="@style/Transparent"
|
android:theme="@style/Transparent"
|
||||||
android:permission="android.permission.DUMP"
|
android:permission="android.permission.DUMP"
|
||||||
android:excludeFromRecents="true"
|
android:excludeFromRecents="true"
|
||||||
android:enabled="@bool/config_has_help" />
|
android:enabled="@*android:bool/config_settingsHelpLinksEnabled" />
|
||||||
|
|
||||||
<activity android:name=".applications.autofill.AutofillPickerActivity"
|
<activity android:name=".applications.autofill.AutofillPickerActivity"
|
||||||
android:excludeFromRecents="true"
|
android:excludeFromRecents="true"
|
||||||
|
@@ -312,9 +312,6 @@
|
|||||||
<!-- Whether swipe security option is hidden or not -->
|
<!-- Whether swipe security option is hidden or not -->
|
||||||
<bool name="config_hide_swipe_security_option">false</bool>
|
<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.
|
<!-- Whether Wi-Fi settings should be shown or not.
|
||||||
This also controls whether Wi-fi related sub-settings (e.g. Wi-Fi preferences) will
|
This also controls whether Wi-fi related sub-settings (e.g. Wi-Fi preferences) will
|
||||||
surface in search results or not.-->
|
surface in search results or not.-->
|
||||||
|
Reference in New Issue
Block a user