Merge "Fix a deprecated config string name for the storage manager settings." into nyc-mr1-dev
This commit is contained in:
@@ -3004,7 +3004,7 @@
|
|||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<activity android:name="Settings$AutomaticStorageManagerSettingsActivity"
|
<activity android:name="Settings$AutomaticStorageManagerSettingsActivity"
|
||||||
android:exported="@bool/config_has_storage_manager"
|
android:exported="@bool/config_storage_manager_settings_enabled"
|
||||||
android:label="@string/automatic_storage_manager_settings"
|
android:label="@string/automatic_storage_manager_settings"
|
||||||
android:taskAffinity="">
|
android:taskAffinity="">
|
||||||
<intent-filter android:priority="1">
|
<intent-filter android:priority="1">
|
||||||
|
@@ -43,9 +43,6 @@
|
|||||||
<!-- Whether none security option is hide or not (country specific). -->
|
<!-- Whether none security option is hide or not (country specific). -->
|
||||||
<bool name="config_hide_none_security_option">false</bool>
|
<bool name="config_hide_none_security_option">false</bool>
|
||||||
|
|
||||||
<!--Whether the storage manager exists. -->
|
|
||||||
<bool name="config_has_storage_manager">false</bool>
|
|
||||||
|
|
||||||
<!--Whether help links are defined. -->
|
<!--Whether help links are defined. -->
|
||||||
<bool name="config_has_help">false</bool>
|
<bool name="config_has_help">false</bool>
|
||||||
</resources>
|
</resources>
|
||||||
|
Reference in New Issue
Block a user