summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Improvements in animation from album page to photo page" into ↵Bobby Georgescu2012-08-215-4/+119
|\ | | | | | | gb-ub-photos-arches
| * Improvements in animation from album page to photo pageBobby Georgescu2012-08-215-4/+119
| | | | | | | | | | | | Bug: 6631829 Bug: 6979922 Change-Id: I99fd330f3ec8bf363f8602a2f893167ca2a9c71b
* | Move ThreadPool to gallerycommon for picasasync and picasastore.Hung-ying Tyan2012-08-214-367/+0
|/ | | | | Bug: 7005321 Change-Id: I7ae4bafed141be03bca74772a261c7c2fb3036c4
* Rotate the camera screen nail correctly in gingerbread.Wu-cheng Li2012-08-205-4/+26
| | | | | | | | | In gingerbread, camera screen nail is a static image. Handle its rotation like a bitmap screen nail. bug:6927809 Change-Id: I554483e58fc9e32399acb20f426d7ec35631b7ac
* Clear activity result when launching from lock screen.George Mount2012-08-173-0/+14
| | | | | | | | | | Bug 6710029 When the screen is locked during video play, the activity result from that play will be triggered immediately when unlocking to camera. The result must be destroyed on unlock so that the resume goes to the camera rather than to the video display. Change-Id: Ifa6f00fa1cba119d5fc6e762d1757bd6aac576f4
* Fix NPE when view a single photo.Owen Lin2012-08-171-0/+3
| | | | | bug: 6995776 Change-Id: Iba213dfefcab04f2c856f55dc3446e3314f30a6f
* Load AsyncTask class in UI thread.Owen Lin2012-08-171-0/+11
| | | | | | bug: 7005321 Change-Id: I4f8806553aee34fb2ebeaef010c14c88679a7f72
* Merge "Fix some bugs introduced by the ActionBarWrapper." into ↵Owen Lin2012-08-164-15/+68
|\ | | | | | | gb-ub-photos-arches
| * Fix some bugs introduced by the ActionBarWrapper.Owen Lin2012-08-164-15/+68
| | | | | | | | | | | | bug: 6927267 Change-Id: If05082a4fec25f93d38c6096ebacc5a82e7e7c2e
* | Check if actionbar exists at ActionBarUtils.getActionBar().Ahbong Chang2012-08-161-3/+6
|/ | | | | Bug: 6927267 Change-Id: I85645f25879ced48a85a2bef4f55f1c34b8806ec
* Merge "Add SimpleMenuXXX implementation for the Gingerbread platform." into ↵Owen Lin2012-08-159-8/+487
|\ | | | | | | gb-ub-photos-arches
| * Add SimpleMenuXXX implementation for the Gingerbread platform.Owen Lin2012-08-159-8/+487
| | | | | | | | | | | | | | | | | | | | | | | | 1. Add a SimpleMenuInflator to parse the res/menu/xxx.xml files. 2. Add minimal code to show the menu. **NOTE** This change is going to be replaced by the ActionBar compat library when it gets ready and integrated. The purpose of this change is making Gallery/Camera run on GB. Change-Id: Ia7d402c82a6da1b9558ebbd103e161d2471b34dd
* | Merge "Extract the action bar interface." into gb-ub-photos-archesOwen Lin2012-08-1515-283/+652
|\|
| * Extract the action bar interface.Owen Lin2012-08-1515-283/+652
| | | | | | | | | | | | | | | | | | | | | | | | | | So that we can use different implementation for different API levels. **NOTE** This change is going to be replaced by the ActionBar compat library when it gets ready. The purpose of this change is making Gallery/Camera run on GB. bug: 6927267 Change-Id: Ic8bb2518918168ea889db6452d6760de390d96b2
* | Merge "A simple ExifReader and its test" into gb-ub-photos-archesOwen Lin2012-08-143-0/+300
|\ \ | |/ |/|
| * A simple ExifReader and its testEarl Ou2012-08-153-0/+300
| | | | | | | | Change-Id: I1a30d24591bbdab288e04e3705ece388b533f247
* | Merge "Gallery reskin: album list spacing, action bar theme" into ↵Bobby Georgescu2012-08-142-5/+11
|\ \ | |/ |/| | | gb-ub-photos-arches
| * Gallery reskin: album list spacing, action bar themeBobby Georgescu2012-08-142-5/+11
| | | | | | | | Change-Id: Ic556f22bd25c57ddd0b659a7f43a7a1afbdcb8df
* | Merge "Make a copy of MotionEvent in MotionEventHelper.transform." into ↵Wu-cheng Li2012-08-131-2/+3
|\ \ | | | | | | | | | gb-ub-photos-arches
| * | Make a copy of MotionEvent in MotionEventHelper.transform.Wu-cheng Li2012-08-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RotateLayout transforms the event in dispatchTouchEvent. If the event is not handled, the parent of RotateLayout may send the transformed event to other views and the coordinates will be wrong. Make a copy of MotionEvent in transform. This also makes the behavior consistent in different API levels. bug:6974916 Change-Id: Id835767cc9be3f244e5abe2b855e5188045adedc
* | | Merge "Extract EXIF info only for JPEG files" into gb-ub-photos-archesOwen Lin2012-08-133-3/+7
|\ \ \ | |_|/ |/| |
| * | Extract EXIF info only for JPEG filesOwen Lin2012-08-133-3/+7
| |/ | | | | | | | | bug: 6489840 Change-Id: I0ad682bffa5374d0d61ebaa502cc8b90e469b4c8
* / Show album counts in Gallery & other small reskin fixesBobby Georgescu2012-08-133-8/+12
|/ | | | | Bug: 6975144 Change-Id: I2f12c6482cc009aecbca3e26482ebd8944f01bb8
* Merge "First gallery reskin iteration." into gb-ub-photos-archesBobby Georgescu2012-08-107-16/+26
|\
| * First gallery reskin iteration.Bobby Georgescu2012-08-097-16/+26
| | | | | | | | Change-Id: I2b79ca9f40346a777141562c9a4762d7a8b460f6
* | Merge "Guard android.media.effect.Effect with TargetApi." into ↵Wu-cheng Li2012-08-1028-0/+86
|\ \ | | | | | | | | | gb-ub-photos-arches
| * | Guard android.media.effect.Effect with TargetApi.Wu-cheng Li2012-08-1028-0/+86
| |/ | | | | | | | | bug:6927717 Change-Id: I25f881ab449ea4cb26a41c5219884d93725a1693
* | Merge "Guard SurfaceTextureScreenNail with TargetApi." into gb-ub-photos-archesWu-cheng Li2012-08-101-0/+1
|\ \
| * | Guard SurfaceTextureScreenNail with TargetApi.Wu-cheng Li2012-08-101-0/+1
| |/ | | | | | | | | bug:6927809 Change-Id: If03ffbcbf908a960f00bba97be0cdbf317ecabe8
* | Merge "Fix ExifParser bug when APP0 exists in Jpeg file" into ↵Owen Lin2012-08-101-1/+12
|\ \ | | | | | | | | | gb-ub-photos-arches
| * | Fix ExifParser bug when APP0 exists in Jpeg fileEarl Ou2012-08-081-1/+12
| | | | | | | | | | | | Change-Id: If5843757e00bc12bc50003eef3d78b9c3cedf69e
* | | Merge "Handle error when string length=0 in IfdParser" into gb-ub-photos-archesOwen Lin2012-08-101-3/+7
|\| | | |/ |/|
| * Handle error when string length=0 in IfdParserEarl Ou2012-08-081-3/+7
| | | | | | | | Change-Id: I3a51e85060f3acd5026555e5f8d21f8cb2e0641e
* | Merge "Hold WakeLock during MTP import" into gb-ub-photos-archesBobby Georgescu2012-08-084-1/+35
|\ \
| * | Hold WakeLock during MTP importBobby Georgescu2012-08-084-1/+35
| | | | | | | | | | | | | | | | | | | | | Bug: 6680729 Bug: 6827858 Change-Id: Ida82db3288a429dacc5830b82ec6bbd954f75cf1
* | | Rotate the texture in building PhotoFallbackEffectOwen Lin2012-08-081-3/+18
|/ / | | | | | | | | bug: 6525127 Change-Id: Iba348450b62190a1a2149cf0d7f20f19625cb6cf
* | Guard the usage of MenuItem.setShowAsAction in MenuHelper.Owen Lin2012-08-081-1/+11
| | | | | | | | | | bug: 6927642 Change-Id: I3907ac2f86d38c15b681185abee5906ce243339a
* | Merge "Move motion event related methods to class MotionEventHelper." into ↵Wu-Cheng Li2012-08-072-94/+121
|\ \ | |/ |/| | | gb-ub-photos-arches
| * Move motion event related methods to class MotionEventHelper.Ahbong Chang2012-08-072-94/+121
| | | | | | | | | | Bug: 6943189 Change-Id: I9084cc8ebb501a5b772ed4e00bd64a3b2e8bafb3
* | Do not show photo editor before api level 14.Yuli Huang2012-08-071-0/+10
| | | | | | | | | | bug:6927717 Change-Id: Iab0fddaa169e03b65dd0a987ee8b5c892f971000
* | Add all ExifTag constantEarl Ou2012-08-071-1/+184
|/ | | | Change-Id: I8a5309cdb1d216c80df9b88973a3b72a5cf9a80f
* Merge "Remove TYPE_SUB_IFD for next() in IfdParser" into gb-ub-photos-archesOwen Lin2012-08-062-52/+23
|\
| * Remove TYPE_SUB_IFD for next() in IfdParserEarl Ou2012-08-062-52/+23
| | | | | | | | | | | | | | | | We should not read the offset because there are too many exception. Users should check the id of the tag and decide how to read the block by themselves. Change-Id: Ie3f162c5c6dc25f15107e193adc080c7b51112b5
* | Merge "fix next ifd bug in ExifParser" into gb-ub-photos-archesOwen Lin2012-08-061-1/+2
|\|
| * fix next ifd bug in ExifParserEarl Ou2012-08-061-1/+2
| | | | | | | | | | | | Originally if we don't read value of tag we won't get 'NEXT_IFD' Change-Id: I235977b3b482fbc4736c244d280c384c26df6483
* | Merge "Fix bug when call next() after nextidf in exif parser" into ↵Owen Lin2012-08-061-0/+2
|\| | | | | | | gb-ub-photos-arches
| * Fix bug when call next() after nextidf in exif parserEarl Ou2012-08-061-0/+2
| | | | | | | | Change-Id: Ibb0204627418f8fa650ce32e798a768da7762d59
* | Merge "Add logging for monkey" into gb-ub-photos-archesDoris Liu2012-08-031-1/+2
|\ \
| * | Add logging for monkeyDoris Liu2012-08-021-1/+2
| | | | | | | | | | | | | | | | | | Bug: 6495745 Change-Id: Ib24ba3dd6a887259c5e6083ca5eb270a0bd4e801
* | | TargetApi of ShareActionProvider should be ICS.Wu-cheng Li2012-08-031-1/+1
|/ / | | | | | | | | bug:6706723 Change-Id: I8d82662c4bdd44f970cb93b9986208e5f4db3c31