Merge remote-tracking branch 'upstream/dev' into patch1_ui

This commit is contained in:
Vasiliy 2019-02-12 10:21:03 +02:00
commit dc8d304a7a
147 changed files with 3387 additions and 1765 deletions

View file

@ -3,17 +3,18 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/switch_mode"
android:icon="@drawable/list"
android:icon="?attr/ic_grid"
android:title="@string/grid"
app:showAsAction="ifRoom" />
<item android:id="@+id/action_settings"
app:showAsAction="never"
android:title="@string/settings"/>
<item android:id="@+id/clear_list"
android:visible="false"
android:icon="@drawable/ic_delete_sweep_white_24dp"
app:showAsAction="ifRoom"
android:title="@string/clear_finished_download"/>
android:icon="?attr/ic_delete"
android:title="@string/clear_finished_download"
app:showAsAction="ifRoom" />
<item android:id="@+id/action_settings"
android:title="@string/settings"
app:showAsAction="never" />
</menu>