bitmessage/Abit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/SyncAdapter

Browse Source 
Conflicts:
	app/src/main/java/ch/dissem/apps/abit/AbstractItemListFragment.java
	app/src/main/java/ch/dissem/apps/abit/MessageListActivity.java
	app/src/main/java/ch/dissem/apps/abit/MessageListFragment.java
	app/src/main/res/values-de/strings.xml
	app/src/main/res/values/strings.xml
This commit is contained in:
Christian Basler
2015-10-18 19:00:51 +02:00
parent fd415b9c8c 32a36e57f6
commit e8de311d7e
75 changed files with 387 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/res/menu/message.xml
View File

@@ -5,21 +5,21 @@
<item
android:id="@+id/reply"
app:showAsAction="ifRoom"
android:icon="@drawable/ic_action_placeholder"
android:icon="@drawable/ic_action_reply"
android:title="@string/reply"/>
<item
android:id="@+id/delete"
app:showAsAction="ifRoom"
android:icon="@drawable/ic_action_placeholder"
android:icon="@drawable/ic_action_delete"
android:title="@string/delete"/>
<item
android:id="@+id/mark_unread"
app:showAsAction="ifRoom"
android:icon="@drawable/ic_action_placeholder"
android:icon="@drawable/ic_action_mark_unread"
android:title="@string/mark_unread"/>
<item
android:id="@+id/archive"
app:showAsAction="ifRoom"
android:icon="@drawable/ic_action_placeholder"
android:icon="@drawable/ic_action_archive"
android:title="@string/archive"/>
</menu>

2
app/src/main/res/menu/message_list.xml
View File

@@ -5,7 +5,7 @@
<item
android:id="@+id/empty_trash"
app:showAsAction="never"
android:icon="@drawable/ic_action_placeholder"
android:icon="@drawable/ic_action_delete"
android:title="@string/empty_trash"
android:visible="false"/>
</menu>