summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
Commit message (Collapse)AuthorAgeFilesLines
* Gallery2: Try to open existing cameraMichael W2019-10-211-7/+11
| | | | | | | | | Do not just open Camera2, just open any existing cam Also get rid of context parameter as it's unused (Reference: BugReports 13-20160506-12 Line #5) Change-Id: I120a1561aeceda2fc23721aa2ff4d68710fab76c
* Start new task for Gallery trampolinesAlan Newberger2014-08-081-0/+1
| | | | | | | | | | | | | | | | | | | When testing the Camera trampoline, even in the full gallery app from a JB to K upgrade, I noticed that the Camera app was starting in the Gallery trampoline's task -- two recents even with excludeFromRecents true. Was still the case in the new trampoline. Adding FLAG_ACTIVITY_NEW_TASK addressed this, also with some manifest changes in the trampoline in another CL. Photos was working, I believe because photos activities explicitly set a task affinity to shield themselves from G+, thus forcing a new task. Also, this helped shield activities when both trampolines are active. That is, if Camera was started via its trampoline, then Photos, the Photos shortcut opened Camera because it already had an activity in the trampoline's task. Even if Photos works now, this does no harm and ensures we're not relying on the implementation of another APK. Bug: 16843573 Change-Id: Ifa6d65ef2b00a4ffc6df78f13dba16270113509d
* Add methods to return Camera and Gallery launcher intents.Mangesh Ghiware2013-10-031-1/+1
| | | | | Bug: 10820027 Change-Id: I340072c48832e23245aa041503649b40cbaf0bf0
* Rename Gallery activity and add trampolineMangesh Ghiware2013-09-261-3/+3
| | | | | | Bug: 10807861 Change-Id: Iaaf17b579db2fe09900e9817f766f43dd66dea61
* Add (back) receiver to disable camera.Mangesh Ghiware2013-09-221-0/+85
| | | | | Bug: 10411981 Change-Id: Icff31d2da466746ef6b00d4be32e92067cebd1f1
* Use the same taskAffinity for trampoline as CameraMangesh Ghiware2013-09-191-1/+4
| | | | | Bug: 10842131 Change-Id: I2bf6961d7c411dc95e9b9589d9ec71ee34b3011f
* Add flags to create new task and clear top during trampoline.Mangesh Ghiware2013-08-191-1/+4
| | | | | Bug: 10366519 Change-Id: I549c8256d18ea37ac868035e54a56e5f68840b24
* Add a trampoline activity to launch new CameraMangesh Ghiware2013-08-141-0/+31
| | | | | | | | This preserves shortcuts, if any, to the Camera activity in the old package name. Bug: 10312966 Change-Id: Iffd3d708333515bb3b998faecff360bc01c142d2
* Remove Camera from Gallery2.Sascha Haeberling2013-08-08103-26228/+0
| | | | Change-Id: I89adebffcacd1269217d7bd8c630c2f78886f590
* Merge "Move PanoramaViewHelper out of LightCycleHelper" into ↵George Mount2013-08-073-4/+3
|\ | | | | | | gb-ub-photos-carlsbad
| * Move PanoramaViewHelper out of LightCycleHelperGeorge Mount2013-08-073-4/+3
| | | | | | | | | | | | | | PanoramaViewHelper can be used outside of LightCycle panorama picture creation. Change-Id: I40bb357385fa311f9115dffaa143119cfcb5f45f
* | Fix crash on camera startupDoris Liu2013-08-061-1/+1
|/ | | | Change-Id: Ic4f91d32d5ee4a01c2c406d1592aa0705db413ea
* Merge "Show PhotoSphere stitching progress." into gb-ub-photos-carlsbadAngus Kong2013-08-069-151/+449
|\
| * Show PhotoSphere stitching progress.Angus Kong2013-08-069-151/+449
| | | | | | | | Change-Id: I35a835f3a9bc28d5f974e318ec3ed257ad8bea37
* | Merge "Show newly recorded video." into gb-ub-photos-carlsbadAngus Kong2013-08-061-4/+2
|\ \
| * | Show newly recorded video.Angus Kong2013-08-061-4/+2
| |/ | | | | | | | | | | bug:10115177 Change-Id: I5f9687b358e43e2e98f7b24a03dc8a17cc772433
* | Merge "Implement capture animation" into gb-ub-photos-carlsbadDoris Liu2013-08-066-107/+259
|\ \ | |/ |/|
| * Implement capture animationDoris Liu2013-08-056-107/+259
| | | | | | | | | | | | Also fix the thumb view by using real jpeg data rather than a preview frame Bug: 10074619 Change-Id: Ie38884b30977c350b2ca0e0671bd9f5b10d3681e
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 16:10:36 +0000