summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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-081-652/+0
| | | | Change-Id: I89adebffcacd1269217d7bd8c630c2f78886f590
* Move PanoramaViewHelper out of LightCycleHelperGeorge Mount2013-08-071-1/+1
| | | | | | | PanoramaViewHelper can be used outside of LightCycle panorama picture creation. Change-Id: I40bb357385fa311f9115dffaa143119cfcb5f45f
* Show PhotoSphere stitching progress.Angus Kong2013-08-061-20/+101
| | | | Change-Id: I35a835f3a9bc28d5f974e318ec3ed257ad8bea37
* 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-011-11/+25
| | | | | | | | | | | | | | | | 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
* Adds back the PhotoSphere View icon in filmstrip.Sascha Haeberling2013-08-011-6/+12
| | | | | | | | | | | 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
* Refocus integration phase 1.Sascha Haeberling2013-07-241-0/+4
| | | | | | Bug: 9966846 Change-Id: I591ce1ee878a9f4d6bd63eddef6e79608ffd69ec
* Remove legacy code ActivityBase.java.Angus Kong2013-07-241-0/+25
| | | | Change-Id: I7b372e5d69c3d01b4012ab61bbf725a7fec8a445
* Add stitching manager in Camera.Angus Kong2013-07-171-1/+26
| | | | Change-Id: I2f27c2c0e77ed3d618df890e709ca09076591f70
* Clean up camera switcherDoris Liu2013-06-241-8/+4
| | | | Change-Id: I9f0495524028528ca02c7ddf94f4698d4e87af14
* Set window flags to show secure cameraDoris Liu2013-06-181-9/+24
| | | | Change-Id: I9acb47ae5d6c5b9248aeea5cd267e17243f93c74
* Switch over to use new camera activityDoris Liu2013-06-181-364/+286
| | | | Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
* New capture animationMichael Kolb2013-04-241-3/+0
| | | | | | | | | Bug: 8253060 Match new UX design for capture animation Custom layout for camera controls Change-Id: I91875ae1685d52d4f9dbb2e6e9299428a8424766
* Make MediaSaveService destroyed after unbound.Angus Kong2013-04-191-2/+0
| | | | | bug:8528779 Change-Id: I1e6b78d5603b10cde3399969cd7a8cc19655051b
* Allow swiping to filmstrip from blocker barDoris Liu2013-04-181-1/+2
| | | | | Bug: 8607910 Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c
* Improve black bar to keep camera controls in placeDoris Liu2013-04-031-16/+0
| | | | | | Bug: 8340996 Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b
* Fix NPE in CameraMichael Kolb2013-03-221-2/+6
| | | | | | Bug: 8409508 Change-Id: I962a7eccec9ca2e1c190eb1c2c252020cd0926e0
* Add a black bar symmetric to nav barDoris Liu2013-03-051-16/+13
| | | | | Also fix bug: 8323926 Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4
* Keep camera controls on the same physical sideDoris Liu2013-03-051-14/+27
| | | | Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a
* Flatten view hierarchy and rotate viewsDoris Liu2013-03-041-20/+20
| | | | | | | | | TODO: SRI pano and Lightcycle can use a bit more flattening. I will get to them next. (Maybe in a different CL.) TODO: Need to cancel capture animation in onConfigurationChanged() Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf
* Use cross fade rotation animationMichael Kolb2013-02-251-2/+27
| | | | | | Bug: 8257846 Change-Id: I891eda12f3de2ec0cd0f7672b991a19e6464873c
* Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryceDoris Liu2013-02-161-0/+18
|\
| * Make photo orientation consistent with UIDoris Liu2013-02-151-0/+18
| | | | | | | | | | | | | | Also fixed the wrong animation orientation. Bug: 7302506 Change-Id: I58615a7b3cc2e08c2a8dc4e174512a502c2482f5
* | Remove com.android.camera.RJohn Reck2013-02-151-0/+1
|/ | | | Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
* Make video snapshot save images in the background.Angus Kong2013-01-311-0/+41
| | | | | bug:8114662 Change-Id: I4e96269bd7723dd9a82d2905a01f736c8982c4ed
* Animate between photo modulesJohn Reck2013-01-311-20/+67
| | | | Change-Id: I20f0d470a14bb41757788897c1c5e7ea42a7426d
* Move Camera Java/Native source into Gallery2Michael Kolb2013-01-291-0/+437
Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 10:49:48 +0000