OSDN Git Service
Angus Kong [Thu, 30 May 2013 22:18:50 +0000 (15:18 -0700)]
Adjust data id even if it's not currently used.
FilmStripView should adjust the internal info of data id after removal
regardless of the existence of the removed data in the buffer.
Change-Id: I78202997525a96a88f7bba8e0d55b7f6aad2c9cf
Stephen Hines [Thu, 30 May 2013 21:09:21 +0000 (21:09 +0000)]
Merge "Use hyphenated path for android-support-v8-renderscript." into gb-ub-photos-carlsbad
Michael Kolb [Thu, 30 May 2013 20:39:00 +0000 (13:39 -0700)]
am
af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce
* commit '
af65d7ba216eba60651d11d248d20346309375ed':
Add HTC One picture resolutions
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
Angus Kong [Thu, 30 May 2013 18:27:34 +0000 (11:27 -0700)]
am
a1db2653: Dismiss settings when showing popup in Video mode.
* commit '
a1db26536913f1259ad74c5e6e952521c05bf2f0':
Dismiss settings when showing popup in Video mode.
John Reck [Thu, 30 May 2013 17:58:09 +0000 (17:58 +0000)]
Merge "Copy Tiling changes from G+" into gb-ub-photos-carlsbad
John Reck [Thu, 30 May 2013 00:07:21 +0000 (17:07 -0700)]
Copy Tiling changes from G+
Change-Id: Id229728182a002c29699884289f1354b6cb6e714
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 22:15:00 +0000 (15:15 -0700)]
am
b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
b375339072a32c57ebb06523abeaebd2db29dc08':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 29 May 2013 20:48:44 +0000 (20:48 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Ruben Brunk [Wed, 29 May 2013 20:28:17 +0000 (20:28 +0000)]
Merge "Cleaning up ImageShow." into gb-ub-photos-carlsbad
Ruben Brunk [Wed, 29 May 2013 18:18:31 +0000 (11:18 -0700)]
Cleaning up ImageShow.
Bug:
9170644
Change-Id: Iab44ec425462e9afe8c104c52e4a28c4145d4690
Stephen Hines [Wed, 29 May 2013 18:33:16 +0000 (11:33 -0700)]
Use hyphenated path for android-support-v8-renderscript.
Bug:
9188088
Change-Id: Id435b35712fd944369b8515f7f84ea30f1eecbe3
Jeff Sharkey [Wed, 29 May 2013 16:53:41 +0000 (16:53 +0000)]
Merge "Fix XML comment." into gb-ub-photos-carlsbad
John Hoford [Wed, 29 May 2013 00:51:35 +0000 (00:51 +0000)]
Merge "zoom to center of double tap" into gb-ub-photos-carlsbad
Angus Kong [Wed, 29 May 2013 00:47:05 +0000 (00:47 +0000)]
Merge "Add UI for insertion in FilmStripView." into gb-ub-photos-carlsbad
John Hoford [Tue, 28 May 2013 23:31:45 +0000 (16:31 -0700)]
zoom to center of double tap
Change-Id: Idfc257f92dd1a97d9109b9f5325299b8e1432c37
George Mount [Tue, 28 May 2013 23:50:24 +0000 (23:50 +0000)]
Merge "Recover from bitmap decode failure." into gb-ub-photos-carlsbad
George Mount [Tue, 28 May 2013 23:27:44 +0000 (16:27 -0700)]
Recover from bitmap decode failure.
Skia errors out when decoding a bitmap into another bitmap
sometimes. When this situation is detected, the decode is
is retried without reusing a bitmap.
Change-Id: I935dec988ed7e115ceda9233a65d3b6083a17468
Angus Kong [Tue, 28 May 2013 19:30:33 +0000 (12:30 -0700)]
Add UI for insertion in FilmStripView.
Change-Id: Iff389525e3811c5018365b6e6c3b9f8b95b9da9a
Jeff Sharkey [Tue, 28 May 2013 21:34:50 +0000 (14:34 -0700)]
Fix XML comment.
Change-Id: If54672cc7cb9ad6a240bb2dff07cbe9c39a521a3
(cherry picked from commit
53a0d0aa62b5f33ca3ff2c9ec63a4bcf606c5292)
Ruben Brunk [Tue, 28 May 2013 19:54:32 +0000 (12:54 -0700)]
Removed unused ZoomCache class.
Bug:
9170644
Note: this class doesn't appear to have been used by the zoom
on doubletap.
Change-Id: Ie3319511ade7732976488f2bb7d76c5e1c130db9
Ruben Brunk [Tue, 28 May 2013 19:34:14 +0000 (12:34 -0700)]
Removed unused handling for intent extras in editor.
Bug:
9170644
Change-Id: I569b16d278d1813f5a96f9e0231ed71ff9e33687
Doris Liu [Tue, 28 May 2013 17:44:58 +0000 (10:44 -0700)]
am
9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce
* commit '
9fb962feb94909af05ab6cf872eee7e8928eb9b1':
Change the order of exposure compensation
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:15:20 +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
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
Christian Wichner [Mon, 27 May 2013 10:24:54 +0000 (10:24 +0000)]
Merge "functionality added to transport filter parameter values to following filters. e.g. FixedFrames use the style from Retrolux or Film to tinting the frame." into gb-ub-photos-carlsbad
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 19:24:30 +0000 (12:24 -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
Christian Wichner [Fri, 24 May 2013 14:09:07 +0000 (16:09 +0200)]
functionality added to transport filter parameter values to following filters. e.g. FixedFrames use the style from Retrolux or Film to tinting the frame.
Change-Id: I87f2497bdaccf8de5d153cbebf9641b979ea15a3
Angus Kong [Thu, 23 May 2013 20:58:17 +0000 (20:58 +0000)]
Merge "Fix/simplify comparator of LocalData." into gb-ub-photos-carlsbad
Angus Kong [Thu, 23 May 2013 00:30:56 +0000 (17:30 -0700)]
Fix/simplify comparator of LocalData.
Change-Id: I433516d630de3d0f98d7ab8c35becf0cc6495bef
Angus Kong [Thu, 23 May 2013 18:25:24 +0000 (18:25 +0000)]
Merge "Refactor to add FilmStripView.Controller." into gb-ub-photos-carlsbad
John Hoford [Thu, 23 May 2013 15:54:34 +0000 (08:54 -0700)]
am
a7a6a3a5: Fix issues with Local
* commit '
a7a6a3a5efaf62cdd5d562a9141678671952d27d':
Fix issues with Local
John Hoford [Wed, 22 May 2013 23:47:03 +0000 (16:47 -0700)]
am
4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce
* commit '
4d25d129d1c9f92033382e12260d3f40521cf3fd':
fix ellipse logic for portrait
Bobby Georgescu [Wed, 22 May 2013 23:47:03 +0000 (16:47 -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
Michael Kolb [Wed, 22 May 2013 23:47:02 +0000 (16:47 -0700)]
am
be4f113f: Fix editor on ICS
* commit '
be4f113fa1fea32e8d8865a52491b9f25760eaba':
Fix editor on ICS
Michael Kolb [Wed, 22 May 2013 23:47:01 +0000 (16:47 -0700)]
am
37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce
* commit '
37be6658075cac2bad0e30d93705dddeaaf1e421':
Fix selection highlight for tablets
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 23:26:07 +0000 (16:26 -0700)]
Refactor to add FilmStripView.Controller.
Use controller to control the FilmStripView.
Change-Id: If203d4bf28ce2dc398ada8b56b38be51a1d5dab9
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
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
Michael Kolb [Tue, 21 May 2013 23:09:18 +0000 (23:09 +0000)]
Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce
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
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
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
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
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
OSDN Git Service
