diff options
author | Doris Liu <tianliu@google.com> | 2013-06-07 22:32:33 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-07 22:32:33 +0000 |
commit | 5644a35e0fa484565cfe27e2c5d4cbcca1ddedd9 (patch) | |
tree | 36ad8373649f125b9614db8ef80efc0c0bdb5a52 /src/com/android/camera/NewVideoUI.java | |
parent | d483ca1f81704f7a1c6a310bd2ba289aef2ffb65 (diff) | |
parent | f7758b6cc5ab00ad3955bf9c98af76559644a477 (diff) | |
download | android_packages_apps_Snap-5644a35e0fa484565cfe27e2c5d4cbcca1ddedd9.tar.gz android_packages_apps_Snap-5644a35e0fa484565cfe27e2c5d4cbcca1ddedd9.tar.bz2 android_packages_apps_Snap-5644a35e0fa484565cfe27e2c5d4cbcca1ddedd9.zip |
Merge "Add enable/disable swiping to filmstrip" into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android/camera/NewVideoUI.java')
-rw-r--r-- | src/com/android/camera/NewVideoUI.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/camera/NewVideoUI.java b/src/com/android/camera/NewVideoUI.java index 915269032..02c8e1c7a 100644 --- a/src/com/android/camera/NewVideoUI.java +++ b/src/com/android/camera/NewVideoUI.java @@ -475,14 +475,17 @@ public class NewVideoUI implements PieRenderer.PieListener, // PieListener @Override public void onPieOpened(int centerX, int centerY) { - // TODO: mActivity.cancelActivityTouchHandling(); - // mActivity.setSwipingEnabled(false); + setSwipingEnabled(false); dismissPopup(false, true); } @Override public void onPieClosed() { - // TODO: mActivity.setSwipingEnabled(true); + setSwipingEnabled(true); + } + + public void setSwipingEnabled(boolean enable) { + mActivity.setSwipingEnabled(enable); } public void showPreviewBorder(boolean enable) { |