PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "resolve merge conflicts of 2c826d7 to master"

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-27 18:46:15 +00:00
committed by Android (Google) Code Review
parent 8c46585218 87559ef035
commit eabf36e233
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -3014,7 +3014,7 @@
</activity>
<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:taskAffinity="">
<intent-filter android:priority="1">

3
res/values/bools.xml
View File

@@ -46,9 +46,6 @@
<!-- Whether swipe security option is hidden or not -->
<bool name="config_hide_swipe_security_option">false</bool>
<!--Whether the storage manager exists. -->
<bool name="config_has_storage_manager">false</bool>
<!--Whether help links are defined. -->
<bool name="config_has_help">false</bool>
</resources>