summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
Commit message (Collapse)AuthorAgeFilesLines
* Use PopupWindow for settings popupDoris Liu2013-08-094-85/+69
| | | | | Bug:10261902 Change-Id: Ia77cff276615db8c3fbb9e859bf099249b4021cf
* Fix DataAdapter wrapper classes callback mechanism.Angus Kong2013-08-092-6/+44
| | | | | | Also to fix FilmStripView to avoid NPE before data is loaded. Change-Id: I6c8a3d215d9f1dc72b4207e52023c1e27e9df123
* Merge "Refactor data/LocalData." into gb-ub-photos-carlsbadAngus Kong2013-08-076-713/+764
|\
| * Refactor data/LocalData.Angus Kong2013-08-076-713/+764
| | | | | | | | | | | | Make the design more easily understood. Change-Id: I4f7dbe7d3f0a0534c13996b773f1767997848746
* | Changes required for building GoogleCamera.Sascha Haeberling2013-08-071-5/+37
|/ | | | Change-Id: I2ea7f4714e3003ff05eadb6cb8b93af721b39ac6
* Remove refocus icon if it's not enabled or present.Sascha Haeberling2013-08-061-13/+33
| | | | Change-Id: I0c885a7a56abfe2365d832fa5ca8c1d74ce2edc8
* This adds the following four CLs to Camera2:Sascha Haeberling2013-08-0615-286/+739
| | | | | | | | | | | | 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
* This removes all non-Camera stuff from Camera2.Sascha Haeberling2013-08-0675-215/+2768
| | | | | | | Note: Camera2 is a clone of Gallery2 right now. Note 2: I will bring .mk files back later. Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
* Load the FilmStrip data in onCreate()Angus Kong2013-08-051-19/+20
| | | | | | | | The loading should be done in onCreate() so it won't waste time loading the data which has been loaded everytime the app is brought to the foreground. bug:10189998 Change-Id: I5b9158b206f96b065f6f18a5ab7da3ca14b9e52a
* Add LocalDataAdapter and wrappers.Angus Kong2013-08-0110-221/+810
| | | | | | | | | | | | | | | | 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
* Merge "Adds back the PhotoSphere View icon in filmstrip." into ↵Sascha Haeberling2013-08-015-130/+541
|\ | | | | | | gb-ub-photos-carlsbad
| * Adds back the PhotoSphere View icon in filmstrip.Sascha Haeberling2013-08-015-130/+541
| | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Add wrapper for face detection listener." into gb-ub-photos-carlsbadAngus Kong2013-07-314-52/+104
|\ \
| * | Add wrapper for face detection listener.Angus Kong2013-07-314-52/+104
| | | | | | | | | | | | | | | | | | bug:10113532 Change-Id: I01dc051d7b25cb97153b5e3e4cf06744dccb9fd4
* | | Set default video quality to the highestDoris Liu2013-07-312-51/+26
|/ / | | | | | | | | | | Bug: 9886141 Change-Id: I4741d5c898ac666923cfc12abc78d5d3517cb05f
* / Fix switching camera failure.Angus Kong2013-07-311-1/+1
|/ | | | | | bug:10110830 Change-Id: I1adcefc229ce4a245880bc037a086c949c73da55
* Refactor CameraManager.Angus Kong2013-07-298-476/+1071
| | | | | | | | | | | | 1. CameraManager should be the only class accessing android.hardware.Camera. 2. For potential future upgrade in Camera HAL and android.hardward.Camera API upgrade, CameraManager should be just an interface instead of concrete implementation. 3. waitDone() in CameraProxy is removed. 4. ShutterCallback, PreviewCallback, PictureCallback and AF Callbacks are wrapped by our own interfaces. Change-Id: I595da17a1a9c6d476ee805b71c7f45ebb609e465
* Refocus integration phase 1.Sascha Haeberling2013-07-242-1/+11
| | | | | | Bug: 9966846 Change-Id: I591ce1ee878a9f4d6bd63eddef6e79608ffd69ec
* Remove legacy code ActivityBase.java.Angus Kong2013-07-243-646/+28
| | | | Change-Id: I7b372e5d69c3d01b4012ab61bbf725a7fec8a445
* Add stitching manager in Camera.Angus Kong2013-07-172-1/+74
| | | | Change-Id: I2f27c2c0e77ed3d618df890e709ca09076591f70
* Refine MediaSaveService to use memory limit.Angus Kong2013-07-171-10/+18
| | | | Change-Id: Ieeb06eddbd742896ecb7c50f0f51facaa77b2d21
* Remove unnecessary startPreview thread in video.Angus Kong2013-07-153-52/+41
| | | | Change-Id: I42dc46748fad3b321178280069555ecdd5c4a962
* Use ValueAnimator to ensure callbacks get calledDoris Liu2013-07-111-79/+62
| | | | | Bug: 9597743 Change-Id: I6b119bb7a6f8bbba76ccc09c28293eb7b5a0457e
* Measure children after the dimension is determined.Angus Kong2013-07-091-1/+5
| | | | | | | | Also, the setMeasuredDimension() in onMeasure() is not necessary as we already called super. bug:9680271 Change-Id: I639454e515edb3027c9e79347d2124a1fcaa529b
* Add in carlsbad: Avoid duplicated location popupsDoris Liu2013-07-023-24/+43
| | | | | Bug: 9505556 Change-Id: I00859d8d851ea3c75d3bda4fcf5df373f06c2ee0
* Merge "Clean up PreviewGestures" into gb-ub-photos-carlsbadMichael Kolb2013-06-262-64/+3
|\
| * Clean up PreviewGesturesMichael Kolb2013-06-262-64/+3
| | | | | | | | | | | | | | - remove dead code and state - fix zoom only mode during video recording Change-Id: I2238f99b9823ba091d300046d07448c67bc2ad78
* | Merge "Add fullscreen mode." into gb-ub-photos-carlsbadAngus Kong2013-06-262-70/+168
|\ \ | |/ |/|
| * Add fullscreen mode.Angus Kong2013-06-262-70/+168
| | | | | | | | | | | | | | | | | | 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
* | Fix check of failing decoding boundaries callsAngus Kong2013-06-262-15/+6
|/ | | | Change-Id: I7b7780de9988312f9ce79c2a27132b7f6acb1c4e
* Don't use post-ICS API View.setBackground().Angus Kong2013-06-251-22/+34
| | | | | | View.setBackground() is API level 16. Change-Id: I7e56939efbcaa6e152c19c37a4a54a133bed3b47
* Synchronize camera access in start preview thread.Angus Kong2013-06-251-8/+6
| | | | Change-Id: Iba953fea3bd17ecb085d75fb3b2e350c0bf5d3b1
* Clean up camera switcherDoris Liu2013-06-244-22/+8
| | | | Change-Id: I9f0495524028528ca02c7ddf94f4698d4e87af14
* Merge "Remove SRI panorama" into gb-ub-photos-carlsbadDoris Liu2013-06-216-985/+0
|\
| * Remove SRI panoramaDoris Liu2013-06-206-985/+0
| | | | | | | | Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
* | Add flash animation to photo moduleDoris Liu2013-06-192-11/+46
|/ | | | Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652
* Set window flags to show secure cameraDoris Liu2013-06-181-9/+24
| | | | Change-Id: I9acb47ae5d6c5b9248aeea5cd267e17243f93c74
* Switch over to use new camera activityDoris Liu2013-06-1823-9680/+1133
| | | | Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
* Remove files actually.Angus Kong2013-06-144-41/+174
| | | | Change-Id: Ideba2dfff0678f1049bf2bdc93cee98bbb0e589e
* Merge "Add callbacks for switching to camera/filmstrip" into ↵Doris Liu2013-06-139-61/+57
|\ | | | | | | gb-ub-photos-carlsbad
| * Add callbacks for switching to camera/filmstripDoris Liu2013-06-139-61/+57
| | | | | | | | Change-Id: I936d59efe3e09232ab0b298603c823d4f7952199
* | Merge "Refactor to separate out EGL part." into gb-ub-photos-carlsbadAngus Kong2013-06-133-117/+255
|\ \ | |/ |/|
| * Refactor to separate out EGL part.Angus Kong2013-06-123-117/+255
| | | | | | | | Change-Id: I90c37b9e221a80f0d35e6e12ab8850078dc03622
* | Merge "Update camera orientation when device is flipped" into ↵Doris Liu2013-06-1311-94/+142
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Update camera orientation when device is flippedDoris Liu2013-06-1311-94/+142
| | | | | | | | | | | | | | | Bug: 8963053 Change-Id: I909793a7da3903a080a19cd7e271b3720df4ec0a
* | | In carlesbad, fix image capture on S4Doris Liu2013-06-121-0/+4
| | | | | | | | | | | | | | | Bug: 9390020 Change-Id: I9d7e0609c55f47a267aff8499dcd244dfb2fdb3a
* | | Merge "Disable zoom when camera does not support zoom" into ↵Doris Liu2013-06-115-2/+19
|\ \ \ | |_|/ |/| | | | | gb-ub-photos-carlsbad
| * | Disable zoom when camera does not support zoomDoris Liu2013-06-115-2/+19
| | | | | | | | | | | | Change-Id: I5b4c38636614df37db1ef3166368f1650c9e5fa0
* | | Fix build.Angus Kong2013-06-111-1/+1
| | | | | | | | | | | | Change-Id: I05f73596157fb5a2ee0ebf8581cfffa973a2d1d7
* | | Use setPreviewFpsRange instead.Angus Kong2013-06-113-5/+23
|/ / | | | | | | Change-Id: I58f6af667fd906221b67b8a4827d7a67c567e20a
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 12:16:37 +0000