summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2013-09-1641-330/+166
| | | | | Change-Id: Ib51b9e17820f90dcc176c4f8196d60bca3b0d0a5 Auto-generated-cl: translation import
* am d095b79d: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-09-140-0/+0
|\ | | | | | | | | * commit 'd095b79d083440e20d683ddb05ff8477159ee38f': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGEBaligh Uddin2013-09-1447-0/+328
| | | | | | | | | | Change-Id: I66cd67cee8d92b6c594ad9f19d217a1a4cceae44 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2013-09-1455-0/+384
| | | | | | | | | | Change-Id: Icb32a9036f201b08701bfeea02cbf38552b1f24e Auto-generated-cl: translation import
* | am 44974d4b: Don\'t show menu/indicators in wide-angle mode.Angus Kong2013-09-131-1/+3
|\| | | | | | | | | * commit '44974d4b8014ec1f3c8ef1b9d77aae990bbba821': Don't show menu/indicators in wide-angle mode.
| * Don't show menu/indicators in wide-angle mode.Angus Kong2013-09-131-1/+3
| | | | | | | | | | | | bug:10674078 Change-Id: I08edd11ead1c71cd6b81274938c92f788c039a8f
* | am 7e1e10f3: Merge "Fix potential deadlock while rendering the preview." ↵Sascha Haeberling2013-09-131-2/+4
|\| | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25': Fix potential deadlock while rendering the preview.
| * Merge "Fix potential deadlock while rendering the preview." into ↵Sascha Haeberling2013-09-131-2/+4
| |\ | | | | | | | | | gb-ub-photos-carlsbad
| | * Fix potential deadlock while rendering the preview.Sascha Haeberling2013-09-131-2/+4
| | | | | | | | | | | | | | | | | | Bug: 10748013 Change-Id: Id03053f47ee3c066347dd136b6abe9fb1a5d6502
* | | am a29e0bfc: Merge "Always leave full-screen when swip from camera." into ↵Angus Kong2013-09-131-9/+6
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'a29e0bfcafa292adba7fff2daf0f754627e47137': Always leave full-screen when swip from camera.
| * | Merge "Always leave full-screen when swip from camera." into ↵Angus Kong2013-09-131-9/+6
| |\ \ | | |/ | |/| | | | gb-ub-photos-carlsbad
| | * Always leave full-screen when swip from camera.Angus Kong2013-09-121-9/+6
| | | | | | | | | | | | | | | | | | bug:10714779 Change-Id: Ifa10f151974ac0598a0c27751e23c77d525d332e
* | | am 539b9eec: Merge "Avoid flickering after swipe to delete." into ↵Angus Kong2013-09-131-9/+43
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '539b9eec067c012d17f482975cf8053e04a11759': Avoid flickering after swipe to delete.
| * | Merge "Avoid flickering after swipe to delete." into gb-ub-photos-carlsbadAngus Kong2013-09-131-9/+43
| |\ \
| | * | Avoid flickering after swipe to delete.Angus Kong2013-09-121-9/+43
| | | | | | | | | | | | | | | | | | | | | | | | bug:10624385 Change-Id: Id4d65a391b2d13a5d6cc08ae9c1b787610c94c46
* | | | am a7035394: Merge "Fix crash due to a hole in setDataSource." into ↵ztenghui2013-09-131-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'a7035394b246b238c19230c92672dbda2ab1f88c': Fix crash due to a hole in setDataSource.
| * | | Merge "Fix crash due to a hole in setDataSource." into gb-ub-photos-carlsbadztenghui2013-09-131-1/+3
| |\ \ \
| | * | | Fix crash due to a hole in setDataSource.ztenghui2013-09-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setDataSource() somehow throws a RuntimeException instead of IllegalArgumentException when seeing unsupported video file. bug:10732664 Change-Id: I79ab1f1afd8750bb37df0c8fc9448dbb2e00230a
* | | | | am 1e689c25: Fix DeadLock in TinyPlanet.Sascha Haeberling2013-09-121-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '1e689c254960f0ced0d19d91067cc5ef703dec64': Fix DeadLock in TinyPlanet.
| * | | | Fix DeadLock in TinyPlanet.Sascha Haeberling2013-09-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10393598 Now that we acquire the lock inside doInBackground, we need to make sure to run the AsyncTasks in parallel. Change-Id: If253f375d56c352c30076f00cf923dfa521f2db4
* | | | | am a5a08d76: Bring back tiny planet to the Camera filmstripSascha Haeberling2013-09-1212-32/+1360
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5a08d7642a1fdf961b057cc90e76c4c93103c15': Bring back tiny planet to the Camera filmstrip
| * | | | Bring back tiny planet to the Camera filmstripSascha Haeberling2013-09-1212-32/+1360
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10393598 The native code and XmpUtil are mostly 1:1 copies from Gallery2. The UI is new and should work on all form factors. Change-Id: Ia302a4a7a24cf0b3aa583836683c459e9e7e1f85
* | | | | am 742cd5b1: Keep undo bar around until there is user interacitonDoris Liu2013-09-122-29/+112
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '742cd5b18e1899bee1d430b61891238c0f3502b6': Keep undo bar around until there is user interaciton
| * | | | Keep undo bar around until there is user interacitonDoris Liu2013-09-122-29/+112
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10678578 Bug: 10674009 Also removed the use of withEndAction() call because it was introduced in API 16, whereas we need to be compatible with API 14+ Change-Id: I785770ae9a083f88056e94fc5378daf8ebc6dc6e
* | | | am a29a0ad0: Merge "When current data is preview, don\'t show the action ↵ztenghui2013-09-122-9/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | bar." into gb-ub-photos-carlsbad * commit 'a29a0ad0fa7667177025a26d3043cb601ae17a6c': When current data is preview, don't show the action bar.
| * | | Merge "When current data is preview, don't show the action bar." into ↵ztenghui2013-09-122-9/+30
| |\| | | | |/ | |/| | | | gb-ub-photos-carlsbad
| | * When current data is preview, don't show the action bar.ztenghui2013-09-122-9/+30
| | | | | | | | | | | | | | | | | | bug:10678458 Change-Id: Ia48ca694ddca47438338e7223e9fa19c2c65dd5d
* | | am d1b0801a: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-09-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'd1b0801a2e7f80c5ac047dded1edd0d3806f1e86': Import translations. DO NOT MERGE
| * | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbadBaligh Uddin2013-09-122-13/+13
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-09-112-13/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: Id3a2de300eaa51a628613b653410bc6582545c83 Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-122-13/+13
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-112-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I69256509cf492a69765c6b9896aa2751aa114619 Auto-generated-cl: translation import
* | | | | am 36e56fba: Show captured image rather than frozen preview for capture intentDoris Liu2013-09-113-6/+39
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '36e56fba281292255a01ee00b4bee067fa09ab59': Show captured image rather than frozen preview for capture intent
| * | | | Show captured image rather than frozen preview for capture intentDoris Liu2013-09-113-6/+39
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 10570887 Change-Id: Ie986c865bdf452973b833efcdcb397c27bef2420
* | | | am 7b265a6b: Fix the flash mode transition in video modeztenghui2013-09-118-97/+87
|\| | | | |/ / |/| | | | | | | | * commit '7b265a6b2f55c6ae7afc30e63ba324c4084a5d8e': Fix the flash mode transition in video mode
| * | Fix the flash mode transition in video modeztenghui2013-09-118-97/+87
| |/ | | | | | | | | | | | | | | | | | | onSwitchMode is wrongly overloaded, now is fixed. Basically, onCurrentDataChanged will handle the switching in and out of Camera. onDataFullScreenChange will handle full screen change on non-preview data. bug:10610967 Change-Id: I199a20d40d66b78302e90e0f96826d03076b0e39
* | am 20703f72: Merge "Flinging back should stop at the first photo first." ↵Angus Kong2013-09-101-11/+30
|\| | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '20703f72e087a01e6a589c2875819cf817581a51': Flinging back should stop at the first photo first.
| * Merge "Flinging back should stop at the first photo first." into ↵Angus Kong2013-09-101-11/+30
| |\ | | | | | | | | | gb-ub-photos-carlsbad
| | * Flinging back should stop at the first photo first.Angus Kong2013-09-101-11/+30
| | | | | | | | | | | | | | | | | | bug:10634016 Change-Id: I44e715268b913902a444c977c136d1e0381b3833
* | | am e1d5ba4f: Hide zoom view when going to full screenDoris Liu2013-09-101-3/+5
|\| | | | | | | | | | | | | | * commit 'e1d5ba4fc5470043e8645984e3018b712f5dfcff': Hide zoom view when going to full screen
| * | Hide zoom view when going to full screenDoris Liu2013-09-101-3/+5
| |/ | | | | | | | | | | Bug: 10654903 Change-Id: Ibeed1e02e203dffc4aba69a52b748206a734294f
* | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-1060-10943/+3
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-09-0960-10943/+3
| | | | | | | | | | | | | | | Change-Id: Id933394699ad53eace19d97d160e4b86f2181d90 Auto-generated-cl: translation import
* | | am 44c02874: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-09-100-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '44c028746ab84c9f12e4f4db14aeda87c51d9835': Import translations. DO NOT MERGE
| * | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbadBaligh Uddin2013-09-1049-9170/+3
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-09-0949-9170/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I38c56cd29e446a64f00837851aa21507f4761dbd Auto-generated-cl: translation import
* | | | am 6aae9177: Merge "Fix images being off-center in filmstrip." into ↵Angus Kong2013-09-091-77/+84
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '6aae9177ac432df82971facab214b365e92b4a04': Fix images being off-center in filmstrip.
| * | | Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbadAngus Kong2013-09-101-77/+84
| |\ \ \
| | * | | Fix images being off-center in filmstrip.Angus Kong2013-09-091-77/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:10609827 bug:10650966 Change-Id: Ie06beaeb7c6a616d5d7ca751cfaa65a64844332c
* | | | | am e074fcbd: Merge "Hide zoom view when back is pressed" into ↵Doris Liu2013-09-091-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'e074fcbdb7d7bb20dde8173b969cbbafb53b92a9': Hide zoom view when back is pressed
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 19:12:24 +0000