summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
Commit message (Collapse)AuthorAgeFilesLines
* 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
* / Add enable/disable swiping to filmstripDoris Liu2013-06-067-11/+27
|/ | | | Change-Id: I3e019764a72f947545cd230b9bfe45f67d83dc29
* Merge "Play video from flim strip." into gb-ub-photos-carlsbadAngus Kong2013-06-055-26/+63
|\
| * Play video from flim strip.Angus Kong2013-06-045-26/+63
| | | | | | | | Change-Id: Iaedf42d7dabee53f75a20c57f9e6916864ea271f
* | Add interface for swipe checking.Angus Kong2013-06-053-0/+22
|/ | | | | | And fullscreen notification. Change-Id: Ib264904cca47f1fc90ae5e392f0672c253e4d833
* Merge "Get new camera activity up to date" into gb-ub-photos-carlsbadDoris Liu2013-06-046-178/+122
|\
| * Get new camera activity up to dateDoris Liu2013-06-036-178/+122
| | | | | | | | Change-Id: I24241bc6082052a1da90b9c41c3362af72e47b37
* | Fix pie menu button disappearingDoris Liu2013-06-031-1/+1
| | | | | | | | Change-Id: Ia664ac3115849227848c465067a78ef3aaf445cb
* | Merge "Add secure camera support." into gb-ub-photos-carlsbadAngus Kong2013-06-043-42/+139
|\ \
| * | Add secure camera support.Angus Kong2013-06-033-42/+139
| |/ | | | | | | Change-Id: I672d76cb4de37c46394a5e8ee2899cf571158a2c
* / Add play icon for videos.Angus Kong2013-06-031-6/+22
|/ | | | Change-Id: Idf73da3c2a8a3beaf45da9f8219ed71c720a5bfd
* Merge "Add recent changes to new photo module" into gb-ub-photos-carlsbadDoris Liu2013-06-037-77/+73
|\
| * Add recent changes to new photo moduleDoris Liu2013-05-317-77/+73
| | | | | | | | Change-Id: Icd29a41e1564094e4feafd6c4d4c809f6253753d
* | Add newly taken photos/videos to film strip.Angus Kong2013-05-314-4/+61
|/ | | | Change-Id: I82d9e83d0a45f14036a194cf1ad5793b436357cd
* Merge "Adjust data id even if it's not currently used." into ↵Angus Kong2013-05-311-5/+11
|\ | | | | | | gb-ub-photos-carlsbad
| * Adjust data id even if it's not currently used.Angus Kong2013-05-301-5/+11
| | | | | | | | | | | | | | 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
* | Improve gesture handlingDoris Liu2013-05-319-237/+137
| | | | | | | | Change-Id: Ib1e18274480b6bb681bd06f3130f9b9ea198ea98
* | Merge "Translate the first/last view too." into gb-ub-photos-carlsbadAngus Kong2013-05-311-5/+9
|\ \
| * | Translate the first/last view too.Angus Kong2013-05-301-5/+9
| |/ | | | | | | Change-Id: Iea6dfa8acc632596fdf05001b6b11d11d014a8a0
* | Merge "Don't use the same drawable for every view." into gb-ub-photos-carlsbadAngus Kong2013-05-311-1/+2
|\ \
| * | Don't use the same drawable for every view.Angus Kong2013-05-301-1/+2
| |/ | | | | | | | | | | The placeholder drawable should be cloned for each view using it. Change-Id: Ic9f7614cc91c95a16105b3b8a9e07c81a8f1a2d7
* / Fix mistakenly reversed order in FilmStripView.Angus Kong2013-05-301-2/+2
|/ | | | Change-Id: Ia9b285adbf448383e8f19081a16b8351b3c201e4
* am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-301-2/+23
|\ | | | | | | | | * commit 'af65d7ba216eba60651d11d248d20346309375ed': Add HTC One picture resolutions
| * Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-301-2/+23
| |\
| | * Add HTC One picture resolutionsMichael Kolb2013-05-301-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 9175168 Fixes bug where preview is not stopped before size changes Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8
* | | am a1db2653: Dismiss settings when showing popup in Video mode.Angus Kong2013-05-301-0/+1
|\| | | | | | | | | | | | | | * commit 'a1db26536913f1259ad74c5e6e952521c05bf2f0': Dismiss settings when showing popup in Video mode.
| * | Dismiss settings when showing popup in Video mode.Angus Kong2013-05-291-0/+1
| | | | | | | | | | | | | | | bug:8771618 Change-Id: I889b794c6732b674e26436f950e81f67529012e7
* | | Merge "Add UI for insertion in FilmStripView." into gb-ub-photos-carlsbadAngus Kong2013-05-292-37/+138
|\ \ \
| * | | Add UI for insertion in FilmStripView.Angus Kong2013-05-282-37/+138
| | | | | | | | | | | | | | | | Change-Id: Iff389525e3811c5018365b6e6c3b9f8b95b9da9a
* | | | Removed unused handling for intent extras in editor.Ruben Brunk2013-05-282-3/+4
|/ / / | | | | | | | | | | | | Bug: 9170644 Change-Id: I569b16d278d1813f5a96f9e0231ed71ff9e33687
* | | am 9fb962fe: Merge "Change the order of exposure compensation" into ↵Doris Liu2013-05-281-4/+4
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit '9fb962feb94909af05ab6cf872eee7e8928eb9b1': Change the order of exposure compensation
| * | Change the order of exposure compensationDoris Liu2013-05-241-4/+4
| |/ | | | | | | | | Bug: 9119379 Change-Id: I2e70ab1e83cf322ee0043850b2d27db962039bf3
* | Merge "Fix/simplify comparator of LocalData." into gb-ub-photos-carlsbadAngus Kong2013-05-231-9/+11
|\ \
| * | Fix/simplify comparator of LocalData.Angus Kong2013-05-231-9/+11
| | | | | | | | | | | | Change-Id: I433516d630de3d0f98d7ab8c35becf0cc6495bef