Merge remote-tracking branch 'refs/remotes/origin/2.8-release'

This commit is contained in:
misaochan 2018-07-11 00:45:02 +10:00
commit f1f41e59f7
14 changed files with 78 additions and 197 deletions

View file

@ -38,16 +38,8 @@
</PreferenceCategory>
<PreferenceCategory
android:title="@string/preference_category_location">
<SwitchPreference
android:key="allowGps"
android:title="@string/allow_gps"
android:defaultValue="false"
android:summary="@string/allow_gps_summary" />
</PreferenceCategory>
<!-- The key 'allowGps' was used before and has since been removed based on the discussion at #1599.
Do not reuse this key unless you revive the same feature with the changes mentioned at #1599.-->
<PreferenceCategory
android:title="@string/preference_category_feedback">