diff options
| author | Erin Dahlgren <edahlgren@google.com> | 2014-01-29 18:13:34 -0800 |
|---|---|---|
| committer | Erin Dahlgren <edahlgren@google.com> | 2014-01-30 15:16:39 -0800 |
| commit | 3488188fa8dff9a90021446e6ed4f9c321c4d4db (patch) | |
| tree | 9de6413858936a6d295a563837236a3e406f8076 /src/com/android | |
| parent | bd5341b04a2982885d079b5f6a87a91e84603efd (diff) | |
| download | android_packages_apps_Camera2-3488188fa8dff9a90021446e6ed4f9c321c4d4db.tar.gz android_packages_apps_Camera2-3488188fa8dff9a90021446e6ed4f9c321c4d4db.tar.bz2 android_packages_apps_Camera2-3488188fa8dff9a90021446e6ed4f9c321c4d4db.zip | |
Log swipes out of filmstrip.
Bug: 12589465
Change-Id: I13b20b3e56b1ae4285ecc00ca4c2fb5a42fa75ed
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 6 | ||||
| -rw-r--r-- | src/com/android/camera/filmstrip/FilmstripContentPanel.java | 5 | ||||
| -rw-r--r-- | src/com/android/camera/widget/FilmstripLayout.java | 3 |
3 files changed, 14 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index a4b011c69..df3483490 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -431,6 +431,12 @@ public class CameraActivity extends Activity new FilmstripContentPanel.Listener() { @Override + public void onSwipeOut() { + UsageStatistics.changeScreen(eventprotos.NavigationChange.Mode.PHOTO_CAPTURE, + eventprotos.CameraEvent.InteractionCause.SWIPE_RIGHT); + } + + @Override public void onFilmstripHidden() { mFilmstripVisible = false; CameraActivity.this.setFilmstripUiVisibility(false); diff --git a/src/com/android/camera/filmstrip/FilmstripContentPanel.java b/src/com/android/camera/filmstrip/FilmstripContentPanel.java index 6db8f65df..86c1109ff 100644 --- a/src/com/android/camera/filmstrip/FilmstripContentPanel.java +++ b/src/com/android/camera/filmstrip/FilmstripContentPanel.java @@ -30,6 +30,11 @@ public interface FilmstripContentPanel { interface Listener extends FilmstripController.FilmstripListener { /** + * Callback on a swipe out of filmstrip. + */ + public void onSwipeOut(); + + /** * Callback when the filmstrip becomes invisible or gone. */ public void onFilmstripHidden(); diff --git a/src/com/android/camera/widget/FilmstripLayout.java b/src/com/android/camera/widget/FilmstripLayout.java index b7a10f088..39ed08cf5 100644 --- a/src/com/android/camera/widget/FilmstripLayout.java +++ b/src/com/android/camera/widget/FilmstripLayout.java @@ -364,6 +364,9 @@ public class FilmstripLayout extends FrameLayout implements FilmstripContentPane } if (mSwipeTrend < 0) { hideFilmstrip(); + if (mListener != null) { + mListener.onSwipeOut(); + } } else if (mSwipeTrend > 0) { showFilmstrip(); } else { |