summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Remove old video camera icon and label from Camera2" into ↵Doris Liu2013-08-133-3/+0
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Remove old video camera icon and label from Camera2Doris Liu2013-08-133-3/+0
| | | | | | | | | | Bug: 10296343 Change-Id: I6c6f130f86b4206d6b9ef322c76e6bdbe81aa57e
* | Remove Refocus from Camera UI.Sascha Haeberling2013-08-132-13/+1
| | | | | | | | | | | | Bug:10073814 Change-Id: I023c7f61463690b02492705cedec8c74159c515d
* | Merge "Fix video capture intent handling" into gb-ub-photos-carlsbadDoris Liu2013-08-135-15/+54
|\ \ | |/ |/|
| * Fix video capture intent handlingDoris Liu2013-08-135-15/+54
| | | | | | | | | | | | Bug: 10296343 Change-Id: I55fb6c71b59a1559ebb58c65e71d510379367435
* | Add local data types.Angus Kong2013-08-125-27/+77
| | | | | | | | | | | | | | | | We need local data types to generate different menus. bug:10245009 Change-Id: I95f947c11ad3f39172c43f75f4108bf720148278
* | Don't return null if there's no images to load.Angus Kong2013-08-121-4/+7
|/ | | | | | bug:10294250 Change-Id: Id6744f5bf36715527badc098de77bf11d67ae549
* Don't set mImages to null, as we call .size() later.Sascha Haeberling2013-08-121-1/+1
| | | | | | Bug: 10293573 Change-Id: I5fab2bc4fe355c4c26dcab9b6b71ff14e7216502
* Update app name to "Camera" before merging to KLP.Sascha Haeberling2013-08-122-6/+3
| | | | Change-Id: Icbd776f5e2b07464de94b41081358996920eafcf
* Merge "Add the basic action bar back." into gb-ub-photos-carlsbadztenghui2013-08-124-46/+13
|\
| * Add the basic action bar back.ztenghui2013-08-094-46/+13
| | | | | | | | | | | | | | | | Remove outdated styles. bug:10245009 Change-Id: I1ab6e6ea7c3e5c4157951203209b573dd2edda88
* | Merge "Clean up Gallery codes." into gb-ub-photos-carlsbadAngus Kong2013-08-1082-8647/+234
|\ \
| * | Clean up Gallery codes.Angus Kong2013-08-0982-8647/+234
| | | | | | | | | | | | | | | | | | bug:10263696 Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
* | | Fix NPE after capture when camera roll is empty.Angus Kong2013-08-091-11/+2
|/ / | | | | | | | | | | | | | | Use empty array instead of null. bug:10264304 Change-Id: I486a26810dc4e0d4b562809dc243f52448dbd258
* | Merge "Add camera-related tests back." into gb-ub-photos-carlsbadSascha Haeberling2013-08-0921-0/+1796
|\ \
| * | Add camera-related tests back.Sascha Haeberling2013-08-0921-0/+1796
| | | | | | | | | | | | Change-Id: I2213618fe3b2d4ba776c5f1f94aca330a785df1a
* | | Use PopupWindow for settings popupDoris Liu2013-08-095-86/+75
|/ / | | | | | | | | 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-072-7/+39
|/ | | | Change-Id: I2ea7f4714e3003ff05eadb6cb8b93af721b39ac6
* Remove refocus icon if it's not enabled or present.Sascha Haeberling2013-08-063-14/+71
| | | | Change-Id: I0c885a7a56abfe2365d832fa5ca8c1d74ce2edc8
* Add .mk files for Camera2.Sascha Haeberling2013-08-064-0/+177
| | | | Change-Id: I0678c1b12f40f6dfd76d7589f61d18e99997394f
* This adds the following four CLs to Camera2:Sascha Haeberling2013-08-0620-289/+794
| | | | | | | | | | | | 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
* Remove two more .mk files. We will add CleanSpec.mk back later.Sascha Haeberling2013-08-062-57/+0
| | | | Change-Id: Ic58a86df7ba5002d4f9ea8c0fdacb02435a92da4
* This removes all non-Camera stuff from Camera2.Sascha Haeberling2013-08-06806-103203/+1081
| | | | | | | Note: Camera2 is a clone of Gallery2 right now. Note 2: I will bring .mk files back later. Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
* Remove all .mk files from the cloned Camera2 until the project isSascha Haeberling2013-08-066-210/+0
| | | | | | properly set up. Change-Id: I3eb79a7a756793ac5253b8c40c3fbc6c6fe2e8e3
* Merge tests/exiftool_parser/ from platform/packages/apps/Gallery2 to ↵Qiwen Zhao2013-08-051-0/+90
|\ | | | | | | tests/exiftool_parser/
| * use NO_VALUE when the output of exiftool is invalidEarl Ou2012-10-181-8/+14
| | | | | | | | Change-Id: I85c0054d70ff1639e643a30658ca59f1803f7d13
| * Do not use parentheses for Model tag in exiftool parserEarl Ou2012-10-171-10/+9
| | | | | | | | Change-Id: Idc45cd389976f0c474dceb550790a6814cb380b8
| * Parse the layer of exiftool outputEarl Ou2012-10-171-11/+30
| | | | | | | | Change-Id: I0ee45608126d49913a96790f2c2e99ec66ccbca4
| * Exiftool parserEarl Ou2012-10-121-0/+66
| | | | | | | | | | | | | | This parser parse the output from Phil Harvey's 'exiftool' with -v2 flag and convert it input xml format Change-Id: Iffdb235780697f8c37738937fd4ecaeb1d1127bb
* | Merge CleanSpec.mk/ from platform/packages/apps/Gallery2 to CleanSpec.mk/Qiwen Zhao2013-08-051-0/+56
|\ \
| * | Add a cleanstep for the build server...nicolasroard2013-03-181-0/+1
| | | | | | | | | | | | Change-Id: Ic882c28b33e04c346a1f326b1eb7cc10b870a8a3
| * | UI cleanupnicolasroard2013-03-041-0/+1
| | | | | | | | | | | | Change-Id: Iaf138455651511e610b640a716820bd846284948
| * | Remove RS intermediates to trigger a clean build.Stephen Hines2013-02-041-0/+1
| | | | | | | | | | | | Change-Id: I4925dbf21b81876bac85413f8057049e84ca324c
| * | Merge Camera into Gallery package.Chih-Chung Chang2012-03-081-0/+53
| |/ | | | | | | Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a
* | Merge proguard.flags/ from platform/packages/apps/Gallery2 to proguard.flags/Qiwen Zhao2013-08-051-0/+86
|\ \
| * | Remove legacy code ActivityBase.java.Angus Kong2013-07-241-5/+0
| | | | | | | | | | | | Change-Id: I7b372e5d69c3d01b4012ab61bbf725a7fec8a445
| * | Added jpeg streaming classes.Ruben Brunk2013-07-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Provides streaming operations for decompressing/compressing JPEG files. - Allows pixel operations to be performed on large JPEG images without holding the entire bitmap in memory. Change-Id: I597ddf282b59d2ba6d6bca4722208121e3728f94
| * | Exif parser modifications.Ruben Brunk2013-03-131-14/+3
| | | | | | | | | | | | | | | Bug: 8018327 Change-Id: I66a2ec309f9807ac255bbf29d8f5f26de60e89b8
| * | Fix proguard and makefile targets for tests.Ruben Brunk2013-02-131-0/+34
| | | | | | | | | | | | Change-Id: I19f35567eff7c6d377a95b434dc4735faca93861
| * | Switch Gallery over to RS compatibility library.Tim Murray2013-02-041-0/+2
| | | | | | | | | | | | Change-Id: If27809236534f3b196949bf455faed45c99f3da5
| * | Revert "Switch Gallery over to RS compatibility library."Stephen Hines2013-01-231-2/+0
| | | | | | | | | | | | | | | | | | This reverts commit 0746ce0977cde616d25ce35fee0d8d554235a21c Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50
| * | Switch Gallery over to RS compatibility library.Stephen Hines2013-01-221-0/+2
| | | | | | | | | | | | Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad
| * | GL packaging refactorJohn Reck2012-12-111-0/+4
| | | | | | | | | | | | Change-Id: I1d7a95c4f0b91a5ba59030d57cf6865c11b497aa
| * | Adding accessor methods for camera latency vars.Jason Noguchi2012-10-171-0/+6
| | | | | | | | | | | | Change-Id: I21cb401aa12f116abd384efee021d2738b28793c
| * | Remove old camera classes.Wu-cheng Li2012-10-161-4/+1
| | | | | | | | | | | | | | | bug:7201108 Change-Id: I539d02c411c654238d7e5e0c34e9ec3e6e6d4d90
| * | Trimming: support more box by keeping more classesTeng-Hui Zhu2012-09-301-1/+1
| | | | | | | | | | | | | | | | | | bug:7093055 Change-Id: Ie4dbae8270cf0072dfc74b5c91fec628f4cad673
| * | Fix background replacement crash in camcorder.Wu-cheng Li2012-09-271-0/+6
| | | | | | | | | | | | | | | | | | | | | Add proguard flag to prevent methods from removing. bug:7106963 Change-Id: I0e7372c3091dd02d4b475924d06b033717ca2028