mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #19 from brion/menus

Browse source 
Move all menu items into main action bar or overflow menu
This commit is contained in:
Brion Vibber 2013-05-16 14:21:07 -07:00
commit 26eedb1c38
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
commons/AndroidManifest.xml
View file

@ -66,7 +66,6 @@
android:name=".contributions.ContributionsActivity" android:name=".contributions.ContributionsActivity"
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:uiOptions="splitActionBarWhenNarrow"
> >
<intent-filter> <intent-filter>
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER"/>

10
commons/res/menu/fragment_image_detail.xml
View file

@ -2,29 +2,29 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_share_current_image" <item android:id="@+id/menu_share_current_image"
android:showAsAction="always|withText" android:showAsAction="ifRoom|withText"
android:icon="@android:drawable/ic_menu_share" android:icon="@android:drawable/ic_menu_share"
android:title="@string/menu_share" android:title="@string/menu_share"
/> />
<item android:id="@+id/menu_browser_current_image" <item android:id="@+id/menu_browser_current_image"
android:showAsAction="always" android:showAsAction="never"
android:icon="@android:drawable/ic_menu_view" android:icon="@android:drawable/ic_menu_view"
android:title="@string/menu_open_in_browser" android:title="@string/menu_open_in_browser"
/> />
<item android:id="@+id/menu_download_current_image" <item android:id="@+id/menu_download_current_image"
android:showAsAction="always" android:showAsAction="never"
android:icon="@drawable/ic_menu_download" android:icon="@drawable/ic_menu_download"
android:title="Download" android:title="Download"
/> />
<item android:id="@+id/menu_retry_current_image" <item android:id="@+id/menu_retry_current_image"
android:showAsAction="always|withText" android:showAsAction="ifRoom|withText"
android:icon="@android:drawable/ic_menu_revert" android:icon="@android:drawable/ic_menu_revert"
android:title="@string/menu_retry" android:title="@string/menu_retry"
android:visible="false" android:visible="false"
android:enabled="false" android:enabled="false"
/> />
<item android:id="@+id/menu_abort_current_image" <item android:id="@+id/menu_abort_current_image"
android:showAsAction="always|withText" android:showAsAction="never"
android:icon="@android:drawable/ic_menu_delete" android:icon="@android:drawable/ic_menu_delete"
android:title="@string/menu_abort" android:title="@string/menu_abort"
android:visible="false" android:visible="false"