summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui/FilmStripView.java
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2014-10-13 18:34:37 -0700
committerByunghun Jeon <bjeon@codeaurora.org>2014-11-19 17:53:26 -0800
commita19529b701c6d74b91657441cdb7c3463fa7e8c6 (patch)
treeec2840164d498e39fec70b4735e1523ab3cc601d /src/com/android/camera/ui/FilmStripView.java
parenta41a7928433d60533548c115f3741a980159e656 (diff)
downloadandroid_packages_apps_Snap-a19529b701c6d74b91657441cdb7c3463fa7e8c6.tar.gz
android_packages_apps_Snap-a19529b701c6d74b91657441cdb7c3463fa7e8c6.tar.bz2
android_packages_apps_Snap-a19529b701c6d74b91657441cdb7c3463fa7e8c6.zip
SnapdragonCamera: Add preview thumbnail button
Add preview thumbnail button and touch it to go to gallery Change-Id: Ib80ef94c677c204d7f0826356792aba2aa11d4d1
Diffstat (limited to 'src/com/android/camera/ui/FilmStripView.java')
-rw-r--r--src/com/android/camera/ui/FilmStripView.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 8da49a10a..7f197caf4 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -106,6 +106,8 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
private boolean mSendToPreviewMenu;
private boolean mSendToMenu;
private boolean mReset;
+ private boolean mIsLoaded = false;
+
/**
* Common interface for all images in the filmstrip.
*/
@@ -1733,7 +1735,10 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
mDataAdapter.setListener(new DataAdapter.Listener() {
@Override
public void onDataLoaded() {
- reload();
+ mActivity.updatePreviewThumbnail();
+ if (!mIsLoaded)
+ reload();
+ mIsLoaded = true;
}
@Override
@@ -1749,6 +1754,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
return;
}
updateInsertion(dataID);
+ mActivity.updatePreviewThumbnailForVideo();
}
@Override
@@ -1807,9 +1813,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
&& deltaX < mSlop * (-1)) {
// intercept left swipe
if (Math.abs(deltaX) >= Math.abs(deltaY) * 2) {
- UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
- UsageStatistics.ACTION_FILMSTRIP, null);
- return true;
+ return false;
}
}
}