Upstream merge

Internal permission change
Fix url adder
This commit is contained in:
NerdNumber9
2017-05-04 23:38:17 -04:00
parent 3f758d5981
commit 9dbb59f337
616 changed files with 4186 additions and 230 deletions

5
app/src/main/res/xml/pref_general.xml Normal file → Executable file
View File

@@ -71,6 +71,11 @@
android:title="@string/default_category"
android:summary="@string/default_category_summary"/>
<exh.ui.lock.LockPreference
android:title="Application lock"
android:key="pref_app_lock"
android:persistent="false"/>
</PreferenceScreen>
</PreferenceScreen>