Merge branch 'develop' into chameleon

This commit is contained in:
Mariotaku Lee 2016-12-18 10:41:28 +08:00
commit 7f3d429017
3 changed files with 5 additions and 3 deletions

View File

@ -192,7 +192,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
}
override fun onDestroy() {
if (!shouldSkipDraft && hasComposingStatus()) {
if (!shouldSkipDraft && hasComposingStatus() && isFinishing) {
saveToDrafts()
Toast.makeText(this, R.string.status_saved_to_draft, Toast.LENGTH_SHORT).show()
}

View File

@ -777,6 +777,8 @@
<string name="provider_gnusocial_de">GNU Social.de</string>
<string name="new_document_api">New Document API</string>
<string name="new_document_api_summary">Open profile and media in new task</string>
<string name="preference_multitasking">Multitasking</string>
<string name="preference_multitasking_summary">Open profile and media in new task</string>
<string name="drawer_toggle">Drawer toggle</string>
<!-- GNU social group like https://quitter.se/group/qvitter -->
<string name="group">Group</string>

View File

@ -74,8 +74,8 @@
android:defaultValue="true"
android:enabled="@bool/support_new_document_intent"
android:key="new_document_api"
android:summary="@string/new_document_api_summary"
android:title="@string/new_document_api"/>
android:summary="@string/preference_multitasking_summary"
android:title="@string/preference_multitasking"/>
</PreferenceCategory>