Merge branch 'master' of github.com:nicolas-raoul/apps-android-commons

This commit is contained in:
Nicolas Raoul 2016-02-16 17:13:59 +09:00
commit 1fdad8a1aa
12 changed files with 430 additions and 136 deletions

View file

@ -93,6 +93,9 @@
<string name="menu_download">Download</string>
<string name="preference_license">License</string>
<string name="allow_gps">Automatically get current location</string>
<string name="allow_gps_summary">Retrieve current location to offer category suggestions if image is not geotagged</string>
<!-- These three are semi-legacy entries, and should be changed in future -->
<string name="license_name_cc_by_sa">CC\u00A0Attribution-ShareAlike\u00A03.0</string>
<string name="license_name_cc_by">CC\u00A0Attribution\u00A03.0</string>

View file

@ -7,6 +7,11 @@
android:title="@string/preference_license"
android:defaultValue="CC BY-SA"
/>
<CheckBoxPreference
android:title="@string/allow_gps"
android:defaultValue="false"
android:summary="@string/allow_gps_summary"
android:key="allowGps" />
</PreferenceScreen>