diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2012-09-27 23:48:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-27 23:48:45 -0700 |
| commit | 0f1b184926ce211f79e73a9f7f20b4b4407ea383 (patch) | |
| tree | 1385f906995995d1f5ee12aac090e1be0af9c6f4 /res/menu | |
| parent | dcd0a794cd6d9d6726a3c285b8a00a295293a27c (diff) | |
| parent | 2f589c8a35aee7fe17e899e2a3872f1473f3a176 (diff) | |
| download | android_packages_apps_Snap-0f1b184926ce211f79e73a9f7f20b4b4407ea383.tar.gz android_packages_apps_Snap-0f1b184926ce211f79e73a9f7f20b4b4407ea383.tar.bz2 android_packages_apps_Snap-0f1b184926ce211f79e73a9f7f20b4b4407ea383.zip | |
Merge "Update to sharing panorama" into gb-ub-photos-arches
Diffstat (limited to 'res/menu')
| -rw-r--r-- | res/menu/operation.xml | 12 | ||||
| -rw-r--r-- | res/menu/photo.xml | 12 |
2 files changed, 21 insertions, 3 deletions
diff --git a/res/menu/operation.xml b/res/menu/operation.xml index aeef78fdd..984a94432 100644 --- a/res/menu/operation.xml +++ b/res/menu/operation.xml @@ -19,12 +19,22 @@ android:icon="@drawable/ic_menu_ptp_holo_light" android:showAsAction="always|withText" android:visible="false" /> + <!-- Ideally, showAsAction for share_panorama and share should be reversed. + But, if share_panorama is set to never, it doesn't seem to get promoted + to the action bar and stays on the overflow menu. --> + <item android:id="@+id/action_share_panorama" + android:icon="@drawable/ic_menu_share_holo_light" + android:title="@string/share_panorama" + android:visible="false" + android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider" + android:showAsAction="ifRoom"> + </item> <item android:id="@+id/action_share" android:icon="@drawable/ic_menu_share_holo_light" android:title="@string/share" android:visible="false" android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider" - android:showAsAction="ifRoom"> + android:showAsAction="never"> </item> <item android:id="@+id/action_delete" android:icon="@drawable/ic_menu_trash_holo_light" diff --git a/res/menu/photo.xml b/res/menu/photo.xml index 0dcc3f70e..5fe5187d9 100644 --- a/res/menu/photo.xml +++ b/res/menu/photo.xml @@ -19,13 +19,21 @@ android:icon="@drawable/ic_menu_ptp_holo_light" android:showAsAction="always|withText" android:visible="false" /> + <!-- Ideally, showAsAction for share_panorama and share should be reversed. + But, if share_panorama is set to never, it doesn't seem to get promoted + to the action bar and stays on the overflow menu. --> + <item android:id="@+id/action_share_panorama" + android:icon="@drawable/ic_menu_share_holo_light" + android:title="@string/share_panorama" + android:visible="false" + android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider" + android:showAsAction="ifRoom" /> <item android:id="@+id/action_share" android:icon="@drawable/ic_menu_share_holo_light" android:title="@string/share" - android:enabled="true" android:visible="false" android:actionProviderClass="com.actionbarsherlock.widget.ShareActionProvider" - android:showAsAction="ifRoom" /> + android:showAsAction="never" /> <item android:id="@+id/action_grid" android:icon="@android:drawable/ic_dialog_dialer" android:title="@string/switch_photo_grid" |