History log of /packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
8e64647afd70d6306ab638e25f47623c85b5fac0 12-Nov-2013 ztenghui <ztenghui@google.com> Differentiate the InProgressData from the normal PhotoData.

When we load from MediaStore, we should differentiate the data still in
progress, e.g. HDR+, which should show the progress bar and hide the action bar
items.

bug:11634500
bug:11598186
Change-Id: I8179d39747218c8768977d5b3ce71eadbdfb8b58
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
b7be228d192cb8f91079caaa2f77a884a40b1160 21-Sep-2013 ztenghui <ztenghui@google.com> Fix incorrect width and height from MediaStore.

bug:10768232

Change-Id: I53673b8ef341f7388a9a4aaa7b03f804485928cf
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
c29156954bcbf0218a78c308c3ba8f25e00aeecc 16-Sep-2013 Sascha Haeberling <haeberling@google.com> Avoid expensive O(n) main-thread operation when adding Photo Sphere.

Bug: 10747001

Change-Id: I8dcc3c5e7dd12879a927aa82e71bea0c6370ccda
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
b7639c641f2ed5d0c60546349c3aa9e90c026878 09-Sep-2013 Sascha Haeberling <haeberling@google.com> Make sure we switch to preview view when resuming.

Bug: 10640328

But we need to make sure to not always switch in onResume, as
some activities stared from us (like playing a video or editing)
require the UI flow to stay in filmstrip.

Change-Id: Id2911be4949de9fd9fc4cb3451dd34e3fae8becf
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
a16e7b50f3148f581439509279f242092e254309 23-Aug-2013 ztenghui <ztenghui@google.com> Add rotate support in Film Strip

Move the exif related code under src.com.android.camera.exif.
Refactor the member variables under LocalMediaData.java.
Refactor the LocalData to make sure they are immutables for thread safety.

bug:10367037
Change-Id: I0e84bcc0097925b2be749fe016984177a68e0a4d
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
653c43be6e58be54cf2ac3c8efb2d65ac20bd03b 22-Aug-2013 Angus Kong <shkong@google.com> Bring back undo delete confirmation.

Also corrects the default decoding size.

bug:10413110
bug:10330214

Change-Id: I45465fdea2320501fd17ac4e35e0f0f54c08cbba
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
4ff5a1ab360577c6a7ec953f9197778c84c9d334 15-Aug-2013 Angus Kong <shkong@google.com> Set views in filmstrip invisible when alpha = 0.

bug:10096747

Change-Id: Idcb62448acbf38d581af3a08a9bcbc0cad0ab6be
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
dcccc510652b835fdbd39310a07849af8203052a 09-Aug-2013 Angus Kong <shkong@google.com> Fix camera preview stopped after onResume().

This fix is for the blank camera preview blank after onPause() -> onResume().
1. Refined camera start up procedure by removing redundant camera startup
thread.
2. Cleanup unused calls after aparted from gallery.

bug:10189998

Change-Id: I13ffa24aff5069f0032cd4bc801548fccc63d0e7
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
d806e6528092fd309bb2128ad5a539c72f52fd42 13-Aug-2013 Angus Kong <shkong@google.com> Don't return null if there's no images to load.

bug:10294250

Change-Id: Id6744f5bf36715527badc098de77bf11d67ae549
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
39685480a9705a949275c4b9cb0cca46c6c3cbc4 12-Aug-2013 Sascha Haeberling <haeberling@google.com> Don't set mImages to null, as we call .size() later.

Bug: 10293573

Change-Id: I5fab2bc4fe355c4c26dcab9b6b71ff14e7216502
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
81c5992f805517b6dd8937d4ff6b11724b23c228 10-Aug-2013 Angus Kong <shkong@google.com> Fix NPE after capture when camera roll is empty.

Use empty array instead of null.

bug:10264304

Change-Id: I486a26810dc4e0d4b562809dc243f52448dbd258
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
bd26069d391830856c57c2141cd2efbc8423d871 07-Aug-2013 Angus Kong <shkong@google.com> Refactor data/LocalData.

Make the design more easily understood.

Change-Id: I4f7dbe7d3f0a0534c13996b773f1767997848746
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
37f3611bbdc787c996a99894dcef7d8fb77e3f7c 06-Aug-2013 Sascha Haeberling <haeberling@google.com> This adds the following four CLs to Camera2:

http://ag/339319
http://ag/338974
http://ag/338401
http://ag/324149

Adapted to work in Camera2 and adding a .gitignore so that temporary
Eclipse files and folders are not submitted.

Change-Id: I40295c7f0139f76270c44f0ca395c0574a288569
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
8e963a5a6016d246184ed65906f9d103e92b17e2 06-Aug-2013 Sascha Haeberling <haeberling@google.com> This removes all non-Camera stuff from Camera2.

Note: Camera2 is a clone of Gallery2 right now.
Note 2: I will bring .mk files back later.

Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
8e5e4eedb25a4589342660b928935acca4375fc7 30-Jul-2013 Angus Kong <shkong@google.com> Add LocalDataAdapter and wrappers.

1. FixedFirstDataAdapter wraps another adapter and add a data at the first
position.
2. FixedLastDataAdapter wraps another adapter and add a data at the last
position.
3. Make the LocalData interface more complete.
- onFullScreen()
- canSwipeInFullScreen()
- getPath()
3. Add methods to the FilmStripView.DataAdapter to receive UI events.
- onDataCentered()
- onDataFullScreen()

