OSDN Git Service
Baligh Uddin [Fri, 31 May 2013 22:53:29 +0000 (22:53 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Stephen Hines [Wed, 29 May 2013 00:52:03 +0000 (17:52 -0700)]
Use hyphenated path for android-support-v8-renderscript.
Bug:
9188088
Change-Id: Id30e0a67d89419aeb323f43bf5e65321bf862e79
(cherry picked from commit
79f4335753c1cffba15d6c7ea5ec6b7bb3db3f8e)
Michael Kolb [Thu, 30 May 2013 20:37:33 +0000 (20:37 +0000)]
Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce
Michael Kolb [Thu, 30 May 2013 15:35:26 +0000 (08:35 -0700)]
Add HTC One picture resolutions
Bug:
9175168
Fixes bug where preview is not stopped before size changes
Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8
Baligh Uddin [Thu, 30 May 2013 02:58:10 +0000 (19:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1d9ab8dc2f246b9456ba677ee3a657306fbefcb7
Auto-generated-cl: translation import
Angus Kong [Thu, 30 May 2013 00:15:15 +0000 (17:15 -0700)]
Dismiss settings when showing popup in Video mode.
bug:
8771618
Change-Id: I889b794c6732b674e26436f950e81f67529012e7
Baligh Uddin [Wed, 29 May 2013 20:48:44 +0000 (20:48 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Doris Liu [Tue, 28 May 2013 17:43:38 +0000 (17:43 +0000)]
Merge "Change the order of exposure compensation" into gb-ub-photos-bryce
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
Baligh Uddin [Mon, 27 May 2013 19:24:15 +0000 (12:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6d43e9331dd993de57921360e33c36a58c355056
Auto-generated-cl: translation import
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
Doris Liu [Fri, 24 May 2013 22:58:18 +0000 (15:58 -0700)]
Change the order of exposure compensation
Bug:
9119379
Change-Id: I2e70ab1e83cf322ee0043850b2d27db962039bf3
Michael Kolb [Fri, 24 May 2013 16:44:00 +0000 (09:44 -0700)]
Add 13MP resolution
Bug:
9059351
Change-Id: I40c2c94ccc54399f6928d9e8a66abca0df15fea3
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:08:26 +0000 (20:08 +0000)]
Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce
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: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:09:18 +0000 (23:09 +0000)]
Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce
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
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: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:09:17 +0000 (16:09 +0000)]
Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce
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: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: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: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:49:53 +0000 (22:49 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
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
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: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:56:29 +0000 (20:56 +0000)]
Merge "toUpper() some strings" into gb-ub-photos-bryce
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 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: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:25:40 +0000 (17:25 +0000)]
Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce
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:25:22 +0000 (21:25 +0000)]
Merge "Pause face detection when review captured images" into gb-ub-photos-bryce
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
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 [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:18:09 +0000 (16:18 +0000)]
Merge "Fix the verbose log" into gb-ub-photos-bryce
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 [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: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: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:09:44 +0000 (18:09 +0000)]
Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce
Angus Kong [Mon, 6 May 2013 20:40:52 +0000 (13:40 -0700)]
DO NOT MERGE Further assets clean up.
Remove unused assets and layouts.
bug:
8656481
Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5
Bobby Georgescu [Wed, 8 May 2013 17:49:16 +0000 (17:49 +0000)]
Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 7 May 2013 23:41:04 +0000 (16:41 -0700)]
Fix memory leak in SparseArrayBitmapPool
Bug:
8857493
Change-Id: Ie5fae457aea91973caa07f8955b1364df573821b
Doris Liu [Wed, 8 May 2013 00:27:28 +0000 (00:27 +0000)]
Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 00:23:40 +0000 (00:23 +0000)]
Merge "Add animation to slice selection" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 00:20:44 +0000 (00:20 +0000)]
Merge "Remove unused assets" into gb-ub-photos-bryce
Michael Kolb [Tue, 7 May 2013 22:58:47 +0000 (15:58 -0700)]
Remove unused assets
Bug:
8656481
Change-Id: I8c598a209fe910c1bf658ffffdc1d197dedb0018
Doris Liu [Tue, 7 May 2013 20:48:10 +0000 (13:48 -0700)]
Fix video capture intent overlapping buttons
Bug:
8839010
Change-Id: I8ee9bd8117a4a5e4dafe71775bb5563cef2ccdf0
Sascha Haeberling [Tue, 7 May 2013 22:08:31 +0000 (22:08 +0000)]
Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce
Michael Kolb [Tue, 7 May 2013 20:53:19 +0000 (13:53 -0700)]
Add animation to slice selection
Bug:
8826233
Change-Id: Ibe41c38e048546b66ea9aa56a664ba80de2fbd4c
Michael Kolb [Mon, 6 May 2013 23:14:09 +0000 (16:14 -0700)]
Fix review button placement
Bug:
8833788
Change-Id: I7fc8912ea4ffcd36a08e4cbb2705eec79c014da1
Sascha Haeberling [Tue, 7 May 2013 18:04:08 +0000 (11:04 -0700)]
Avoid rounding errors from cropping uncropped images.
Bug:
8736111
Also don't treat "none" as a non-modifying filter.
Change-Id: I6478c557dbb68d7eecabb29f062285b83de05cda
Doris Liu [Tue, 7 May 2013 01:30:30 +0000 (18:30 -0700)]
Resize children to avoid laying out outside parent
Bug:
8838983
Change-Id: Idc8ec7b96dd13e9c99dbc8b4710aa9d768ef198e
George Mount [Mon, 6 May 2013 20:40:25 +0000 (20:40 +0000)]
Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce
Michael Kolb [Mon, 6 May 2013 20:21:19 +0000 (20:21 +0000)]
Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce
Michael Kolb [Mon, 6 May 2013 19:41:34 +0000 (12:41 -0700)]
Fix lockscreen camera widget layout
Bug:
8832891
Change-Id: I4658de74e7cc9d4ba80a561b3e71ae6339d4f236
Doris Liu [Mon, 6 May 2013 17:23:09 +0000 (17:23 +0000)]
Merge "Restrict checking for device flip" into gb-ub-photos-bryce
George Mount [Mon, 6 May 2013 17:06:53 +0000 (10:06 -0700)]
Fix black background on save progress indicator.
Bug
8802092
Change-Id: I40075ba6af69895a88973d906436c6e235c733fa
Michael Kolb [Mon, 6 May 2013 15:49:10 +0000 (08:49 -0700)]
Set correct label text in tap mode
Bug:
8826229
Change-Id: I10b06ac04314beaf52fc8b29c9b10693eb11311b
Baligh Uddin [Sat, 4 May 2013 23:16:10 +0000 (23:16 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Doris Liu [Fri, 3 May 2013 21:33:57 +0000 (14:33 -0700)]
Restrict checking for device flip
Bug:
8714114
Change-Id: Ic12627fe5b7512c8d5739ed801130d52f33407cc
Baligh Uddin [Fri, 3 May 2013 20:36:23 +0000 (13:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id960caeb9b28300e0f6ee817f0bf1ea783e0f3fb
Auto-generated-cl: translation import
Doris Liu [Fri, 3 May 2013 18:44:45 +0000 (11:44 -0700)]
Fix NPE caused by insets never being set
Bug:
8804054
Change-Id: Ie0f2dec9681977621ba95650aa714b0733a30858
Doris Liu [Fri, 3 May 2013 18:09:49 +0000 (18:09 +0000)]
Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce
Doris Liu [Fri, 3 May 2013 17:26:01 +0000 (10:26 -0700)]
Anchor camera controls when flipping device
Also adjusted margins for camera root view to avoid covering undo bar
Bug:
8758513
Bug:
8714114
Change-Id: If27f55a40f95402923d59d162db0c7cc29eabba4
Angus Kong [Fri, 3 May 2013 00:45:01 +0000 (17:45 -0700)]
Don't show settings when popup is shown.
bug:
8771618
Change-Id: Idec1cbacec1ae958c7295facadc6653b840dbe50
George Mount [Thu, 2 May 2013 17:19:24 +0000 (17:19 +0000)]
Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce
* changes:
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
Allow prefetch for cache, reducing priority for prefetched images.
George Mount [Tue, 30 Apr 2013 18:53:46 +0000 (11:53 -0700)]
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
Bug
8446191
Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63
Change-Id: Ia9b2ced0bfd9c9c1b969c77bc89eaa0fa87687bb
George Mount [Wed, 1 May 2013 23:56:32 +0000 (16:56 -0700)]
Allow prefetch for cache, reducing priority for prefetched images.
Bug
8446191
Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63
Change-Id: I7cccfffc539988d26fc751e16726b05fb2ba21bd
nicolasroard [Thu, 2 May 2013 03:48:56 +0000 (20:48 -0700)]
Fix flashing (remove clipping)
bug:
8747333
Change-Id: Ie1e7f1a58bf195b1f427b75ee9a1390e29b3ba2a
OSDN Git Service
