OSDN Git Service
Bobby Georgescu [Tue, 28 May 2013 17:15:02 +0000 (10:15 -0700)]
am
e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
* commit '
e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e':
Prevent lock screen appearing during active slideshow
Bobby Georgescu [Tue, 28 May 2013 17:14:17 +0000 (17:14 +0000)]
Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
Bobby Georgescu [Fri, 24 May 2013 22:58:32 +0000 (15:58 -0700)]
Prevent lock screen appearing during active slideshow
Bug:
9094678
Change-Id: I8efb988911c75275430da934474df1e65265b234
Michael Kolb [Fri, 24 May 2013 19:25:17 +0000 (12:25 -0700)]
am
461e101f: Add 13MP resolution
* commit '
461e101fb99df1a704544efb29e56ece25788985':
Add 13MP resolution
Michael Kolb [Fri, 24 May 2013 16:44:00 +0000 (09:44 -0700)]
Add 13MP resolution
Bug:
9059351
Change-Id: I40c2c94ccc54399f6928d9e8a66abca0df15fea3
John Hoford [Thu, 23 May 2013 15:53:55 +0000 (08:53 -0700)]
am
a7a6a3a5: Fix issues with Local
* commit '
a7a6a3a5efaf62cdd5d562a9141678671952d27d':
Fix issues with Local
John Hoford [Wed, 22 May 2013 22:41:20 +0000 (15:41 -0700)]
Fix issues with Local
bug:
9085638
Change-Id: I8d10373b4cd65b3f1338d88f1816ccb0b3a0166d
John Hoford [Wed, 22 May 2013 20:09:16 +0000 (13:09 -0700)]
am
4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce
* commit '
4d25d129d1c9f92033382e12260d3f40521cf3fd':
fix ellipse logic for portrait
John Hoford [Wed, 22 May 2013 20:08:26 +0000 (20:08 +0000)]
Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 22 May 2013 18:12:39 +0000 (11:12 -0700)]
am
cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce
* commit '
cdc87e62ee28b5022b2e4d0bc756c264cc26d8e9':
Fix potential synchronization issue in bitmap pool
Bobby Georgescu [Wed, 22 May 2013 18:11:25 +0000 (18:11 +0000)]
Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce
Michael Kolb [Wed, 22 May 2013 16:57:21 +0000 (09:57 -0700)]
am
be4f113f: Fix editor on ICS
* commit '
be4f113fa1fea32e8d8865a52491b9f25760eaba':
Fix editor on ICS
Michael Kolb [Wed, 22 May 2013 16:06:20 +0000 (09:06 -0700)]
Fix editor on ICS
Bug:
9079902
Change-Id: I1159708b0a9db4a0369044cdf9f3620bca433e14
John Hoford [Wed, 22 May 2013 00:11:05 +0000 (17:11 -0700)]
fix ellipse logic for portrait
bug:
9054114
Change-Id: I4bdc7301a60e74bf663fda031c0f2c76ee34b7ec
Michael Kolb [Tue, 21 May 2013 23:10:57 +0000 (16:10 -0700)]
am
37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce
* commit '
37be6658075cac2bad0e30d93705dddeaaf1e421':
Fix selection highlight for tablets
Michael Kolb [Tue, 21 May 2013 23:09:18 +0000 (23:09 +0000)]
Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce
John Reck [Tue, 21 May 2013 22:57:48 +0000 (15:57 -0700)]
am
01ae91aa: Merge "Fix height" into gb-ub-photos-bryce
* commit '
01ae91aa0e347c5a8b335afc8cb0f02459ee5adc':
Fix height
John Reck [Tue, 21 May 2013 22:55:16 +0000 (22:55 +0000)]
Merge "Fix height" into gb-ub-photos-bryce
Sascha Haeberling [Tue, 21 May 2013 22:43:32 +0000 (15:43 -0700)]
am
80a3d636: Make capture thumbnail tappable in video mode.
* commit '
80a3d636fa38bb78dbc9f224b4944a21a6e3271d':
Make capture thumbnail tappable in video mode.
John Reck [Mon, 20 May 2013 21:45:14 +0000 (14:45 -0700)]
Fix height
Change-Id: I133063acdad4a1afe8e0a9105591dd90354913f0
Michael Kolb [Tue, 21 May 2013 22:10:51 +0000 (15:10 -0700)]
Fix selection highlight for tablets
Bug:
9044356
Fixes selection highlight for the new asset sizes.
Change-Id: Ibf21a1f90d6cd1faf62a221d71d55928dc7a3b4a
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
Bobby Georgescu [Tue, 21 May 2013 20:42:09 +0000 (13:42 -0700)]
Fix potential synchronization issue in bitmap pool
Bug:
9072712
Change-Id: I7fcecd6ec63e461e06a6565519be6d86e3246155
Doris Liu [Tue, 21 May 2013 17:14:11 +0000 (10:14 -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:59 +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:47 +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
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:34 +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:27 +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:09 +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:00 +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:50:11 +0000 (22:50 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
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:36:52 +0000 (15:36 -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:42:25 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0c282e8a46050eb587fc120334eb2ef21bc2b15e
Auto-generated-cl: translation import
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
John Reck [Thu, 16 May 2013 22:59:23 +0000 (15:59 -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
Michael Kolb [Thu, 16 May 2013 21:32:42 +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:58:02 +0000 (13:58 -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:50 +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:27 +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:37 +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:36 +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:57 +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
Marco Nelissen [Wed, 15 May 2013 14:56:19 +0000 (14:56 +0000)]
Merge "Enable virtualization" into jb-mr2-dev
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:46 +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
Tim Murray [Tue, 14 May 2013 19:44:55 +0000 (12:44 -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
Tim Murray [Mon, 13 May 2013 22:47:58 +0000 (15:47 -0700)]
Only link librsjni in unbundled branches.
bug
8939828
Change-Id: I87d28185c6fb2b23852eb66487bf99d6111c3a7a
Marco Nelissen [Mon, 13 May 2013 20:36:01 +0000 (13:36 -0700)]
Enable virtualization
When the Intent says to virtualize, and the right virtualizer is
present on the device, enable virtualization.
b/
8767565
Change-Id: I8a98404b21c434966b7ae2dc341eb38f2a47eef2
Doris Liu [Mon, 13 May 2013 18:34:47 +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
George Mount [Fri, 10 May 2013 01:04:58 +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:19:40 +0000 (09:19 -0700)]
am
9a4fb2dc: Merge "Fix the verbose log" into gb-ub-photos-bryce
* commit '
9a4fb2dc95722c45e2acb4f4fe380d27830f8d8b':
Fix the verbose log
ztenghui [Thu, 9 May 2013 16:18:09 +0000 (16:18 +0000)]
Merge "Fix the verbose log" into gb-ub-photos-bryce
Bart Sears [Thu, 9 May 2013 06:13:47 +0000 (23:13 -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:00 +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
Sascha Haeberling [Wed, 8 May 2013 22:15:30 +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:32:20 +0000 (14:32 -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 20:34:24 +0000 (20:34 +0000)]
Merge "Further assets clean up." into jb-mr2-dev
Angus Kong [Mon, 6 May 2013 20:40:52 +0000 (13:40 -0700)]
Further assets clean up.
Remove unused assets and layouts.
bug:
8656481
Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5
Angus Kong [Wed, 8 May 2013 18:17:43 +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.
OSDN Git Service
