diff options
| author | Alan Newberger <alann@google.com> | 2013-12-04 15:51:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-04 15:51:40 -0800 |
| commit | d8732fc2277b120a4b7b0e978f6a8c18ebc202ed (patch) | |
| tree | 14cb9525be2ccd3901dd65182e929f192c305fc7 | |
| parent | 2ecb594418aedae10d053512f54d8c0a42a494b6 (diff) | |
| parent | f9b2d0c7775b43996a9b9f51c6fc5ab266042c72 (diff) | |
| download | android_packages_apps_Camera2-d8732fc2277b120a4b7b0e978f6a8c18ebc202ed.tar.gz android_packages_apps_Camera2-d8732fc2277b120a4b7b0e978f6a8c18ebc202ed.tar.bz2 android_packages_apps_Camera2-d8732fc2277b120a4b7b0e978f6a8c18ebc202ed.zip | |
am f9b2d0c7: Remove TRIM support
* commit 'f9b2d0c7775b43996a9b9f51c6fc5ab266042c72':
Remove TRIM support
| -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 e7ccbb1e5..8f2b04b4f 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -657,8 +657,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 |