OSDN Git Service
Ruben Brunk [Tue, 11 Jun 2013 20:21:02 +0000 (13:21 -0700)]
Mirror CL 319301 in Bryce.
Change-Id: If84a08aa1969415a0d5d9ad3b9153743b1951108
Angus Kong [Tue, 11 Jun 2013 20:22:34 +0000 (13:22 -0700)]
Fix build.
Change-Id: I05f73596157fb5a2ee0ebf8581cfffa973a2d1d7
Angus Kong [Tue, 11 Jun 2013 19:00:15 +0000 (12:00 -0700)]
Use setPreviewFpsRange instead.
Change-Id: I58f6af667fd906221b67b8a4827d7a67c567e20a
nicolasroard [Tue, 11 Jun 2013 01:33:11 +0000 (18:33 -0700)]
Fix panel anim in ICS
Change-Id: Ie2e5a6a36c5bec309b5848e50a90f089f9aeffa9
nicolasroard [Tue, 11 Jun 2013 01:00:40 +0000 (18:00 -0700)]
Fix state panel text size
bug:
9377153
Change-Id: Id5243539e2f8d3ee737e24eeb204145fbaa9138d
nicolasroard [Tue, 11 Jun 2013 00:41:11 +0000 (17:41 -0700)]
Fix text size in the state panel
Change-Id: I0290b2039d987605e3cc82e3c4d486b7855059b2
nicolasroard [Mon, 10 Jun 2013 21:14:34 +0000 (14:14 -0700)]
Fix warnings
Change-Id: I736364e538c2cb03f58c05b9b38252e7771f23e8
Doris Liu [Fri, 7 Jun 2013 23:29:23 +0000 (23:29 +0000)]
Merge "Add a layout for undo bar" into gb-ub-photos-carlsbad
Doris Liu [Fri, 7 Jun 2013 22:32:33 +0000 (22:32 +0000)]
Merge "Add enable/disable swiping to filmstrip" into gb-ub-photos-carlsbad
Bobby Georgescu [Fri, 7 Jun 2013 18:46:56 +0000 (11:46 -0700)]
Fix NPE in PreparePageFadeoutTexture
Bug:
8837688
Change-Id: Ie8fbd9a42497195b8a01cc5638cb0c44d4532d09
Doris Liu [Thu, 6 Jun 2013 23:54:18 +0000 (16:54 -0700)]
Add enable/disable swiping to filmstrip
Change-Id: I3e019764a72f947545cd230b9bfe45f67d83dc29
Doris Liu [Tue, 4 Jun 2013 22:57:19 +0000 (15:57 -0700)]
Add a layout for undo bar
Change-Id: Id795f00c8ca5f147f6aae8c1f9cba4e1da1e5b20
Angus Kong [Wed, 5 Jun 2013 21:36:58 +0000 (21:36 +0000)]
Merge "Play video from flim strip." into gb-ub-photos-carlsbad
Angus Kong [Wed, 5 Jun 2013 21:36:47 +0000 (21:36 +0000)]
Merge "Add interface for swipe checking." into gb-ub-photos-carlsbad
John Reck [Wed, 5 Jun 2013 21:29:54 +0000 (21:29 +0000)]
Merge "Fix graphical corruption due to tear down race" into gb-ub-photos-carlsbad
John Reck [Wed, 5 Jun 2013 21:26:53 +0000 (14:26 -0700)]
Fix graphical corruption due to tear down race
Bug:
9278945
Change-Id: I7594680322768f60eaed8a1037d139cbadf9706b
Angus Kong [Wed, 5 Jun 2013 20:12:39 +0000 (13:12 -0700)]
Add interface for swipe checking.
And fullscreen notification.
Change-Id: Ib264904cca47f1fc90ae5e392f0672c253e4d833
Ruben Brunk [Wed, 5 Jun 2013 18:18:17 +0000 (18:18 +0000)]
Merge "Removing unused UI fields in FilterRepresentation." into gb-ub-photos-carlsbad
Ruben Brunk [Mon, 3 Jun 2013 22:41:36 +0000 (15:41 -0700)]
Removing unused UI fields in FilterRepresentation.
Bug:
9170644
Change-Id: Ic197123286e06d9eb64d30eb345f8cc5797659a2
Doris Liu [Tue, 4 Jun 2013 22:12:55 +0000 (15:12 -0700)]
Remove the frameLayout wrapping CameraRootView
Change-Id: I5a238766b54d3f36c929c53225367cddf90473f9
Angus Kong [Mon, 3 Jun 2013 21:55:34 +0000 (14:55 -0700)]
Play video from flim strip.
Change-Id: Iaedf42d7dabee53f75a20c57f9e6916864ea271f
Doris Liu [Tue, 4 Jun 2013 18:25:41 +0000 (18:25 +0000)]
Merge "Get new camera activity up to date" into gb-ub-photos-carlsbad
Doris Liu [Tue, 4 Jun 2013 01:19:36 +0000 (18:19 -0700)]
Fix pie menu button disappearing
Change-Id: Ia664ac3115849227848c465067a78ef3aaf445cb
Angus Kong [Tue, 4 Jun 2013 00:44:00 +0000 (00:44 +0000)]
Merge "Add secure camera support." into gb-ub-photos-carlsbad
Doris Liu [Mon, 3 Jun 2013 22:20:17 +0000 (15:20 -0700)]
Get new camera activity up to date
Change-Id: I24241bc6082052a1da90b9c41c3362af72e47b37
Ruben Brunk [Mon, 3 Jun 2013 22:57:58 +0000 (22:57 +0000)]
Merge "Fixes save filename for panos after edit." into gb-ub-photos-carlsbad
Ruben Brunk [Mon, 3 Jun 2013 21:56:07 +0000 (14:56 -0700)]
Fixes save filename for panos after edit.
Bug:
9258209
Change-Id: Ib7404242e5886a38b9e6f9fd6f28a52f1a703590
Angus Kong [Mon, 3 Jun 2013 21:54:21 +0000 (21:54 +0000)]
Merge "Add play icon for videos." into gb-ub-photos-carlsbad
Baligh Uddin [Mon, 3 Jun 2013 21:42:19 +0000 (14:42 -0700)]
am
e40d9a1e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
e40d9a1e39596220d1949b869ed4c167ca8e63a5':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 3 Jun 2013 21:40:33 +0000 (21:40 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Angus Kong [Mon, 3 Jun 2013 19:48:16 +0000 (12:48 -0700)]
Add play icon for videos.
Change-Id: Idf73da3c2a8a3beaf45da9f8219ed71c720a5bfd
Baligh Uddin [Mon, 3 Jun 2013 19:15:05 +0000 (12:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8b878349f27250babd1dc79b0a152ae19293242e
Auto-generated-cl: translation import
Angus Kong [Mon, 3 Jun 2013 18:10:11 +0000 (11:10 -0700)]
Add secure camera support.
Change-Id: I672d76cb4de37c46394a5e8ee2899cf571158a2c
Ruben Brunk [Mon, 3 Jun 2013 18:44:22 +0000 (11:44 -0700)]
am
8bb4e1a0: Fixes reading exif tags in editor.
* commit '
8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9':
Fixes reading exif tags in editor.
Ruben Brunk [Mon, 3 Jun 2013 18:17:08 +0000 (11:17 -0700)]
Fixes reading exif tags in editor.
Bug:
9140401
Change-Id: Ic84efca90c5297ab2c6a65b13d512c4799e623f6
ztenghui [Mon, 3 Jun 2013 18:16:43 +0000 (18:16 +0000)]
Merge "Add LUT3D filter state saving" into gb-ub-photos-carlsbad
Doris Liu [Mon, 3 Jun 2013 18:11:39 +0000 (18:11 +0000)]
Merge "Add recent changes to new photo module" into gb-ub-photos-carlsbad
Angus Kong [Mon, 3 Jun 2013 18:04:13 +0000 (18:04 +0000)]
Merge "Add newly taken photos/videos to film strip." into gb-ub-photos-carlsbad
Baligh Uddin [Sat, 1 Jun 2013 15:20:03 +0000 (08:20 -0700)]
am
6d1345aa: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
6d1345aa496d9f5caedae6b3b0c5b6132fb01893':
Import translations. DO NOT MERGE
Doris Liu [Sat, 1 Jun 2013 00:26:12 +0000 (17:26 -0700)]
Add recent changes to new photo module
Change-Id: Icd29a41e1564094e4feafd6c4d4c809f6253753d
Angus Kong [Fri, 31 May 2013 23:30:32 +0000 (16:30 -0700)]
Add newly taken photos/videos to film strip.
Change-Id: I82d9e83d0a45f14036a194cf1ad5793b436357cd
ztenghui [Fri, 31 May 2013 22:51:56 +0000 (15:51 -0700)]
Add LUT3D filter state saving
Change-Id: I195fad1dcad5639c30a2eb94ce28cfd0a2464018
Baligh Uddin [Fri, 31 May 2013 22:53:29 +0000 (22:53 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Angus Kong [Fri, 31 May 2013 21:19:19 +0000 (21:19 +0000)]
Merge "Adjust data id even if it's not currently used." into gb-ub-photos-carlsbad
Doris Liu [Tue, 14 May 2013 21:37:46 +0000 (14:37 -0700)]
Improve gesture handling
Change-Id: Ib1e18274480b6bb681bd06f3130f9b9ea198ea98
Angus Kong [Fri, 31 May 2013 16:53:45 +0000 (16:53 +0000)]
Merge "Translate the first/last view too." into gb-ub-photos-carlsbad
Angus Kong [Fri, 31 May 2013 16:53:31 +0000 (16:53 +0000)]
Merge "Don't use the same drawable for every view." into gb-ub-photos-carlsbad
Angus Kong [Fri, 31 May 2013 16:52:47 +0000 (16:52 +0000)]
Merge "Fix mistakenly reversed order in FilmStripView." into gb-ub-photos-carlsbad
Ruben Brunk [Fri, 31 May 2013 06:30:38 +0000 (23:30 -0700)]
Mirroring google3 for CL
47368174.
Change-Id: Ic29d8d6784870660e0bd83f870ec2cf0c244746d
Angus Kong [Thu, 30 May 2013 22:53:37 +0000 (15:53 -0700)]
Don't use the same drawable for every view.
The placeholder drawable should be cloned for each view using it.
Change-Id: Ic9f7614cc91c95a16105b3b8a9e07c81a8f1a2d7
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 22:11:52 +0000 (15:11 -0700)]
am
fb428906: Use hyphenated path for android-support-v8-renderscript.
* commit '
fb428906549212790a031615c48ba7f8df3f8aa3':
Use hyphenated path for android-support-v8-renderscript.
Angus Kong [Wed, 29 May 2013 00:48:04 +0000 (17:48 -0700)]
Translate the first/last view too.
Change-Id: Iea6dfa8acc632596fdf05001b6b11d11d014a8a0
Angus Kong [Thu, 30 May 2013 00:06:04 +0000 (17:06 -0700)]
Fix mistakenly reversed order in FilmStripView.
Change-Id: Ia9b285adbf448383e8f19081a16b8351b3c201e4
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)
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
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 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.
OSDN Git Service
