summaryrefslogtreecommitdiffstats
path: root/src_pd
diff options
context:
space:
mode:
authorPaul Rohde <codelogic@google.com>2015-01-08 18:47:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-08 18:47:34 +0000
commit10ab1989c2475d137a6db36a4d78d8b68fadf96b (patch)
tree33273d60a9fec5accd1acb5f34a7a9cff03b4ce4 /src_pd
parente250f88bc01267f03ae3ae192698b0f07c9e425b (diff)
parent8ee16b8a323ffa20e6fb1270d498ec445f64defc (diff)
downloadandroid_packages_apps_Camera2-10ab1989c2475d137a6db36a4d78d8b68fadf96b.tar.gz
android_packages_apps_Camera2-10ab1989c2475d137a6db36a4d78d8b68fadf96b.tar.bz2
android_packages_apps_Camera2-10ab1989c2475d137a6db36a4d78d8b68fadf96b.zip
Merge "Refactor the filmstrip backing data." into ub-camera-haleakala
Diffstat (limited to 'src_pd')
-rw-r--r--src_pd/com/android/camera/util/ReleaseHelper.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src_pd/com/android/camera/util/ReleaseHelper.java b/src_pd/com/android/camera/util/ReleaseHelper.java
index dd41125b8..a72bb39a0 100644
--- a/src_pd/com/android/camera/util/ReleaseHelper.java
+++ b/src_pd/com/android/camera/util/ReleaseHelper.java
@@ -18,7 +18,7 @@ package com.android.camera.util;
import android.app.Activity;
-import com.android.camera.data.LocalData;
+import com.android.camera.data.FilmstripItem;
import com.android.camera.settings.SettingsManager;
public class ReleaseHelper {
@@ -31,7 +31,7 @@ public class ReleaseHelper {
callback.onCallback(null);
}
- public static boolean shouldShowReleaseInfoDialogOnShare(LocalData data) {
+ public static boolean shouldShowReleaseInfoDialogOnShare(FilmstripItem data) {
return false;
}