OSDN Git Service
ztenghui [Wed, 26 Jun 2013 20:54:17 +0000 (13:54 -0700)]
Fix ambiguous naming and typo
bug:
9468909
Change-Id: Ic52f3b6f6b5d0c874e8291ce7b3a76cb6c22f60f
Doris Liu [Tue, 25 Jun 2013 01:37:47 +0000 (01:37 +0000)]
Merge "Clean up camera switcher" into gb-ub-photos-carlsbad
ztenghui [Tue, 25 Jun 2013 00:32:10 +0000 (00:32 +0000)]
Merge "Fix the missing filter name after deserialization." into gb-ub-photos-carlsbad
ztenghui [Mon, 24 Jun 2013 23:34:26 +0000 (16:34 -0700)]
Fix the missing filter name after deserialization.
bug:
9468909
Change-Id: I63aaf0bad02c2afdddf9b162f695fc0a9165befa
Doris Liu [Mon, 24 Jun 2013 22:29:54 +0000 (15:29 -0700)]
Clean up camera switcher
Change-Id: I9f0495524028528ca02c7ddf94f4698d4e87af14
nicolasroard [Mon, 24 Jun 2013 20:38:56 +0000 (20:38 +0000)]
Merge "Add a MatrixFit class" into gb-ub-photos-carlsbad
Bobby Georgescu [Fri, 21 Jun 2013 21:57:59 +0000 (21:57 +0000)]
Merge "MTP Importer: show overlay icon on video items" into gb-ub-photos-carlsbad
Doris Liu [Fri, 21 Jun 2013 21:11:50 +0000 (21:11 +0000)]
Merge "Remove SRI panorama" into gb-ub-photos-carlsbad
Bobby Georgescu [Fri, 21 Jun 2013 20:43:05 +0000 (13:43 -0700)]
MTP Importer: show overlay icon on video items
Bug:
4099088
Change-Id: Ia785f889aff91329e9d7c7026238b2588336963d
Doris Liu [Fri, 21 Jun 2013 01:32:26 +0000 (18:32 -0700)]
Remove SRI panorama
Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
Bobby Georgescu [Thu, 20 Jun 2013 18:55:06 +0000 (11:55 -0700)]
MTP Importer: improve experience when importing large files
Bug:
4099088
Change-Id: Ie5d9da1be0b8891b9123eceaadfe9c2ec2d3e408
Bobby Georgescu [Thu, 20 Jun 2013 01:01:30 +0000 (01:01 +0000)]
Merge "Add support for importing videos in MTP importer" into gb-ub-photos-carlsbad
Bobby Georgescu [Mon, 17 Jun 2013 20:38:30 +0000 (13:38 -0700)]
Add support for importing videos in MTP importer
Bug:
4099088
Change-Id: Ic3ac00cb730381dd2d7f4802aa8001a60e439748
ztenghui [Wed, 19 Jun 2013 22:41:25 +0000 (22:41 +0000)]
Merge "Fix LUT3D information lost after re-edit" into gb-ub-photos-carlsbad
ztenghui [Wed, 19 Jun 2013 22:41:05 +0000 (22:41 +0000)]
Merge "Setup the saving framework to support hiding original photo for editor." into gb-ub-photos-carlsbad
Doris Liu [Wed, 19 Jun 2013 21:20:51 +0000 (14:20 -0700)]
Add flash animation to photo module
Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652
ztenghui [Wed, 19 Jun 2013 21:16:14 +0000 (14:16 -0700)]
Fix LUT3D information lost after re-edit
bug:
9427243
Change-Id: I8535c8776c866fd6c84d391a8de82df9cb214694
nicolasroard [Wed, 19 Jun 2013 18:36:46 +0000 (11:36 -0700)]
Add a MatrixFit class
Change-Id: I67d2eb92fe5bbdff56ff50330c7eed48e7593f75
ztenghui [Mon, 10 Jun 2013 22:51:42 +0000 (15:51 -0700)]
Setup the saving framework to support hiding original photo for editor.
This new approach will try to hide the original image into an auxiliary
directory. User will only see one edited image, while being able to go
back to the original image in the editor.
Refactor SaveCopyTask for more private funcs and more comments.
bug:
9468909
Change-Id: I866321d23e6db0b3dbd08fec2a6a7e3142b17b65
Doris Liu [Wed, 19 Jun 2013 00:14:26 +0000 (17:14 -0700)]
Set window flags to show secure camera
Change-Id: I9acb47ae5d6c5b9248aeea5cd267e17243f93c74
Doris Liu [Tue, 18 Jun 2013 18:29:34 +0000 (18:29 +0000)]
Merge "Switch over to use new camera activity" into gb-ub-photos-carlsbad
George Mount [Tue, 18 Jun 2013 17:52:35 +0000 (17:52 +0000)]
Merge "Add decoding to a smaller image by sampling and scaling." into gb-ub-photos-carlsbad
Doris Liu [Fri, 14 Jun 2013 00:20:31 +0000 (17:20 -0700)]
Switch over to use new camera activity
Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
George Mount [Tue, 28 May 2013 18:41:25 +0000 (11:41 -0700)]
Add decoding to a smaller image by sampling and scaling.
This allows opportunistic reuse of bitmaps, but does not
require it when downsampling.
Change-Id: I06f12bb5416f88a242f67bff3d2ca45894101bcd
Bobby Georgescu [Mon, 17 Jun 2013 22:24:28 +0000 (15:24 -0700)]
Add more metrics to Editor
Bug:
9467671
Instrument
- Editor opened
- Number of filters used in save
- Undo/redo/reset/state panel
- Save completed
Change-Id: I4722f36496ccd089829bd616f89d760078922573
Ruben Brunk [Mon, 17 Jun 2013 21:32:37 +0000 (14:32 -0700)]
Added serialization IDs for frames, adds frames to analytics.
Bug:
9467671
Change-Id: I6f21e7bc9ca7255a290ba7cd1a94e9b07e7b06cb
Angus Kong [Mon, 17 Jun 2013 21:07:48 +0000 (21:07 +0000)]
Merge "Remove files actually." into gb-ub-photos-carlsbad
Ruben Brunk [Mon, 17 Jun 2013 20:49:45 +0000 (13:49 -0700)]
Fix IDs for analytics, unlocalize serialization IDs.
Bug:
9467671
Bug:
9336168
Change-Id: Icb0037ab853598b8ad6b931808074f824ea706ed
Angus Kong [Fri, 14 Jun 2013 21:50:31 +0000 (14:50 -0700)]
Remove files actually.
Change-Id: Ideba2dfff0678f1049bf2bdc93cee98bbb0e589e
Doris Liu [Thu, 13 Jun 2013 22:41:12 +0000 (22:41 +0000)]
Merge "Add callbacks for switching to camera/filmstrip" into gb-ub-photos-carlsbad
Doris Liu [Thu, 6 Jun 2013 18:39:58 +0000 (11:39 -0700)]
Add callbacks for switching to camera/filmstrip
Change-Id: I936d59efe3e09232ab0b298603c823d4f7952199
Angus Kong [Thu, 13 Jun 2013 21:21:22 +0000 (21:21 +0000)]
Merge "Refactor to separate out EGL part." into gb-ub-photos-carlsbad
Doris Liu [Thu, 13 Jun 2013 21:02:16 +0000 (21:02 +0000)]
Merge "Update camera orientation when device is flipped" into gb-ub-photos-carlsbad
John Hoford [Thu, 13 Jun 2013 20:41:13 +0000 (20:41 +0000)]
Merge "fix start up crash" into gb-ub-photos-carlsbad
John Hoford [Tue, 11 Jun 2013 20:07:15 +0000 (13:07 -0700)]
fix start up crash
bug:
8734160
Change-Id: Iaf7f6bdbd70ab04011b9af7816a6991724363e49
Bobby Georgescu [Thu, 13 Jun 2013 18:30:28 +0000 (11:30 -0700)]
Remove unused and buggy MtpThumbnailDrawable code
Bug:
8793065
Change-Id: Ib8b08ae8b9e08319f8628581d8e3c5a4688ee4a5
Doris Liu [Sat, 8 Jun 2013 01:04:57 +0000 (18:04 -0700)]
Update camera orientation when device is flipped
Bug:
8963053
Change-Id: I909793a7da3903a080a19cd7e271b3720df4ec0a
Angus Kong [Thu, 6 Jun 2013 00:18:49 +0000 (17:18 -0700)]
Refactor to separate out EGL part.
Change-Id: I90c37b9e221a80f0d35e6e12ab8850078dc03622
Doris Liu [Wed, 12 Jun 2013 20:40:18 +0000 (20:40 +0000)]
Merge "In carlesbad, fix image capture on S4" into gb-ub-photos-carlsbad
Doris Liu [Wed, 12 Jun 2013 01:24:01 +0000 (18:24 -0700)]
In carlesbad, fix image capture on S4
Bug:
9390020
Change-Id: I9d7e0609c55f47a267aff8499dcd244dfb2fdb3a
nicolasroard [Wed, 12 Jun 2013 02:37:43 +0000 (19:37 -0700)]
Fix icon sizes and jaggies
bug:
9105608
bug:
8791729
Change-Id: I828e9d4daf4025f53d505a3412c27dd8c54a607e
Doris Liu [Tue, 11 Jun 2013 22:34:22 +0000 (22:34 +0000)]
Merge "Disable zoom when camera does not support zoom" into gb-ub-photos-carlsbad
Doris Liu [Tue, 11 Jun 2013 20:31:41 +0000 (13:31 -0700)]
Disable zoom when camera does not support zoom
Change-Id: I5b4c38636614df37db1ef3166368f1650c9e5fa0
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
OSDN Git Service
