mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 20:33:53 +01:00
Merge pull request #19 from brion/menus
Move all menu items into main action bar or overflow menu
This commit is contained in:
commit
26eedb1c38
2 changed files with 5 additions and 6 deletions
|
|
@ -66,7 +66,6 @@
|
|||
android:name=".contributions.ContributionsActivity"
|
||||
android:icon="@drawable/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:uiOptions="splitActionBarWhenNarrow"
|
||||
>
|
||||
<intent-filter>
|
||||
<category android:name="android.intent.category.LAUNCHER"/>
|
||||
|
|
|
|||
|
|
@ -2,29 +2,29 @@
|
|||
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:id="@+id/menu_share_current_image"
|
||||
android:showAsAction="always|withText"
|
||||
android:showAsAction="ifRoom|withText"
|
||||
android:icon="@android:drawable/ic_menu_share"
|
||||
android:title="@string/menu_share"
|
||||
/>
|
||||
<item android:id="@+id/menu_browser_current_image"
|
||||
android:showAsAction="always"
|
||||
android:showAsAction="never"
|
||||
android:icon="@android:drawable/ic_menu_view"
|
||||
android:title="@string/menu_open_in_browser"
|
||||
/>
|
||||
<item android:id="@+id/menu_download_current_image"
|
||||
android:showAsAction="always"
|
||||
android:showAsAction="never"
|
||||
android:icon="@drawable/ic_menu_download"
|
||||
android:title="Download"
|
||||
/>
|
||||
<item android:id="@+id/menu_retry_current_image"
|
||||
android:showAsAction="always|withText"
|
||||
android:showAsAction="ifRoom|withText"
|
||||
android:icon="@android:drawable/ic_menu_revert"
|
||||
android:title="@string/menu_retry"
|
||||
android:visible="false"
|
||||
android:enabled="false"
|
||||
/>
|
||||
<item android:id="@+id/menu_abort_current_image"
|
||||
android:showAsAction="always|withText"
|
||||
android:showAsAction="never"
|
||||
android:icon="@android:drawable/ic_menu_delete"
|
||||
android:title="@string/menu_abort"
|
||||
android:visible="false"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue