diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2012-09-27 23:50:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-27 23:50:12 -0700 |
| commit | c771afa89c6bf45ec0e34224003ea9e07b8ea1e7 (patch) | |
| tree | 1385f906995995d1f5ee12aac090e1be0af9c6f4 /res | |
| parent | 4ad1985aa0287b6edac9a76e763f54ab9656982d (diff) | |
| parent | 0f1b184926ce211f79e73a9f7f20b4b4407ea383 (diff) | |
| download | android_packages_apps_Snap-c771afa89c6bf45ec0e34224003ea9e07b8ea1e7.tar.gz android_packages_apps_Snap-c771afa89c6bf45ec0e34224003ea9e07b8ea1e7.tar.bz2 android_packages_apps_Snap-c771afa89c6bf45ec0e34224003ea9e07b8ea1e7.zip | |
am 2e8472f3: Merge "Update to sharing panorama" into gb-ub-photos-arches
* commit '2e8472f304737acc3fbeb167b1b6f660f111f5c7':
Update to sharing panorama
Diffstat (limited to 'res')
| -rw-r--r-- | res/menu/operation.xml | 12 | ||||
| -rw-r--r-- | res/menu/photo.xml | 12 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
3 files changed, 23 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" diff --git a/res/values/strings.xml b/res/values/strings.xml index ed121d4ac..7323a7d4b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -110,6 +110,8 @@ <string name="confirm">Confirm</string> <string name="cancel">Cancel</string> <string name="share">Share</string> + <string name="share_panorama">Share panorama</string> + <string name="share_as_photo">Share as photo</string> <!-- The label shown after an image is deleted [CHAR LIMIT=16] --> <string name="deleted">Deleted</string> |