OSDN Git Service
John Reck [Wed, 22 May 2013 23:47:01 +0000 (16:47 -0700)]
am
01ae91aa: Merge "Fix height" into gb-ub-photos-bryce
* commit '
01ae91aa0e347c5a8b335afc8cb0f02459ee5adc':
Fix height
Sascha Haeberling [Wed, 22 May 2013 23:46:59 +0000 (16:46 -0700)]
am
80a3d636: Make capture thumbnail tappable in video mode.
* commit '
80a3d636fa38bb78dbc9f224b4944a21a6e3271d':
Make capture thumbnail tappable in video mode.
Angus Kong [Wed, 22 May 2013 00:00:00 +0000 (17:00 -0700)]
Keep camera preview in view hierarchy.
Camera preview is a special case that needs to be kept to avoid unnecessary
start and stop preview.
Change-Id: I6c922d4b35ff86981fa6a3ec3b76417d07a68a0e
Angus Kong [Wed, 22 May 2013 00:13:34 +0000 (00:13 +0000)]
Merge "Fix off-position issue after changing orientation" into gb-ub-photos-carlsbad
Angus Kong [Mon, 20 May 2013 23:27:02 +0000 (16:27 -0700)]
Fix off-position issue after changing orientation
Change-Id: I1c40b9ede5fa85ab46d9bcb9ab586e66c4c132c8
John Reck [Tue, 21 May 2013 22:55:16 +0000 (22:55 +0000)]
Merge "Fix height" into gb-ub-photos-bryce
John Reck [Mon, 20 May 2013 21:45:14 +0000 (14:45 -0700)]
Fix height
Change-Id: I133063acdad4a1afe8e0a9105591dd90354913f0
George Mount [Tue, 21 May 2013 22:31:50 +0000 (22:31 +0000)]
Merge "Make preview size smaller so that low-res images come in faster." into gb-ub-photos-carlsbad
George Mount [Tue, 21 May 2013 22:30:59 +0000 (22:30 +0000)]
Merge "Combine code for bitmap decoding and add byte array decoding." into gb-ub-photos-carlsbad
George Mount [Mon, 20 May 2013 23:54:09 +0000 (16:54 -0700)]
Combine code for bitmap decoding and add byte array decoding.
Change-Id: Id780f94a5d939e5423b87f2e1d4ddf18b3dfa126
Bobby Georgescu [Tue, 21 May 2013 22:20:50 +0000 (22:20 +0000)]
Merge "Add comments to bitmap pools" into gb-ub-photos-carlsbad
Bobby Georgescu [Tue, 21 May 2013 19:08:06 +0000 (12:08 -0700)]
Add comments to bitmap pools
Change-Id: Ie841316629ef0737dcdd5002b3278cf0bca3a768
Sascha Haeberling [Tue, 21 May 2013 18:26:13 +0000 (11:26 -0700)]
Make capture thumbnail tappable in video mode.
Bug:
9054122
Also make gotoGallery public for LightCycle to use.
Change-Id: I3cd5af26531a756e78c1478de29155dfda709afc
George Mount [Tue, 21 May 2013 20:26:25 +0000 (13:26 -0700)]
Make preview size smaller so that low-res images come in faster.
Change-Id: I82fea176a2aa8b0a3abfd829c0ec2d16f267ef5b
Doris Liu [Tue, 21 May 2013 17:13:57 +0000 (10:13 -0700)]
am
aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce
* commit '
aa77f39a3a18ee7945177189c358ef6208e6da2b':
Fix camera controls blink on startup
Doris Liu [Tue, 21 May 2013 17:12:03 +0000 (17:12 +0000)]
Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce
John Hoford [Tue, 21 May 2013 16:10:46 +0000 (09:10 -0700)]
am
a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce
* commit '
a285bc130ff1175c60085410f317e90f6443c39b':
fix TinyPlanets Filter landscape crash
John Hoford [Tue, 21 May 2013 16:09:17 +0000 (16:09 +0000)]
Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce
Bart Sears [Tue, 21 May 2013 15:55:35 +0000 (08:55 -0700)]
am
a83166df: Bump up the version number to 1.1.40012
* commit '
a83166dfc97c6d45b03728a2ae32b085e91b8d0c':
Bump up the version number to 1.1.40012
John Hoford [Tue, 21 May 2013 01:24:12 +0000 (18:24 -0700)]
fix TinyPlanets Filter landscape crash
bug:
9038163
Change-Id: Ice1e01dfa0e9ac72e5019fac900e76bd38955e05
Angus Kong [Tue, 21 May 2013 00:04:01 +0000 (00:04 +0000)]
Merge "Fix jitter in FilmStripView." into gb-ub-photos-carlsbad
Angus Kong [Mon, 20 May 2013 20:46:14 +0000 (13:46 -0700)]
Fix jitter in FilmStripView.
The jigger happens when deleting the one before the last. The length of the film
strip might be changed due to the deletion.
Change-Id: I269a5d88eb77ed5fa6e44ae9c86c2941ecd718b1
Bart Sears [Mon, 20 May 2013 22:59:20 +0000 (15:59 -0700)]
Bump up the version number to 1.1.40012
Bug:
8607157
Change-Id: I5fdf05fd4d10a54f72129177572285d438740b97
Doris Liu [Mon, 20 May 2013 22:21:05 +0000 (15:21 -0700)]
Fix camera controls blink on startup
Bug:
9052837
Change-Id: Ie15b812c6e6e7879d29d96a345173a2130b2fe91
Ruben Brunk [Mon, 20 May 2013 21:23:32 +0000 (14:23 -0700)]
am
286afab1: Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce
* commit '
286afab10fb4c528ea503981c4f1bdbcfbdbde77':
Avoid using region decoder for bad image types when setting wallpaper.
Ruben Brunk [Mon, 20 May 2013 21:22:09 +0000 (21:22 +0000)]
Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce
Sascha Haeberling [Mon, 20 May 2013 21:09:25 +0000 (14:09 -0700)]
am
7af7156a: Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce
* commit '
7af7156a809934951877b1f9b9ad1ceeb9c9a5ce':
Make sure canceling a filter does not undo previous filter.
Sascha Haeberling [Mon, 20 May 2013 21:07:00 +0000 (21:07 +0000)]
Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce
Ruben Brunk [Mon, 20 May 2013 18:34:24 +0000 (11:34 -0700)]
Avoid using region decoder for bad image types when setting wallpaper.
Bug:
8893617
Change-Id: I9830ea0d76acff8a524186cf505963c48d9f1fbe
John Hoford [Mon, 20 May 2013 14:44:23 +0000 (07:44 -0700)]
am
26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce
* commit '
26e3c48b831e39ced1db18673f12fb3c7a2d56d8':
Disable zoom
John Hoford [Mon, 20 May 2013 14:42:44 +0000 (14:42 +0000)]
Merge "Disable zoom" into gb-ub-photos-bryce
John Hoford [Fri, 17 May 2013 00:37:46 +0000 (17:37 -0700)]
Disable zoom
Bug:
8791729
Change-Id: I2ee9d9e644842ce0a7014a1665e6bd1d001e4f06
Baligh Uddin [Fri, 17 May 2013 22:51:32 +0000 (15:51 -0700)]
am
082541a7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
082541a730e56092b948580a8e8040be78979e23':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 17 May 2013 22:49:53 +0000 (22:49 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Michael Kolb [Fri, 17 May 2013 22:37:24 +0000 (15:37 -0700)]
am
1a266f16: Highlight selected option in FX and Borders
* commit '
1a266f16edbef7cb0a770d37fcad958fc55a5862':
Highlight selected option in FX and Borders
Michael Kolb [Fri, 17 May 2013 16:09:21 +0000 (09:09 -0700)]
Highlight selected option in FX and Borders
Bug:
8791729
Change-Id: I8ac2c3deabe7b293df48db9f44f52956443a92a4
Baligh Uddin [Fri, 17 May 2013 19:41:48 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5a5fee30a1f76b360c7ffca2ffec7592a66d7e52
Auto-generated-cl: translation import
Angus Kong [Thu, 16 May 2013 23:59:39 +0000 (16:59 -0700)]
Add remove UI in FilmStripView
1. Add UI support for swipe to delete.
2. Don't set children padding.
Change-Id: I26be97f14d569db3df6a127cd00efe3c0c60f22c
Doris Liu [Thu, 16 May 2013 23:54:29 +0000 (23:54 +0000)]
Merge "Add new camera activity back and fix build errors" into gb-ub-photos-carlsbad
John Reck [Thu, 16 May 2013 22:58:52 +0000 (15:58 -0700)]
am
3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce
* commit '
3b7347daf572c20996607afe4cc32f9a96f8fe5d':
Switch back to old crop
John Reck [Thu, 16 May 2013 22:58:09 +0000 (22:58 +0000)]
Merge "Switch back to old crop" into gb-ub-photos-bryce
John Reck [Thu, 16 May 2013 22:18:50 +0000 (15:18 -0700)]
Switch back to old crop
Bug:
8950255
Change-Id: I3f78901e65a17a1d5867d3f76a6031cff5f65fed
Doris Liu [Tue, 14 May 2013 21:37:46 +0000 (14:37 -0700)]
Add new camera activity back and fix build errors
Change-Id: I30b657c7eee2b8cb0317c922966821002ea956f0
Michael Kolb [Thu, 16 May 2013 21:32:55 +0000 (14:32 -0700)]
am
5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce
* commit '
5f30afbeea7d6f6f05df9e8a50b64c5cd0cc9cca':
Add new overlay icons for sharpen and curves
Michael Kolb [Thu, 16 May 2013 21:31:31 +0000 (21:31 +0000)]
Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce
Michael Kolb [Thu, 16 May 2013 21:07:29 +0000 (14:07 -0700)]
Add new overlay icons for sharpen and curves
Bug:
8791729
Change-Id: Ife86e0a22fb270df2f2f0a699f103ece5e9e9f1b
John Reck [Thu, 16 May 2013 20:57:58 +0000 (13:57 -0700)]
am
75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce
* commit '
75084da1b34e0ff9f269b5409d206c213532edbc':
toUpper() some strings
John Reck [Thu, 16 May 2013 20:56:29 +0000 (20:56 +0000)]
Merge "toUpper() some strings" into gb-ub-photos-bryce
John Reck [Thu, 16 May 2013 20:54:41 +0000 (13:54 -0700)]
am
5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce
* commit '
5a9716fe6de7af4585a24dd1d749b38a4ab48195':
Fix reset
John Reck [Thu, 16 May 2013 20:52:31 +0000 (20:52 +0000)]
Merge "Fix reset" into gb-ub-photos-bryce
John Reck [Thu, 16 May 2013 20:50:50 +0000 (13:50 -0700)]
toUpper() some strings
Bug:
8791729
Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb
John Hoford [Thu, 16 May 2013 20:46:26 +0000 (13:46 -0700)]
am
fef58a0f: change edit icon
* commit '
fef58a0fc969cc09b02cb9945da8d553698681e3':
change edit icon
John Hoford [Thu, 16 May 2013 19:55:21 +0000 (12:55 -0700)]
change edit icon
bug:
8988179
Change-Id: I57516d154e56cd694f8e76bc38774bdf7f9e5df0
John Reck [Wed, 15 May 2013 21:45:34 +0000 (14:45 -0700)]
Fix reset
Bug:
8791729
Change-Id: Id39ef76f013a38bae3d92f45b02de7cd184edfec
Michael Kolb [Wed, 15 May 2013 18:57:26 +0000 (11:57 -0700)]
am
c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce
* commit '
c2f813a36711742af3b23743ef1849cec13a9a95':
Grey out undo/redo/reset according to state
Michael Kolb [Wed, 15 May 2013 18:57:25 +0000 (11:57 -0700)]
am
655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce
* commit '
655e208d5dc1305d9e4eb5301dec0673136151c9':
Correct label position after rotation
Michael Kolb [Wed, 15 May 2013 18:55:19 +0000 (18:55 +0000)]
Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce
Michael Kolb [Wed, 15 May 2013 18:55:08 +0000 (18:55 +0000)]
Merge "Correct label position after rotation" into gb-ub-photos-bryce
ztenghui [Wed, 15 May 2013 17:37:40 +0000 (10:37 -0700)]
am
4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce
* commit '
4aa8d5fc9d3478d511786cb99d5ba704d3e1f426':
Fix another annoying warning log spam
ztenghui [Wed, 15 May 2013 17:25:40 +0000 (17:25 +0000)]
Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce
Angus Kong [Wed, 15 May 2013 00:18:23 +0000 (00:18 +0000)]
Merge "Improve bitmap load efficiency." into gb-ub-photos-carlsbad
Michael Kolb [Tue, 14 May 2013 22:43:28 +0000 (15:43 -0700)]
Grey out undo/redo/reset according to state
Bug:
8791729
Change-Id: I1252a9634870e56c8989688eeb28b1b4c2781827
Michael Kolb [Tue, 14 May 2013 21:28:14 +0000 (14:28 -0700)]
Correct label position after rotation
Bug:
8963421
Change-Id: If361e0ca6f20612ec3baae74cde444bd26164ab3
Doris Liu [Tue, 14 May 2013 21:26:53 +0000 (14:26 -0700)]
am
26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce
* commit '
26dbb20c15e27d22a14efd0a25ec4e50cf5084cc':
Pause face detection when review captured images
Doris Liu [Tue, 14 May 2013 21:25:22 +0000 (21:25 +0000)]
Merge "Pause face detection when review captured images" into gb-ub-photos-bryce
Angus Kong [Mon, 6 May 2013 17:42:28 +0000 (10:42 -0700)]
Improve bitmap load efficiency.
Call prepare before/recycle after using image data.
Change-Id: I3387c8ca68f57c3949fed2aaa3e26490e66c791a
Tim Murray [Tue, 14 May 2013 19:45:17 +0000 (12:45 -0700)]
am
33f2a880: Only link librsjni in unbundled branches.
* commit '
33f2a8800ff5228bf81a0fdc75c1289bae9a4d1c':
Only link librsjni in unbundled branches.
Doris Liu [Tue, 14 May 2013 18:31:19 +0000 (11:31 -0700)]
Pause face detection when review captured images
Bug:
8799508
Change-Id: I994299a3ad406bcee5e6699265cb0ab29612e62c
Ruben Brunk [Tue, 14 May 2013 07:58:37 +0000 (00:58 -0700)]
Fix FP rounding error for crop bounds.
Bug:
8874599
Change-Id: I94198e4dcdbb0afa1dd788130645855b33e8f30b
Tim Murray [Mon, 13 May 2013 22:47:58 +0000 (15:47 -0700)]
Only link librsjni in unbundled branches.
bug
8939828
Change-Id: I87d28185c6fb2b23852eb66487bf99d6111c3a7a
Angus Kong [Mon, 13 May 2013 20:42:21 +0000 (13:42 -0700)]
Dropping back FilmStripView codes.
Ongoing work that doesn't affect builds.
Change-Id: I83d81fa91e87d10787c3ce1d767bc41131341067
Doris Liu [Mon, 13 May 2013 18:34:03 +0000 (11:34 -0700)]
am
25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce
* commit '
25d69c11831fabf8f4e474aaf17b05dd001979ce':
New count down beeps.
Doris Liu [Mon, 13 May 2013 18:32:20 +0000 (18:32 +0000)]
Merge "New count down beeps." into gb-ub-photos-bryce
ztenghui [Sat, 11 May 2013 00:44:23 +0000 (17:44 -0700)]
Fix another annoying warning log spam
bug:
8771541
When we set up the icon rendering, we need to set the geometry, too.
Change-Id: I331bdb752c5183d5e2611d8387505055c4219b92
Doris Liu [Mon, 13 May 2013 17:48:54 +0000 (10:48 -0700)]
New count down beeps.
Bug:
8872947
Change-Id: Ifc84daabba0a4e85e32fd3547303716ca5ed649a
Ruben Brunk [Fri, 10 May 2013 21:53:21 +0000 (14:53 -0700)]
Revert "Reinitialize all the filters after Crop is applied."
This reverts commit
1cfbaca7bef29b7d510c5e1de424e68cd8804022.
Victor Doba [Fri, 10 May 2013 12:23:04 +0000 (14:23 +0200)]
Reinitialize all the filters after Crop is applied.
Change-Id: I192918a3f28eac400e2e35f3b410dc8adc1a8ad4
George Mount [Fri, 10 May 2013 01:04:54 +0000 (18:04 -0700)]
am
ac94740c: Remove GL dependency on unused stencil buffers.
* commit '
ac94740cd673a016542d803c8600633c99b7427e':
Remove GL dependency on unused stencil buffers.
George Mount [Thu, 9 May 2013 20:30:39 +0000 (13:30 -0700)]
Remove GL dependency on unused stencil buffers.
Bug
8884435
Change-Id: I8e7f0563a4a901953e3e2b14e35457b4fefe2e34
ztenghui [Thu, 9 May 2013 16:27:04 +0000 (09:27 -0700)]
resolved conflicts for merge of
9a4fb2dc to gb-ub-photos-carlsbad
Change-Id: I90ffd8732cf34bb3dea7a849fc37fb1f3d82df39
ztenghui [Thu, 9 May 2013 16:18:09 +0000 (16:18 +0000)]
Merge "Fix the verbose log" into gb-ub-photos-bryce
George Mount [Thu, 9 May 2013 14:31:43 +0000 (14:31 +0000)]
Merge "Fix bitmap buffer size." into gb-ub-photos-carlsbad
Bart Sears [Thu, 9 May 2013 06:14:10 +0000 (23:14 -0700)]
am
b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryce
* commit '
b298ab636fec3894b9e702eaa0a6028ba03f49b1':
Close menu in onPause
Bart Sears [Thu, 9 May 2013 06:12:06 +0000 (06:12 +0000)]
Merge "Close menu in onPause" into gb-ub-photos-bryce
Sascha Haeberling [Thu, 9 May 2013 00:34:18 +0000 (17:34 -0700)]
Make sure canceling a filter does not undo previous filter.
Bug:
8770921
Change-Id: I2b8e5fac980f562eaf97b231ad15612004608164
Michael Kolb [Thu, 9 May 2013 00:00:18 +0000 (17:00 -0700)]
am
e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
* commit '
e324a388ead1f291fe27eb6b4ce5f25b55a29a49':
Add drop shadow to preview thumb
Michael Kolb [Wed, 8 May 2013 23:58:45 +0000 (23:58 +0000)]
Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
ztenghui [Wed, 8 May 2013 21:43:15 +0000 (14:43 -0700)]
Fix the verbose log
Now use adb shell log.tag.BasicRepresentation VERBOSE to turn on the logging.
bug:
8771541
Change-Id: Ib9e1e44dbbd4e46798226d8ab5dc7365e8a90e27
Michael Kolb [Wed, 8 May 2013 00:24:23 +0000 (17:24 -0700)]
Add drop shadow to preview thumb
Bug:
8826241
Also, remove animateSlide blocker, it caused frozen review
Change-Id: Ic8eb129ec236726550a26bc387967fe0c00473e9
Michael Kolb [Wed, 8 May 2013 23:05:04 +0000 (16:05 -0700)]
Close menu in onPause
Bug:
8722672
Change-Id: Ia3fac3ccc5db6cc1bb2a1dd32960ec6295735cfc
George Mount [Wed, 8 May 2013 22:51:48 +0000 (15:51 -0700)]
Fix bitmap buffer size.
The buffer size wasn't sufficient for some images.
Change-Id: Iba008c5bd4801183450f6076d73d19db531d5f3b
Doris Liu [Wed, 8 May 2013 22:21:44 +0000 (22:21 +0000)]
Merge "Remove new camera activity to avoid build breakage" into gb-ub-photos-carlsbad
Doris Liu [Wed, 8 May 2013 22:14:15 +0000 (15:14 -0700)]
Remove new camera activity to avoid build breakage
Change-Id: I56f0586ae196f57a0f55b8d835e6bc8fd27bdcfe
Sascha Haeberling [Wed, 8 May 2013 22:15:53 +0000 (15:15 -0700)]
am
58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
* commit '
58f32428768ff67520e0363de7a8c1929a4eac1f':
Reduce max size of bitmap returned by crop dialog.
Sascha Haeberling [Wed, 8 May 2013 22:13:44 +0000 (22:13 +0000)]
Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 21:31:41 +0000 (14:31 -0700)]
am
c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce
* commit '
c3fde4b4032591fc34ce118860e53fe92c0b3706':
Fix second level menu
Michael Kolb [Wed, 8 May 2013 21:30:01 +0000 (21:30 +0000)]
Merge "Fix second level menu" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 18:14:35 +0000 (11:14 -0700)]
Fix second level menu
Bug:
8857098
Added Countdown timer and picture size items
Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
Sascha Haeberling [Wed, 8 May 2013 21:00:42 +0000 (14:00 -0700)]
Reduce max size of bitmap returned by crop dialog.
Bug:
8851336
Change-Id: Id69c46c44b22ce753900c52e34944428a38d02c6
Angus Kong [Wed, 8 May 2013 18:17:46 +0000 (11:17 -0700)]
am
188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce
* commit '
188ad6eda97b4e05853d582198722e70f9e03705':
DO NOT MERGE Further assets clean up.