diff options
| author | George Mount <mount@google.com> | 2013-08-07 18:00:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-07 18:00:46 +0000 |
| commit | 5843ba18bfd1ed81bdfde267af550aec30936a58 (patch) | |
| tree | 35abdcc6dd3fb405d2197fa7d05755d812ea34a3 /src/com/android/camera | |
| parent | e0ebaf27c5694be2bce98bb6c271bf061d946cb4 (diff) | |
| parent | d1763a30cb0191e926467dc529e252b545ec9a9f (diff) | |
| download | android_packages_apps_Gallery2-5843ba18bfd1ed81bdfde267af550aec30936a58.tar.gz android_packages_apps_Gallery2-5843ba18bfd1ed81bdfde267af550aec30936a58.tar.bz2 android_packages_apps_Gallery2-5843ba18bfd1ed81bdfde267af550aec30936a58.zip | |
Merge "Move PanoramaViewHelper out of LightCycleHelper" into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android/camera')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/data/LocalData.java | 3 | ||||
| -rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 7114f6191..d4e7f1865 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -55,8 +55,8 @@ import com.android.camera.ui.FilmStripView; import com.android.gallery3d.R; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.util.LightCycleHelper; +import com.android.gallery3d.util.PanoramaViewHelper; import com.android.gallery3d.util.RefocusHelper; -import com.android.gallery3d.util.LightCycleHelper.PanoramaViewHelper; public class CameraActivity extends Activity implements CameraSwitchListener { diff --git a/src/com/android/camera/data/LocalData.java b/src/com/android/camera/data/LocalData.java index 852066bd3..74055230f 100644 --- a/src/com/android/camera/data/LocalData.java +++ b/src/com/android/camera/data/LocalData.java @@ -28,7 +28,6 @@ import android.media.MediaMetadataRetriever; import android.net.Uri; import android.os.AsyncTask; import android.provider.MediaStore; -import android.provider.MediaStore.Images; import android.provider.MediaStore.Images.ImageColumns; import android.provider.MediaStore.Video.VideoColumns; import android.util.Log; @@ -44,7 +43,7 @@ import com.android.camera.data.PanoramaMetadataLoader.PanoramaMetadataCallback; import com.android.camera.ui.FilmStripView; import com.android.gallery3d.R; import com.android.gallery3d.util.LightCycleHelper.PanoramaMetadata; -import com.android.gallery3d.util.LightCycleHelper.PanoramaViewHelper; +import com.android.gallery3d.util.PanoramaViewHelper; import java.io.File; import java.util.Comparator; diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index f7f388341..8bc46b0d4 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -34,7 +34,7 @@ import android.widget.Scroller; import com.android.camera.ui.FilmStripView.ImageData.PanoramaSupportCallback; import com.android.gallery3d.R; -import com.android.gallery3d.util.LightCycleHelper.PanoramaViewHelper; +import com.android.gallery3d.util.PanoramaViewHelper; public class FilmStripView extends ViewGroup { @SuppressWarnings("unused") |