diff options
| author | Angus Kong <shkong@google.com> | 2013-08-14 16:07:54 -0700 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2013-08-15 16:54:25 -0700 |
| commit | 4ff5a1ab360577c6a7ec953f9197778c84c9d334 (patch) | |
| tree | 8dc83a1808a8772f4d86e48af558ba18e6d34d49 /src/com/android/camera/data | |
| parent | 394023fb7e3c8d07d4aeafc30bf4b66ed481ebb7 (diff) | |
| download | android_packages_apps_Snap-4ff5a1ab360577c6a7ec953f9197778c84c9d334.tar.gz android_packages_apps_Snap-4ff5a1ab360577c6a7ec953f9197778c84c9d334.tar.bz2 android_packages_apps_Snap-4ff5a1ab360577c6a7ec953f9197778c84c9d334.zip | |
Set views in filmstrip invisible when alpha = 0.
bug:10096747
Change-Id: Idcb62448acbf38d581af3a08a9bcbc0cad0ab6be
Diffstat (limited to 'src/com/android/camera/data')
4 files changed, 1 insertions, 27 deletions
diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java index 2cdb2c172..2b9e77754 100644 --- a/src/com/android/camera/data/CameraDataAdapter.java +++ b/src/com/android/camera/data/CameraDataAdapter.java @@ -113,13 +113,6 @@ public class CameraDataAdapter implements LocalDataAdapter { } @Override - public void onDataFullScreen(int dataID, boolean fullScreen) { - if (dataID < mImages.size() && dataID >= 0) { - mImages.get(dataID).onFullScreen(fullScreen); - } - } - - @Override public boolean canSwipeInFullScreen(int dataID) { if (dataID < mImages.size() && dataID > 0) { return mImages.get(dataID).canSwipeInFullScreen(); diff --git a/src/com/android/camera/data/FixedFirstDataAdapter.java b/src/com/android/camera/data/FixedFirstDataAdapter.java index 9f3c4107b..53eb3bb86 100644 --- a/src/com/android/camera/data/FixedFirstDataAdapter.java +++ b/src/com/android/camera/data/FixedFirstDataAdapter.java @@ -123,15 +123,6 @@ public class FixedFirstDataAdapter extends AbstractLocalDataAdapterWrapper } @Override - public void onDataFullScreen(int dataID, boolean fullScreen) { - if (dataID == 0) { - mFirstData.onFullScreen(fullScreen); - } else { - mAdapter.onDataFullScreen(dataID - 1, fullScreen); - } - } - - @Override public void setListener(Listener listener) { mListener = listener; mAdapter.setListener((listener == null) ? null : this); diff --git a/src/com/android/camera/data/FixedLastDataAdapter.java b/src/com/android/camera/data/FixedLastDataAdapter.java index b8325ec72..a0b78aa98 100644 --- a/src/com/android/camera/data/FixedLastDataAdapter.java +++ b/src/com/android/camera/data/FixedLastDataAdapter.java @@ -135,17 +135,6 @@ public class FixedLastDataAdapter extends AbstractLocalDataAdapterWrapper { } @Override - public void onDataFullScreen(int dataID, boolean fullScreen) { - int totalNumber = mAdapter.getTotalNumber(); - - if (dataID < totalNumber) { - mAdapter.onDataFullScreen(dataID, fullScreen); - } else if (dataID == totalNumber) { - mLastData.onFullScreen(fullScreen); - } - } - - @Override public boolean canSwipeInFullScreen(int dataID) { int totalNumber = mAdapter.getTotalNumber(); diff --git a/src/com/android/camera/data/LocalData.java b/src/com/android/camera/data/LocalData.java index 2b617d7e1..e25e93327 100644 --- a/src/com/android/camera/data/LocalData.java +++ b/src/com/android/camera/data/LocalData.java @@ -80,6 +80,7 @@ public interface LocalData extends FilmStripView.ImageData { */ boolean isDataActionSupported(int actions); + /** Removes the data from the storage if possible. */ boolean delete(Context c); void onFullScreen(boolean fullScreen); |