| 6a42c3ae157c4495db56541ef87f6ee56b5d10b3 |
|
09-Nov-2013 |
ztenghui <ztenghui@google.com> |
Add a null check to fix NPE
bug: 11594111
Change-Id: Ica2ffe315c4e4eaa818aa609d9600d5e67e54b3b
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| cbd8267ee99e457f72822e8d8187b5e6823104f8 |
|
05-Nov-2013 |
Seth Raphael <magicseth@google.com> |
Add logging to various actions
Bug: 11514148
Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| b0288ec84e06b83923180a04e1b546724fcfd258 |
|
04-Nov-2013 |
Doris Liu <tianliu@google.com> |
Preserve high resolution image on touch during zoom
Bug: 11477449
Change-Id: I08b33cee258de1f90e5fa60e6483834dd5197bd2
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 56e44af257d65d730f04d1e90c87f5674abd7f26 |
|
16-Oct-2013 |
ztenghui <ztenghui@google.com> |
Don't call onCurrentDataChanged for CameraPreview when reloading.
In this case, camera preview didn't change, so there is no need to call
onCurrentDataChanged.
bug:11237255
Change-Id: I788a2ee4e7337721d0bbd6aa75e7da6d382bf282
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| f149ec53a0fa3330617ce01751964662d3273c88 |
|
17-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Don't allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad
|
| 7be0e2b8439d525c70cb062c6616d10c4fc004aa |
|
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
Don't allow swipe into the film strip view when swipe is disabled
The swipe is supposed to be intercepted by FilmStripView, however, when the
children is not handling the scroll / fling gestures, FilmStripView will still
has to handle it.
In this case, we need to detect whether or not the swipe has been disabled.
bug:11234333
bug:11221594
Change-Id: I1d0fbac65050aef225fb880a41df735e98bf48db
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 177c4b05ed8e9f71afc526e5cad339f245563450 |
|
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad
|
| 3cb2004b2897129c67181316b7c9f62607858618 |
|
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Do not show any bottom controls in secure camera to prevent launching out of app behavior.
Bug: 11235651
Change-Id: Iafc0b7930c8c016bd6ab11b13d6572241c5ef074
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| f9ef1ae9d31977c106eefc7ab1a74158bcdcfd39 |
|
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Prevent crash after deleting album from Gallery by checking for more null pointers.
Bug: 10950130
Change-Id: I284e2016676e15c7f2ad23de71a965ab50c5d743
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 3044d8c577432d6e9721fc8b26ac2afbbaf21266 |
|
11-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Set camera controls visibility based on whether the camera preview is centered.
Bug: 10861015
Change-Id: Ib0c4945e35cee16b73a4bba913e11d0f79a26176
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 02cafdfb92a2d53b76c2bb180ee5289a80f4f4ac |
|
14-Oct-2013 |
Angus Kong <shkong@google.com> |
Workaround to prevent the data focus callback.
bug:11205669
Change-Id: I5b2d33422ec5f6fe21c81e39d24f36ec8b61ce4e
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| f1582c9c075e9cd5790b4bbe1101c94a45ac15d2 |
|
13-Oct-2013 |
Angus Kong <shkong@google.com> |
Adjust the position after layout change.
bug:10993660
Change-Id: Ia07b8238a09e761a02fe11577b738776ab965b30
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 81ef40bc4923e7014f52f03d8c7ddcf7a4344f70 |
|
11-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad
|
| 53aedc0ee671c2d11341a66c444bbb6cdc97b150 |
|
11-Oct-2013 |
Angus Kong <shkong@google.com> |
Avoid unnecessary bringChildToFront() calls.
bug:10750719
Change-Id: I831d9ecead91d64c7a0b6a665e9c842ef17d8a8a
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 36c21ca1365c0c3832742bc0cf75d3409723254b |
|
11-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Check both the requestId of current item and total items in filmstrip for bottom controls." into gb-ub-photos-carlsbad
|
| d70f0fb68064e170fb2cf041a707ed04d68040f9 |
|
04-Oct-2013 |
Doris Liu <tianliu@google.com> |
Add fling support in zoom view
Bug: 10679704
Change-Id: I7ab72fdf4e836495b2471c65fd57f952e863f1dd
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 62c72ca1b5d0a608d549615928d66e9d1911062f |
|
10-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Check both the requestId of current item and total items in filmstrip for bottom controls.
Bug: 11169201
Change-Id: I9d42b168efe62712f76165db5221757a1f20013f
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 39ca527f2647d7af6ae9f326bec1fa627c675989 |
|
09-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Update bottom edit control for photos inside secure and insecure mode.
Bug: 11067201
Change-Id: I21a775d46c26206e340c830fceafaf52e7a06ac5
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 26862c304a8163016b1f8196c715769750ba1720 |
|
09-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Update bottom controls and action bar with a tighter bounds on data change.
Bug: 11087361
Change-Id: Ie319d1767eb671ca7ed4a129aa9b75c77d63b20d
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 6939d143cb52a012b1b9cd9a141156357367b212 |
|
09-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Make the transition animation identical." into gb-ub-photos-carlsbad
|
| da568b23002859e9672271bb135808303c2e07cb |
|
09-Oct-2013 |
Angus Kong <shkong@google.com> |
Make the transition animation identical.
The animation of transition between camera preview and filmstrip should be a
special case to prevent jank.
bug:11011577
Change-Id: If611599203e845d098cd6e4acb56d5631d085ffe
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 6ddd31b9284bbbfcf891766f9d6238bfd5cde721 |
|
09-Oct-2013 |
Angus Kong <shkong@google.com> |
Enter fullscreen if all items are removed.
bug:11066937
Change-Id: Ibf9b03adc0d00838ba23c65361aa7c783c835d90
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 3179f6a49516833761be5155c4e1244ac0aa17fe |
|
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
Allow scaling beyond 1:1 in zoom view
Bug: 10950226
Change-Id: I38828edaf4010170f6c6db18b8c5fdeef91b4f11
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 06578b59bf15c1ac35dbbffd979f40479b1cbda9 |
|
07-Oct-2013 |
ztenghui <ztenghui@google.com> |
Keep the ImageData size info consistent with MediaStore and Exif
Basically, the width and hight in the ImageData will be pre-rotation.
bug:11067085
Change-Id: I377caf2f1d49d26b4d6823d4e72168a055d80858
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 77dd14930b24816369560a73cfb0610c1f745d05 |
|
03-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad
|
| 88641ad117189fe1a3440dc82e57312507879bab |
|
03-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Make space for photosphere rendering text
Bug: 11005014
Change-Id: I1f92322ff5a53b8bf6752841efd3a59e366d78fb
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| cf7babd5cbe69cf99d96e46c306d6733837f48eb |
|
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad
|
| 1f36cf1c97faf2b7824bbecd62942456847f0e13 |
|
02-Oct-2013 |
Angus Kong <shkong@google.com> |
Make scroll animation smoother.
bug:10802703
Change-Id: I2e759a5b45eb8f68eb63163ad7e42cc670971bf4
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| b7a52a4caafd270dbb6aaa41f890a516359e44b8 |
|
01-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.
Bug: 10715651
Change-Id: Ib71a3e4469d1ecee87b9423b03b8898294a7ffa6
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| e2d59dcccf177fdd158949a6b2f741a75d504416 |
|
01-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad
|
| a1cb57beb56e17f8d64b82cb1465dcb63cce74b1 |
|
01-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Don't adjust the position while scrolling." into gb-ub-photos-carlsbad
|
| 0156d9179bb9ba8718b25ee05985a7c71e5578c7 |
|
01-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Show status bar in filmstrip mode
Bug: 11005642
Also makes sure we only call setSystemUiVisibility in only one
place.
Change-Id: I6e4709c63c25a4e69219ec7518dc284cef303aaa
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| a5d6b243d3d742cf9dd2ffdac88d386abacd123a |
|
01-Oct-2013 |
Angus Kong <shkong@google.com> |
Don't adjust the position while scrolling.
bug:10802703
Change-Id: I493c36b87c99de97275add1243f5ac363a28787e
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 5326f0265206ccd8a2f3424bb983da674b20a31e |
|
27-Sep-2013 |
Doris Liu <tianliu@google.com> |
Double tap to full screen from filmstrip
Also fix the first photo going from full screen to filmstrip on single tap
Bug: 10948166
Change-Id: I15df0325f495722f43b17e0713d6196e8585aa75
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| b21215a1a59812592380f31891becedbdec7468b |
|
21-Sep-2013 |
Angus Kong <shkong@google.com> |
Improve the animation to filmstrip.
1. Remove the snap-in-center check at the end of scale animation.
2. Don't go back to full-screen when animating from camera preview
to filmstrip.
bug:10806298
bug:10864100
Change-Id: I751040a22e2758709c22e7230a5418a871ef85f9
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| aa8744284864cda5570e8dfa4eccc2747cee52dc |
|
19-Sep-2013 |
Doris Liu <tianliu@google.com> |
Hide action bar after a timeout
Also make sure:
1) Action bar does not go away when the menu is showing
2) Extend the timeout if user swipe to a new image when action bar is visible
3) Hide action bar immediately when double-tap-to-zoom starts
4) Action bar persists in filmstrip mode (i.e. non-fullscreen mode)
Bug: 10750342
Change-Id: I820dc2b57ced61f91246fffe3fecc4e60ea187ca
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 7d2388d96522975307cf5c40f7ac911ad963c44d |
|
19-Sep-2013 |
Angus Kong <shkong@google.com> |
Refine Filmstrip gesture/position handling.
bug:10749052
bug:10802996
bug:10711578
Change-Id: I9080a930209118a5c1bdc11b1ef7b316c55a741e
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 2065e606b68f7e8532317f076c7f688a2093186d |
|
17-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad
|
| 87fc5e1568f737e03327770cb3dee03c4b939c59 |
|
16-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix zoom for images with orientation tag
Bug: 10780042
Change-Id: I518bf8a6e2b53647398180e60b55533960ebe318
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 5bee41c6d727c730c7b10fba886862284a489257 |
|
17-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad
|
| d028dd4908e68c7d4d0e7438efa74fa2c67e5f2a |
|
14-Sep-2013 |
Angus Kong <shkong@google.com> |
Set correct alpha for views in filmstrip.
bug:10713813
Change-Id: I2715b7c3ecb2e0c995e8f66e710c91561e9cf231
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 79dcb12bbbcb9b3650ace5290897e26451218fe1 |
|
16-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix flicker when zooming images smaller than screen
Bug: 10733300
Change-Id: Ifa753722132b1fd81265b5fc105a0b96602b6fd2
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| a29e0bfcafa292adba7fff2daf0f754627e47137 |
|
13-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Always leave full-screen when swip from camera." into gb-ub-photos-carlsbad
|
| 539b9eec067c012d17f482975cf8053e04a11759 |
|
13-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Avoid flickering after swipe to delete." into gb-ub-photos-carlsbad
|
| edbba628dc2e31057b304c6a431f44dbca125891 |
|
12-Sep-2013 |
Angus Kong <shkong@google.com> |
Avoid flickering after swipe to delete.
bug:10624385
Change-Id: Id4d65a391b2d13a5d6cc08ae9c1b787610c94c46
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| a5a08d7642a1fdf961b057cc90e76c4c93103c15 |
|
12-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Bring back tiny planet to the Camera filmstrip
Bug: 10393598
The native code and XmpUtil are mostly 1:1 copies from Gallery2.
The UI is new and should work on all form factors.
Change-Id: Ia302a4a7a24cf0b3aa583836683c459e9e7e1f85
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 742cd5b18e1899bee1d430b61891238c0f3502b6 |
|
13-Sep-2013 |
Doris Liu <tianliu@google.com> |
Keep undo bar around until there is user interaciton
Bug: 10678578
Bug: 10674009
Also removed the use of withEndAction() call because it was
introduced in API 16, whereas we need to be compatible with
API 14+
Change-Id: I785770ae9a083f88056e94fc5378daf8ebc6dc6e
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 45f9b06b31666c2b880c24cf32f1ca8b21435422 |
|
12-Sep-2013 |
Angus Kong <shkong@google.com> |
Always leave full-screen when swip from camera.
bug:10714779
Change-Id: Ifa10f151974ac0598a0c27751e23c77d525d332e
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 8566dd777cd219254c945240a31ac97de28792a2 |
|
12-Sep-2013 |
ztenghui <ztenghui@google.com> |
When current data is preview, don't show the action bar.
bug:10678458
Change-Id: Ia48ca694ddca47438338e7223e9fa19c2c65dd5d
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 7b265a6b2f55c6ae7afc30e63ba324c4084a5d8e |
|
09-Sep-2013 |
ztenghui <ztenghui@google.com> |
Fix the flash mode transition in video mode
onSwitchMode is wrongly overloaded, now is fixed.
Basically, onCurrentDataChanged will handle the switching in and out of Camera.
onDataFullScreenChange will handle full screen change on non-preview data.
bug:10610967
Change-Id: I199a20d40d66b78302e90e0f96826d03076b0e39
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 20703f72e087a01e6a589c2875819cf817581a51 |
|
11-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Flinging back should stop at the first photo first." into gb-ub-photos-carlsbad
|
| 5fbe134c3cf1f7c2c82ccef223cab7eb43cd92f1 |
|
11-Sep-2013 |
Angus Kong <shkong@google.com> |
Flinging back should stop at the first photo first.
bug:10634016
Change-Id: I44e715268b913902a444c977c136d1e0381b3833
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| e1d5ba4fc5470043e8645984e3018b712f5dfcff |
|
10-Sep-2013 |
Doris Liu <tianliu@google.com> |
Hide zoom view when going to full screen
Bug: 10654903
Change-Id: Ibeed1e02e203dffc4aba69a52b748206a734294f
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 6aae9177ac432df82971facab214b365e92b4a04 |
|
10-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad
|
| 563a289f1aed4dd7bf760959851ff6ad72c7627f |
|
10-Sep-2013 |
Angus Kong <shkong@google.com> |
Fix images being off-center in filmstrip.
bug:10609827
bug:10650966
Change-Id: Ie06beaeb7c6a616d5d7ca751cfaa65a64844332c
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| e074fcbdb7d7bb20dde8173b969cbbafb53b92a9 |
|
10-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad
|
| 03b75411538c60021799ccc7acc8ed4798253b6d |
|
10-Sep-2013 |
Doris Liu <tianliu@google.com> |
Hide zoom view when back is pressed
Bug: 10677244
Change-Id: I2e42d35382dded28bdd47dbdca173a1fd2bf6ac7
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.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/ui/FilmStripView.java
|
| 17e669d695ef2a38d28d5ba2512937836293e9ca |
|
06-Sep-2013 |
Angus Kong <shkong@google.com> |
Improve swipe gesture in filmstrip.
bug:10552605
bug:10645736
Change-Id: I7f524c191b0d8bd051ce9e1399a1265d0cac2f25
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 564343e34ab0e43e131566bf74a9448d1e982ad7 |
|
05-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix black screen in mode switching
Bug: 10632592
Change-Id: I3c8bc1f6a17709d39ec88b51a22edfbbab828bde
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 33035c19cc47adfb738c20cef66652ae451c8e10 |
|
23-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
Bring back 'share 360 photosphere' to filmstrip
Bug: 10367406
Change-Id: Icb07e9e890a72bec6ed3b4c5a7e33400be3446f8
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 121022cb590955e37f1264f77190ce4711159976 |
|
04-Sep-2013 |
Doris Liu <tianliu@google.com> |
Double tap to zoom all the way in and out
Bug: 10308195
Change-Id: Id6c1bd6c95a812c3aae0c292ca53e3de6eea2d55
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| f9ddb6034e560684e4d3ddd460ef9dff345e4e91 |
|
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
Reset zoom view when user exits app or rotate device
Bug:10308195
Change-Id: Icf1acc4b17611b28a9c65ec809083ac58da5bd8f
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 3f969c1735e2636bf22dfe44104d0e99924cca97 |
|
23-Aug-2013 |
Alan Newberger <alann@google.com> |
add up button support for filmstrip
This CL adds up affordance handling to CameraActivity. There was no working call to reset the filmstrip back to the camera, so this CL adds a controller which then calls reload, which is itself fixed to work as desired. Note that during testing I identified issue 10563392, I've decided to file that separately since it is orthogonal to up button function, but it does affect the overall experience and should be fixed.
Bug: 10414498
Change-Id: I1ee914dc1d264adb1fb5a363c2d6174070cd7b71
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 8de13111cc4e62da3462ea321d18c7951282e0d0 |
|
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
1:1 zoom integration
Bug: 10308195
Change-Id: I940891f6aa3e24575174ff888c384fddaaa5b3c8
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.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/ui/FilmStripView.java
|
| 80af7dd871547d03ee9ff5023cbec00b1d8677ee |
|
23-Aug-2013 |
Angus Kong <shkong@google.com> |
Fix full-screen swipe layout.
bug:10428905
Change-Id: Ie4907735cc86f2d10bd936ce2d9af54cccab7ece
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.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/ui/FilmStripView.java
|
| 734598c39e6a9d809982dae2907dc7d10e0b0e9f |
|
22-Aug-2013 |
Angus Kong <shkong@google.com> |
Add support to "go-to-next" in film strip.
bug:10328123
Change-Id: I018876df89cc7ed125a32af850e6b26114fb1004
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| aa2a243bdc91b809dbfe01a9933b02e6b95d983f |
|
21-Aug-2013 |
Angus Kong <shkong@google.com> |
Fix delete animation in fullscreen mode.
bug:10414539
Change-Id: I798492a824306d0eb479aae4e822cd9c7fbe3530
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 025136bb4639d84b2a5a7b95367fabcc92b86415 |
|
21-Aug-2013 |
Angus Kong <shkong@google.com> |
Support filmstrip swipe in full-screen.
bug:10341731
Change-Id: Ib4a3278f72d3e1070603d2a094f4021a947bdc56
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 870253516ce315888ac64e1921285e47154a75e7 |
|
21-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad
|
| 513f1c1e8b7b4249c599a734307e348355439b67 |
|
21-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix nav bar overlapping camera bottom UI controls
Bug: 10394750
Change-Id: Ia46d4903a2c148102bd62ca71516bd81e10fe497
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 8969a67c926608737f3e49f2d2240298372e8416 |
|
20-Aug-2013 |
Angus Kong <shkong@google.com> |
Update the final PhotoSphere result correctly.
bug:10400557
Change-Id: I8e8b22b569c3b3a7f4d25e7eb46053332e2dc062
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 88ef7664ba6a888fa5da8693091674e152b56192 |
|
16-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Bring back the bottom controls in Filmstrip.
Bug: 10367172
Bug: 10074320
Also hooks up the Edit button and the edit menu item.
Change-Id: I0ce3344e09fdfd7794c417ddbe44b3d247a7ed7c
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.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/ui/FilmStripView.java
|
| 394023fb7e3c8d07d4aeafc30bf4b66ed481ebb7 |
|
16-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Single-tap in fullscreen view toggles ActionBar.
Bug: 10347286
Change-Id: I55e400c957d4ec1ef1307e45007e2127ea5ab7ea
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| fae11a165e344a38811770c7d348eda214683edc |
|
15-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Implent show-on-map functionality.
Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view.
Bug: 10346208
Bug: 10330505
Change-Id: Idaeec207bcc0e7311fa3b651868515ccea81d083
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 7e1c5fe26bc861d979b85014a511ba35bc1f4110 |
|
15-Aug-2013 |
Angus Kong <shkong@google.com> |
Single tap to full screen mode.
bug:10308911
Change-Id: Ia3213782091eafe6a5683a931dea1ae212e79ba3
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 47721fa8f2dc13cb565ae5629a417dc4ed298e81 |
|
15-Aug-2013 |
Angus Kong <shkong@google.com> |
Make current view center in filmstrip.
bug:10096746
Change-Id: I458a3f1b1a2c78239e1cfaa91d6d5e1cec19507e
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.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/ui/FilmStripView.java
|
| c27d21bc3b9322936004827ab005fb7d1facfacf |
|
13-Aug-2013 |
Angus Kong <shkong@google.com> |
Add local data types.
We need local data types to generate different menus.
bug:10245009
Change-Id: I95f947c11ad3f39172c43f75f4108bf720148278
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 3d0b691b8f7a844093e8de9267ffa2ce16d0c5a9 |
|
09-Aug-2013 |
Angus Kong <shkong@google.com> |
Fix DataAdapter wrapper classes callback mechanism.
Also to fix FilmStripView to avoid NPE before data is loaded.
Change-Id: I6c8a3d215d9f1dc72b4207e52023c1e27e9df123
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.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/ui/FilmStripView.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/ui/FilmStripView.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/ui/FilmStripView.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/ui/FilmStripView.java
|
| b477b42906a3f8b299ddaeede3940e6344fb6825 |
|
09-Jul-2013 |
Angus Kong <shkong@google.com> |
Measure children after the dimension is determined.
Also, the setMeasuredDimension() in onMeasure() is not necessary as we already
called super.
bug:9680271
Change-Id: I639454e515edb3027c9e79347d2124a1fcaa529b
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| a6a6a730074e9fedd56c41cd8fa8f1212cfac108 |
|
19-Jun-2013 |
Angus Kong <shkong@google.com> |
Add fullscreen mode.
1. Single tap to center a picture.
2. Double tap to fullscreen
3. In fullscreen, the next picture is on the left but the previous one
is under the current one.
Change-Id: I728da2487ea649162be4f1858a8524331c625157
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 082210302a595e665ef0e34e9be216e554b13698 |
|
14-Jun-2013 |
Angus Kong <shkong@google.com> |
Remove files actually.
Change-Id: Ideba2dfff0678f1049bf2bdc93cee98bbb0e589e
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| a52f04c1ff32b2f529c21b49861a62ad34359e28 |
|
06-Jun-2013 |
Doris Liu <tianliu@google.com> |
Add callbacks for switching to camera/filmstrip
Change-Id: I936d59efe3e09232ab0b298603c823d4f7952199
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.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/ui/FilmStripView.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/ui/FilmStripView.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/ui/FilmStripView.java
|
| 5334fa3036425acf843072f32af72565b5547cf3 |
|
31-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Adjust data id even if it's not currently used." into gb-ub-photos-carlsbad
|
| fb57df15a87f95ce8b2f861e54d960602912e03c |
|
14-May-2013 |
Doris Liu <tianliu@google.com> |
Improve gesture handling
Change-Id: Ib1e18274480b6bb681bd06f3130f9b9ea198ea98
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| c31569ce211414f6db2447cc84ca71115f916b6f |
|
31-May-2013 |
Angus Kong <shkong@google.com> |
Adjust data id even if it's not currently used.
FilmStripView should adjust the internal info of data id after removal
regardless of the existence of the removed data in the buffer.
Change-Id: I78202997525a96a88f7bba8e0d55b7f6aad2c9cf
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 0980fe89b2c0d2d8f75cb43a5fe06c00b8c8901e |
|
29-May-2013 |
Angus Kong <shkong@google.com> |
Translate the first/last view too.
Change-Id: Iea6dfa8acc632596fdf05001b6b11d11d014a8a0
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| e78541f2edf2f02660c34660114e76d53b32ab8b |
|
28-May-2013 |
Angus Kong <shkong@google.com> |
Add UI for insertion in FilmStripView.
Change-Id: Iff389525e3811c5018365b6e6c3b9f8b95b9da9a
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 6d23f4c77fde7ddf70e0edd48f46cc22b7f7320e |
|
23-May-2013 |
Angus Kong <shkong@google.com> |
Refactor to add FilmStripView.Controller.
Use controller to control the FilmStripView.
Change-Id: If203d4bf28ce2dc398ada8b56b38be51a1d5dab9
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| fd382ee5142bb87707be00dec9bc7235f01733d1 |
|
22-May-2013 |
Angus Kong <shkong@google.com> |
Keep camera preview in view hierarchy.
Camera preview is a special case that needs to be kept to avoid unnecessary
start and stop preview.
Change-Id: I6c922d4b35ff86981fa6a3ec3b76417d07a68a0e
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| af24d28f8938a05d2e3c40155e39cbc7ff4d64b7 |
|
21-May-2013 |
Angus Kong <shkong@google.com> |
Fix off-position issue after changing orientation
Change-Id: I1c40b9ede5fa85ab46d9bcb9ab586e66c4c132c8
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|
| 9f02c87cfb5039a72f516ea5edc0378c45ac5779 |
|
20-May-2013 |
Angus Kong <shkong@google.com> |
Fix jitter in FilmStripView.
The jigger happens when deleting the one before the last. The length of the film
strip might be changed due to the deletion.
Change-Id: I269a5d88eb77ed5fa6e44ae9c86c2941ecd718b1
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.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/ui/FilmStripView.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/ui/FilmStripView.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/ui/FilmStripView.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/ui/FilmStripView.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/ui/FilmStripView.java
|
| 125efb44995fb3307572c2832b259307e8b7aadc |
|
10-Apr-2013 |
Angus Kong <shkong@google.com> |
Integrate FilmStripView.
Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.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/ui/FilmStripView.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/ui/FilmStripView.java
|
| 6616551e7d9bf78a6b630893602e63379e81ef2b |
|
22-Feb-2013 |
Angus Kong <shkong@google.com> |
Horizontal scrollable filmstrip view.
Change-Id: I076a07cd9a949ecdc8e4499b171b64e7becdbef2
/packages/apps/Camera2/src/com/android/camera/ui/FilmStripView.java
|