diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2012-10-03 16:00:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-03 16:00:13 -0700 |
| commit | 74b936f50a2539a3cfc578118f57f8063d0a8ae4 (patch) | |
| tree | 933e7d3c6d5063c00f40a000344039fdfd7aa527 | |
| parent | dbb5f1c1d63cf5804990518d938a629cced8bc0e (diff) | |
| parent | 3c227133913b07c054cbd60607cf9a97c4d30a7c (diff) | |
| download | android_packages_apps_Snap-74b936f50a2539a3cfc578118f57f8063d0a8ae4.tar.gz android_packages_apps_Snap-74b936f50a2539a3cfc578118f57f8063d0a8ae4.tar.bz2 android_packages_apps_Snap-74b936f50a2539a3cfc578118f57f8063d0a8ae4.zip | |
am 6090237f: Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches
* commit '6090237f178914fa7d7eef514c2e2512d4c27847':
Revert "Add a overflow menu item to view 360-degree panorama."
| -rw-r--r-- | res/menu/operation.xml | 10 | ||||
| -rw-r--r-- | res/menu/photo.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 |
3 files changed, 4 insertions, 10 deletions
diff --git a/res/menu/operation.xml b/res/menu/operation.xml index 15e6413d1..d1791e22f 100644 --- a/res/menu/operation.xml +++ b/res/menu/operation.xml @@ -27,17 +27,15 @@ android:title="@string/share_panorama" android:visible="false" android:actionProviderClass="android.widget.ShareActionProvider" - android:showAsAction="ifRoom" /> - <item android:id="@+id/action_view_panorama" - android:title="@string/view_panorama" - android:showAsAction="never" - android:visible="false" /> + 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="android.widget.ShareActionProvider" - android:showAsAction="never" /> + android:showAsAction="never"> + </item> <item android:id="@+id/action_delete" android:icon="@drawable/ic_menu_trash_holo_light" android:title="@string/delete" diff --git a/res/menu/photo.xml b/res/menu/photo.xml index 889dc40c1..569272e68 100644 --- a/res/menu/photo.xml +++ b/res/menu/photo.xml @@ -28,9 +28,6 @@ android:visible="false" android:actionProviderClass="android.widget.ShareActionProvider" android:showAsAction="ifRoom" /> - <item android:id="@+id/action_view_panorama" - android:title="@string/view_panorama" - android:showAsAction="never" /> <item android:id="@+id/action_share" android:icon="@drawable/ic_menu_share_holo_light" android:title="@string/share" diff --git a/res/values/strings.xml b/res/values/strings.xml index ede2bed0d..61b45a28b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -111,7 +111,6 @@ <string name="cancel">Cancel</string> <string name="share">Share</string> <string name="share_panorama">Share panorama</string> - <string name="view_panorama">View in 360\u00b0</string> <string name="share_as_photo">Share as photo</string> <!-- The label shown after an image is deleted [CHAR LIMIT=16] --> |