Change-Id: I26d3a3b7facd0c451af43ce5fbbcab2baaaec427
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
f1f5186f7d3fd8bf35009d9e65a43914c664d82b 31-Jul-2013 Sascha Haeberling <haeberling@google.com> Adds back the PhotoSphere View icon in filmstrip.

This also exercises the "leave a place cleaner than you found it" rule
by cleaning up stuff:

- Formatting according to the Android format rules
- Removing unused code
- Putting braces where they belong.

Change-Id: Ie1dbfe9195bf3e20d9624d7ae85eeba16df8f931
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
c285458f6809d43333e3ada8790bddac17912e5a 26-Jun-2013 Angus Kong <shkong@google.com> Fix check of failing decoding boundaries calls

Change-Id: I7b7780de9988312f9ce79c2a27132b7f6acb1c4e
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
082210302a595e665ef0e34e9be216e554b13698 14-Jun-2013 Angus Kong <shkong@google.com> Remove files actually.

Change-Id: Ideba2dfff0678f1049bf2bdc93cee98bbb0e589e
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
f7758b6cc5ab00ad3955bf9c98af76559644a477 07-Jun-2013 Doris Liu <tianliu@google.com> Add enable/disable swiping to filmstrip

Change-Id: I3e019764a72f947545cd230b9bfe45f67d83dc29
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
b7d13430b030f7d46ed3335d84ff20f11b44efff 05-Jun-2013 Angus Kong <shkong@google.com> Merge "Play video from flim strip." into gb-ub-photos-carlsbad
49448f8631783fa635a0770345afa850bc0f212a 05-Jun-2013 Angus Kong <shkong@google.com> Add interface for swipe checking.

And fullscreen notification.

Change-Id: Ib264904cca47f1fc90ae5e392f0672c253e4d833
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
b40738a104ac056b9a220c1aec71d2df7446108a 03-Jun-2013 Angus Kong <shkong@google.com> Play video from flim strip.

Change-Id: Iaedf42d7dabee53f75a20c57f9e6916864ea271f
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
a06b4e2f2664bdd0b966ed3fb24e560cd9be7124 03-Jun-2013 Angus Kong <shkong@google.com> Add secure camera support.

Change-Id: I672d76cb4de37c46394a5e8ee2899cf571158a2c
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
885367cc5add241f6cb9ac243381400b497d630e 01-Jun-2013 Angus Kong <shkong@google.com> Add newly taken photos/videos to film strip.

Change-Id: I82d9e83d0a45f14036a194cf1ad5793b436357cd
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
accc6e55bbf0186be316e81fb4e82da4731f72e0 31-May-2013 Angus Kong <shkong@google.com> Don't use the same drawable for every view.

The placeholder drawable should be cloned for each view using it.

Change-Id: Ic9f7614cc91c95a16105b3b8a9e07c81a8f1a2d7
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
87f9a62f473a3c57505e2877b0a46ab3cb5e62ac 17-May-2013 Angus Kong <shkong@google.com> Add remove UI in FilmStripView

1. Add UI support for swipe to delete.
2. Don't set children padding.

Change-Id: I26be97f14d569db3df6a127cd00efe3c0c60f22c
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
750e8ec8af168afd318d47082b326b95f1cca517 06-May-2013 Angus Kong <shkong@google.com> Improve bitmap load efficiency.

Call prepare before/recycle after using image data.
Change-Id: I3387c8ca68f57c3949fed2aaa3e26490e66c791a
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
49b9ba2ba89760f297ecc7d6d94d68fb4b836be1 13-May-2013 Angus Kong <shkong@google.com> Dropping back FilmStripView codes.

Ongoing work that doesn't affect builds.

Change-Id: I83d81fa91e87d10787c3ce1d767bc41131341067
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
f43dee9f40bb4f21df23ae3876213a5b2f9afcfc 09-May-2013 Doris Liu <tianliu@google.com> Remove new camera activity to avoid build breakage

Change-Id: I56f0586ae196f57a0f55b8d835e6bc8fd27bdcfe
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
0a93cd70de75bbd1547fa58330d68ba953607115 13-Apr-2013 Angus Kong <shkong@google.com> Load video items in the new camera filmstrip.

Also fixes:
1. NPE when no data to load.
2. The last item is skipped.
3. date and id should be long instead of int.

Change-Id: I7cad06998d78e0d3f0a30be24e65eb0f777b9c0e
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
125efb44995fb3307572c2832b259307e8b7aadc 10-Apr-2013 Angus Kong <shkong@google.com> Integrate FilmStripView.

Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
107009fa3120563f9bdcdcce9c1ba92e58761b7a 09-Apr-2013 Angus Kong <shkong@google.com> Refactor CameraDataAdapter for other data types.

Change-Id: I4d925a4f2a9c2d6d14beda8781a1d4ca5cf3c1f4
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
3eb0acbe1fcdcd10e962abaab7d946c6013343b3 05-Apr-2013 Angus Kong <shkong@google.com> Add more gestures and animations in FilmStripView.

Now supports fullscreen mode and filmstrip mode.

Change-Id: I4c568e37f3306d970b3439f86ac6757b15c7cd4f
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java
6616551e7d9bf78a6b630893602e63379e81ef2b 22-Feb-2013 Angus Kong <shkong@google.com> Horizontal scrollable filmstrip view.

Change-Id: I076a07cd9a949ecdc8e4499b171b64e7becdbef2
/packages/apps/Camera2/src/com/android/camera/data/CameraDataAdapter.java