diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-06-23 15:09:31 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-23 15:09:31 -0700 |
| commit | 03dbeabed74dce7485bcb3f4807fe4105e96830a (patch) | |
| tree | 20aac5a357ad2b6e8183a407f71c02e7854f620b /src/com/android/camera/CameraActivity.java | |
| parent | 5bf10cc095044440c95c704307c79370f0510f6c (diff) | |
| parent | 8b9bdf4f613b75f56385043b36b3314fe160d9c1 (diff) | |
| download | android_packages_apps_Snap-03dbeabed74dce7485bcb3f4807fe4105e96830a.tar.gz android_packages_apps_Snap-03dbeabed74dce7485bcb3f4807fe4105e96830a.tar.bz2 android_packages_apps_Snap-03dbeabed74dce7485bcb3f4807fe4105e96830a.zip | |
Merge "Merge tag 'android-4.4.3_r1' into HEAD"
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 33fe20ae3..a631becae 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -671,8 +671,7 @@ public class CameraActivity extends Activity | SUPPORT_SHARE | SUPPORT_SHOW_ON_MAP; break; case LocalData.LOCAL_VIDEO: - supported |= SUPPORT_DELETE | SUPPORT_INFO | SUPPORT_TRIM - | SUPPORT_SHARE; + supported |= SUPPORT_DELETE | SUPPORT_INFO | SUPPORT_SHARE; break; case LocalData.LOCAL_PHOTO_SPHERE: supported |= SUPPORT_DELETE | SUPPORT_ROTATE | SUPPORT_INFO |