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

resolve merge conflicts of 2c826d7 to master

Browse Source 
Change-Id: I2b2a1b195f07143690f5902b6a6f78ba1b30d7ea
This commit is contained in:
Daniel Nishi
2016-09-27 10:00:09 -07:00
parent 88110e21f6 2c826d7ace
commit 87559ef035
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>
<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">

3
res/values/bools.xml
View File

@@ -46,9 +46,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 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>