• Home
  • History
  • Annotate
  • only in /packages/apps/Gallery2/src/com/android/gallery3d/
History log of /packages/apps/Gallery2/src/com/android/gallery3d/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
1bfb4e42a0dd97a78cd13d35f0c2b7add600357c 29-Jul-2015 Miao Wang <miaowang@google.com> Create RenderScript ScriptC without resourceID.

- Fix build
- Enable Gallery2 to able to build for 64bit.

Bug: 22693954
Bug: 15275515
Change-Id: I394e6e2d98052d8c3c4c011f9807308b9ca9ab86
iltershow/filters/ImageFilterChanSat.java
iltershow/filters/ImageFilterGrad.java
iltershow/filters/ImageFilterRS.java
iltershow/filters/ImageFilterSharpen.java
iltershow/filters/ImageFilterVignette.java
a6adf1339543812fef50fd32ea4a1592c1cc55e0 26-May-2015 Jean-Luc Brouillet <jeanluc@google.com> Fix RenderScript warnings.

b/21443340

Change-Id: I9d31979a1e4e51d321a5fbddd29eda3b699b486d
iltershow/filters/saturation.rs
iltershow/filters/vignette.rs
1fdfadf00a468dd460dd25bf2e074cfb2a225a04 17-Mar-2015 Narayan Kamath <narayan@google.com> Use java.util.Date instead of java.sql.Date.

java.sql.Date was being used in a context unrelated to SQL and
there's no good reason to use it this way. Note that the claim in
java.sql.Date's javadoc that it normalizes times to day boundaries
is a lie.

Change-Id: Ibb17d3fe22af6c2a41abd51b2158d6af000ecbbf
iltershow/tools/SaveImage.java
til/SaveVideoFileUtils.java
138fee43f8651ddce3c82638c4af86de043261ec 17-Oct-2014 Neil Fuller <nfuller@google.com> am 3ffc2889: Merge "Remove dependencies on FloatMath"

* commit '3ffc28897d40524e0b8869aebccc8b04551ba5cf':
Remove dependencies on FloatMath
8a55d3ae7486b798e4c26eeb91993916145f3cef 02-Oct-2014 Neil Fuller <nfuller@google.com> Remove dependencies on FloatMath

See frameworks/base commit 33253a4baa6279f81a73425b49dfb6abe5f5416e
for details.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I202064d78aeb125035c87257100e949da93c116c
pp/EyePosition.java
ata/DecodeUtils.java
ata/LocationClustering.java
iltershow/imageshow/GeometryMathUtils.java
iltershow/imageshow/GradControl.java
iltershow/imageshow/ImageCurves.java
lrenderer/StringTexture.java
i/PhotoView.java
i/TileImageView.java
til/MotionEventHelper.java
163a97c3d3e9e1a029e04a8e629eabd8de8f3d9f 09-Aug-2014 Alan Newberger <alann@google.com> Start new task for Gallery trampolines

When testing the Camera trampoline, even in the full gallery app
from a JB to K upgrade, I noticed that the Camera app was starting
in the Gallery trampoline's task -- two recents even with
excludeFromRecents true. Was still the case in the new trampoline.
Adding FLAG_ACTIVITY_NEW_TASK addressed this, also with some
manifest changes in the trampoline in another CL. Photos was working,
I believe because photos activities explicitly set a task affinity
to shield themselves from G+, thus forcing a new task. Also, this
helped shield activities when both trampolines are active. That is,
if Camera was started via its trampoline, then Photos, the Photos
shortcut opened Camera because it already had an activity in the
trampoline's task. Even if Photos works now, this does no harm and
ensures we're not relying on the implementation of another APK.

Bug: 16843573
Change-Id: Ifa6d65ef2b00a4ffc6df78f13dba16270113509d
pp/Gallery.java
a883e90f6e733c8510b0264d2a2faf9da64a2c16 09-Jul-2014 Leon Scroggins III <scroggo@google.com> Call setLocalMatrix before setShader. do not merge

Now that setLocalMatrix does not modify associated Paints, we need
to call it before assigning the Shader to the Paint.

BUG:14315916
Change-Id: I6778a35eff36515e18c53a979dd69d8aecd1401d
(cherry picked from commit ce3b2ee2c6512a0eac9dbd54641a196baa68ba3f)
iltershow/imageshow/ImageShow.java
f640d379259bb114a50e3200f49961b89d60f2c2 14-May-2014 Bobby Georgescu <georgescu@google.com> Update ingest importer code

Change-Id: I0f3b0809deead2f49501a5309f0ddab9c911274f
ngest/ImportTask.java
ngest/IngestActivity.java
ngest/IngestService.java
ngest/MtpDeviceIndex.java
ngest/SimpleDate.java
ngest/adapter/CheckBroker.java
ngest/adapter/MtpAdapter.java
ngest/adapter/MtpPagerAdapter.java
ngest/data/BitmapWithMetadata.java
ngest/data/DateBucket.java
ngest/data/ImportTask.java
ngest/data/IngestObjectInfo.java
ngest/data/MtpBitmapFetch.java
ngest/data/MtpClient.java
ngest/data/MtpDeviceIndex.java
ngest/data/MtpDeviceIndexRunnable.java
ngest/data/SimpleDate.java
ngest/ui/DateTileView.java
ngest/ui/IngestGridView.java
ngest/ui/MtpFullscreenView.java
ngest/ui/MtpImageView.java
ngest/ui/MtpThumbnailTileView.java
2cfc3a8f9a3d600c1d40161cd532eb45bec92dda 29-Apr-2014 Bill Yi <byi@google.com> Merge commit 'a9c4376daac3b9deda0c617b6df393e741885f37' into HEAD
19849052309067476ebfbf647a4593a521d4cc80 22-Apr-2014 Alan Newberger <alann@google.com> am 3d736418: Merge "Use basic editor for sharpen filter."

* commit '3d73641843682089be63cd248465497f007b93a1':
Use basic editor for sharpen filter.
083f1b5d9ca50f1ca2decbec7f1ed5f35011b903 07-Mar-2014 Nick Kralevich <nnk@google.com> am e9c89c81: Merge "gallery: change typo \'&&\' to \'||\'"

* commit 'e9c89c814c97a74456ad1bf8d4c32a983663924c':
gallery: change typo '&&' to '||'
0df318162173a98f703f7711692ea4773b461423 23-Feb-2014 Jun Su <juns@nvidia.com> Use basic editor for sharpen filter.

Currently gallery's sharpen filter is relate to the editor id =
R.id.imageShow, which is not point to any valid editor.
As a result native gallery sharpen function will cause exception and fail.
Change to use basic editor.

Change-Id: I2a04ab81c395e12004cd6fe4635932a19c1c39be
iltershow/filters/ImageFilterSharpen.java
902bda398b9589492571f64ae4575fdbd62a095a 01-Feb-2014 Nick Kralevich <nnk@google.com> am e9c89c81: Merge "gallery: change typo \'&&\' to \'||\'"

* commit 'e9c89c814c97a74456ad1bf8d4c32a983663924c':
gallery: change typo '&&' to '||'
fe99791c6a04221f8163a09104a1ba5c78046f17 28-Jan-2014 Leavitt Zhang <leavittz@nvidia.com> gallery: change typo '&&' to '||'

Assertion to ckeck array boundary should
be '&&' instead of '||'. It caused an
Exception that '-1' wasn't detected.

Change-Id: I991ad8efed87a0837d262fe7419c7f007c173b56
Signed-off-by: Leavitt Zhang <leavittz@nvidia.com>
pp/AlbumSetDataLoader.java
bd8f3c5ca67fb2be101725e101dc505b18f2b079 19-Nov-2013 ztenghui <ztenghui@google.com> am 91628475: am 947478b6: am aa22947b: Fix the thumbnail generation.

* commit '91628475ee8409e03f57a038c0bec3a830f462d6':
Fix the thumbnail generation.
aa22947b6f0714b73a78a28fb1217f7c5f4f663d 19-Nov-2013 ztenghui <ztenghui@google.com> Fix the thumbnail generation.

bug:11664501
Change-Id: I53ec5a08e801d0300b8ed159158bc46f61c6d3f4
iltershow/tools/SaveImage.java
779a63b39a02ca11c454304ab21f3f3834e4a9fd 05-Nov-2013 nicolasroard <nicolasroard@google.com> am 350f7e3d: am 00dfa8a1: am 1619b3c3: Fix infinite spinner dialog

* commit '350f7e3de777fdb331494ea5efb08809e46f980b':
Fix infinite spinner dialog
8d879c8edb474b4c493b59823489357739e771c1 05-Nov-2013 nicolasroard <nicolasroard@google.com> am c23e8d86: am 07986225: am c82e65b4: Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad

* commit 'c23e8d862de72682f444f68fff3b1f30efcc21cd':
Disable geometry button if tiny planet is here
6337f5ec25499c55a8aa14524b6da8395d5db768 05-Nov-2013 John Hoford <hoford@google.com> am d5dbfe7b: am d6644d60: am c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad

* commit 'd5dbfe7b0336ef2349dd2ca321ae4cc51cb8b1ff':
fix Gallery crash using crop
1619b3c3ed20fad548d31464ab5a2252b2c3b65f 02-Nov-2013 nicolasroard <nicolasroard@google.com> Fix infinite spinner dialog

bug:11328106

Change-Id: Icbfcb7bb6c88a03c81315789b2569da440267edd
iltershow/pipeline/ProcessingService.java
c82e65b4f05ae7ad1e910e84ebf8ba65e6afb3bd 02-Nov-2013 nicolasroard <nicolasroard@google.com> Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad
c870104ac3768bd528798eb4646c3b075757c5ff 02-Nov-2013 nicolasroard <nicolasroard@google.com> Disable geometry button if tiny planet is here

bug:11288853
Change-Id: I818f406eb25e0f82c89ffde0bd91d2aa8ab31b94
iltershow/category/MainPanel.java
iltershow/imageshow/MasterImage.java
4a5fd0627e5c3f3094127dfbd782cd96080482d4 01-Nov-2013 John Hoford <hoford@google.com> fix Gallery crash using crop

bug:11347083
Change-Id: Ic5417d12e0b1cee181ddad8d581eddc6aeb8a5b8
iltershow/imageshow/ImageCrop.java
658922c9b5552cd689d3aba258168a4c08639124 31-Oct-2013 Narayan Kamath <narayan@google.com> am 2c237f11: Merge "Fix invalid private access."

* commit '2c237f1146ebc4385a9a0a0c6f9365aa09db5b24':
Fix invalid private access.
da01d9bc5410d979c3fb103037b93855ae494bd8 23-Oct-2013 Narayan Kamath <narayan@google.com> Fix invalid private access.

See http://bugs.sun.com/view_bug.do?bug_id=6904536

bug: 8992787

(cherry picked from ff19ed981400cd150f8779107cba1e02033b9ebe)

Change-Id: I7cad5e9cf8761b440cf91b96e3599d19bc3188d9
til/LinkedNode.java
ebbcc3944adcc01846128d1bdacc7c8b1c8cdb35 30-Oct-2013 Alan Newberger <alann@google.com> Avoid crash if user disables Camera while Gallery is open

We cache the camera availability check so in the corner case that
a user disables their camera in package manager, avoid crashing.
Not necessary to do more sophisticated handling since this is a
narrow case initiated by user.

Bug: 11435559
Change-Id: I54d5015cdd9b64aec5c9da9a393824d3b41201a1
til/GalleryUtils.java
b6892ab9e603661f73d97b50adcecc5103ebcd6f 22-Oct-2013 Mangesh Ghiware <mghiware@google.com> Consider camera available only if intent resolves to an activity.

Fixes crash for restricted profiles without a camera.

Bug: 11289596
Change-Id: I3545dbeae2e4c9094746b51b770daa93e3896bb6
til/GalleryUtils.java
85f460b8ba236167bccf560358aefd560f7b58f0 22-Oct-2013 John Hoford <hoford@google.com> fix crop not supporting non-normal orientation

bug:11324471
Change-Id: Ib4a76ac1540700eeaa4ddd727b06f9a29b999827
iltershow/cache/ImageLoader.java
5a1d760b60040a8a47d876a9accd27f0bc7be455 21-Oct-2013 nicolasroard <nicolasroard@google.com> Fix crash when exporting with null fx

bug:11281209
Change-Id: I71837bcb18b75201542309f71f99ba7abfb65f93
iltershow/pipeline/ImagePreset.java
97ad2bdcb39c0484dafb08f4a7f45bcd1a3f4f9d 21-Oct-2013 nicolasroard <nicolasroard@google.com> Handles export size zero

bug:11280447
Change-Id: Ia8758a6d269b4ac9fdc9435b3bcdf9295c3e11a9
iltershow/tools/SaveImage.java
iltershow/ui/ExportDialog.java
404a5c2b29a82bd25911021bca62e3c0037b500a 17-Oct-2013 nicolasroard <nicolasroard@google.com> Fix wrong applied fx

Typo in serialization name causes the wrong effect to be applied

bug:11260854
Change-Id: I2d939f49edb7cc61f564bb1e2e6cfa6aad37164c
iltershow/filters/BaseFiltersManager.java
1b56a245a253244628ff0ddfdbe5f51cf8475b16 16-Oct-2013 nicolasroard <nicolasroard@google.com> Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad
2037f39bd3b5caeb8161928df59acff5cd92dd38 16-Oct-2013 nicolasroard <nicolasroard@google.com> Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad
d1a098ea5116fbc47e815631bd9bc5d442bbbd0d 16-Oct-2013 nicolasroard <nicolasroard@google.com> Fix crash "Gallery has stopped" popup occurs during print setup

bug:11159662
Change-Id: I181fe6f581290067b9a39d1382bf6ede08484c0a
iltershow/FilterShowActivity.java
iltershow/category/MainPanel.java
a4f2389cf50404854d7820326d776deb7b6c1ad7 16-Oct-2013 Mangesh Ghiware <mghiware@google.com> Catch all the exceptions.

Bug: 11156898
Change-Id: Ic16a858bb5d1f8838ffa201c910b617f859c9074
pp/Wallpaper.java
4d7efab8c893b436e6e05cda486d6fd80baacb45 16-Oct-2013 nicolasroard <nicolasroard@google.com> Fix Gallery auto-hide action bar in Album view

bug:11218758
Change-Id: Id48e54842ea3539396801d99ea8ec33e58c7a1f1
pp/PhotoPage.java
db30124ab6dabd8e24789efaa4e6db7622889b87 15-Oct-2013 Tenghui Zhu <ztenghui@google.com> Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad
5169137f59114a9549dd056ce4bf843b9b421c4a 15-Oct-2013 John Hoford <hoford@google.com> fix Vignette collapse to a line

bug:11221755
Change-Id: Ibe04770d0cfd3fe596ef72e86ccfe461c0cf63b1
iltershow/imageshow/ImageVignette.java
35a36f1855839b9130e42b82a8e9101a8578d01e 14-Oct-2013 Tenghui Zhu <ztenghui@google.com> Revert "Play the video on top of lock screen"

This reverts commit 417f074dbcf07843bf02e762c2fe3b23fe8af32b.

From the discussion in the bug, for Carlsbad, we will take
the JBMR2 approach for safety concern.

Change-Id: Ieae45e1ae7580c94c08277e580b123e6f504a3b4
bug:11190995
pp/MovieActivity.java
315ce7165e64aadb9d929677284957c4d7f8f0d8 14-Oct-2013 Mangesh Ghiware <mghiware@google.com> One crop and set wallpaper activity is enough!

Bug: 11206305
Change-Id: Ibd2d4c52c98f02f58e251984696742b9a935b0b8
pp/Wallpaper.java
976b9a3a98f48ed69bbe66070e2e2e3f3e6aae43 12-Oct-2013 nicolasroard <nicolasroard@google.com> Fix showing the wrong image after animation

bug:10856175
Change-Id: I87d2bcd1bb1a4ee28536a97f018b6a3cf409d1b8
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
eeed64b1fbdafe5c91ce36b3c5488c003fbb8fab 12-Oct-2013 nicolasroard <nicolasroard@google.com> Process correctly an export when called with EDIT intent

bug:11159123
Change-Id: I8c827d9f757c4fd00d21753753917b62d5ba0213
iltershow/pipeline/ImageSavingTask.java
iltershow/pipeline/ProcessingService.java
iltershow/tools/SaveImage.java
iltershow/ui/ExportDialog.java
dfe30aa6d008c2aff9fa42a6706867bd2f147425 12-Oct-2013 John Hoford <hoford@google.com> Merge "fix showing wrong image post save" into gb-ub-photos-carlsbad
ef4c2131c02f77d9fc508c7b26989a7f9b03862e 11-Oct-2013 John Hoford <hoford@google.com> fix showing wrong image post save

bug:11174327
bug:11130809
Change-Id: I53ee2f73c5a871d9255fea547a0d93a989f15a4f
iltershow/pipeline/ImageSavingTask.java
iltershow/pipeline/ProcessingService.java
iltershow/tools/SaveImage.java
4c107f27eee1c6778c32b3f01f3c628cbcaf0b26 12-Oct-2013 John Hoford <hoford@google.com> fixed crash when applying the none filter

bug:11188884
Change-Id: Id1f5e72b15b307eedccd5d582d3632500f19fdbd
iltershow/pipeline/ImagePreset.java
7835ea8c351802dd6d4c7361fd24a72124a7897d 11-Oct-2013 nicolasroard <nicolasroard@google.com> Merge "Fix crash" into gb-ub-photos-carlsbad
b0f614548813ecd1542745f35900856c05d70948 11-Oct-2013 John Hoford <hoford@google.com> Merge "fix RTL menu issues" into gb-ub-photos-carlsbad
7c25883d177ded2555b907258203bef0fda41487 11-Oct-2013 nicolasroard <nicolasroard@google.com> Fix crash

bug:11185130
Change-Id: I8aaaeb706cb0b2db106c266a84dad0e55d76998f
iltershow/editors/EditorColorBorder.java
c58ff0578e2124f75b5a974ed821ee5766da2455 11-Oct-2013 Alan Newberger <alann@google.com> Merge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad
d180bb94f9b9fc9846f08479fc952bb6f5fe70de 11-Oct-2013 Mangesh Ghiware <mghiware@google.com> Use existing crop activity as fallback.

Bug: 11156898
Change-Id: I77f4788870a4f3f499ba59e168f04922a95a03c4
pp/Wallpaper.java
7574509c9d3b73e77917333661e0a2fbab777129 11-Oct-2013 John Hoford <hoford@google.com> fix RTL menu issues

bug:11184806
Change-Id: I4562b13afc34069ed72a7bf497825abdd57a00ba
iltershow/editors/Editor.java
685789eaebe0d5b633006de06e1968caf7c97717 10-Oct-2013 Alan Newberger <alann@google.com> Introduce FilterShowHelper for versioning visibility

This CL creates FilterShowHelper which will first be used to ensure Versions is active.

Bug: 10734094
Change-Id: I7ac7d99af8818e2599ea2f2a0e64b9c3433a9002
iltershow/state/StatePanel.java
b052e5c72d27c3da585e345d758170c3ab26cbc8 11-Oct-2013 nicolasroard <nicolasroard@google.com> Use AOSP borders by default

bug:11132358
bug:11130809
Change-Id: I57bcfeec35cde1095df5c26776aaa1a06cd110aa
iltershow/filters/BaseFiltersManager.java
1ebeed45d206ed306eb149e4e63242b1b55558ef 11-Oct-2013 nicolasroard <nicolasroard@google.com> Fix edge case cache issues

Also add additional debugging information.

bug:10856175

Change-Id: Ie352e2dd6a86511abea97b622ed7c3b3cccd8479
iltershow/pipeline/CacheProcessing.java
96e6ddb24dd149aa991ef007a394ea9592066d14 10-Oct-2013 John Hoford <hoford@google.com> fix Gallery crashes with empty PTP device

bug:11152999
Change-Id: I70e4787dc46c0e948712ea4530b8110c36603dfa
ngest/MtpDeviceIndex.java
fb1884f63beb3ab4c94b09aea91b5ad501bc6af6 10-Oct-2013 John Hoford <hoford@google.com> Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad
64fc2ed005e2f1dc9ed0b34481c46a370c244b86 09-Oct-2013 John Hoford <hoford@google.com> hide popupmenu during rotate

bug:11135309
Change-Id: I5954fafe1f081f8d1fc30c36f5cf6b2c66cb9511
iltershow/FilterShowActivity.java
iltershow/editors/EditorChanSat.java
iltershow/editors/EditorColorBorder.java
iltershow/editors/EditorCrop.java
iltershow/editors/EditorDraw.java
iltershow/editors/EditorGrad.java
iltershow/editors/EditorVignette.java
iltershow/imageshow/ImageCurves.java
9895d680e66d1f1cf4603fa91c8a53e328f1476b 09-Oct-2013 Mangesh Ghiware <mghiware@google.com> Build properties now updated to SDK level 19.

Check only for numeric version code.

Bug: 4225598

Change-Id: I632b1c2ceb310fc35804b6e44a43c6c4ce1562b1
pp/Wallpaper.java
4d385a0aebbf9a6a319c3baf28fb95e808746559 09-Oct-2013 nicolasroard <nicolasroard@google.com> Add missing flag for bounds decode

bug:11140621

Change-Id: I08af1a6dd9527a03b21d7ab0c3cff776f37201ac
iltershow/cache/ImageLoader.java
a164496b6e2239d0bda9de027f10587687067135 09-Oct-2013 nicolasroard <nicolasroard@google.com> Fix triple buffer update bug
bug:11140550

Change-Id: I530bf8b071c7336eb7a20293d6c9c2f5360df47e
iltershow/pipeline/SharedPreset.java
7943a83c2e2811fa427f99fd97e9a52832710d84 09-Oct-2013 Mangesh Ghiware <mghiware@google.com> Fix incorrect usage of getComponentEnabledSetting()

Bug: 10912503

Change-Id: I9835995d121445ca170668ae8150a24e95e27544
til/GalleryUtils.java
58b6f484263f57009e22fef482a9ae1a4d3f48b6 08-Oct-2013 Mangesh Ghiware <mghiware@google.com> On K+, intent out to Wallpaper manager for crop and set wallpaper.

Bug: 4225598

Change-Id: Ib58a85775ebfd774356d26fd9aa01f2059916300
pp/Wallpaper.java
391e4a190d4afcfdf89b8e7892e972cc998cdf41 07-Oct-2013 Svetoslav Ganov <svetoslavganov@google.com> Switch Gallery2 to use the support lib for printing.

Now we have a class in the support library that uses a correct internal
implemetation based on the API level. On older devices the app does
not crash and on new devices it can print. Also this class does
the heavy lifiting. Gallery2 was not using this class, rather it had
its own (obsolete) implemetation that was not taking into account the
image aspect ratio to provide a hint to the print system for the
orientation to be used.

bug:11099831
Change-Id: I4cd260614af4d9d87ec31d205ee2a5ef02ef5417
pp/AbstractGalleryActivity.java
iltershow/FilterShowActivity.java
i/MenuExecutor.java
til/PrintJob.java
9149879dc8c2ff6fe233d6e20858ebc081068abb 03-Oct-2013 Mangesh Ghiware <mghiware@google.com> Add methods to return Camera and Gallery launcher intents.

Bug: 10820027
Change-Id: I340072c48832e23245aa041503649b40cbaf0bf0
pp/Gallery.java
06c027675948259368a902fd6f8c2ecac5db5167 12-Sep-2013 Mangesh Ghiware <mghiware@google.com> Rename Gallery activity and add trampoline

Bug: 10807861

Change-Id: Iaaf17b579db2fe09900e9817f766f43dd66dea61
pp/AlbumPage.java
pp/AlbumPicker.java
pp/AlbumSetPage.java
pp/DialogPicker.java
pp/Gallery.java
pp/GalleryActivity.java
pp/MovieActivity.java
pp/PhotoPage.java
ata/LocalSource.java
adget/WidgetClickHandler.java
til/GalleryUtils.java
641be74bd9d3f96d8665b23121f40efb8df2ea83 26-Sep-2013 John Hoford <hoford@google.com> enable change in printing

Change-Id: Ibf819002d29b83b4a8d72e7916d04f1c88a6bef2
til/PrintJob.java
ef3cc52f473f15534f00b61b55b53e93931fef97 26-Sep-2013 John Hoford <hoford@google.com> disable print on older system.

Change-Id: I003aa965c885e6c7f65ade51b024bad400e8e458
iltershow/FilterShowActivity.java
i/MenuExecutor.java
til/PrintJob.java
e7c3060c9bdc3def890d4e6f6c05c7629269f83f 25-Sep-2013 John Hoford <hoford@google.com> fix layout issues with border

Change-Id: I92e7a86524a40f379eaa39af4b56500c33e97423
iltershow/editors/EditorColorBorderTabletUI.java
16096e647e59df256ef64ff822641bcf978fdd17 25-Sep-2013 John Hoford <hoford@google.com> fix print code to support landscape

Change-Id: Ied569232a55ba953da59eeee2c13fc4608430a2d
til/PrintJob.java
8db4f458ac9d28a508471dfb874abbe170a5ac23 24-Sep-2013 nicolasroard <nicolasroard@google.com> Fix export dialog UI

bug:10889576
bug:10712083

Change-Id: I7921c06365775625a85e3d0a997d844c42586b01
iltershow/ui/ExportDialog.java
d04aaf626da8aea7f8f18341499e0b51a60e4d32 24-Sep-2013 nicolasroard <nicolasroard@google.com> Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad
9e52a04b99ec1ebb943d1ccb2531d733af5cfedb 24-Sep-2013 nicolasroard <nicolasroard@google.com> Fix crash in caching pipeline

Geometry filters wrongly collapsed with other filters

bug:10903204
Change-Id: Iaee3082e605f4cdaba236df014fb41a4975d05d6
iltershow/filters/FilterRepresentation.java
26f23e62096eb50344815e1b066e9a1efb629bb0 24-Sep-2013 nicolasroard <nicolasroard@google.com> Fix crashes after switching languages

bug:8148068
Change-Id: Icb23c8b221e52fe26981887a0af9857f3d58bf79
iltershow/FilterShowActivity.java
iltershow/category/CategoryPanel.java
105fbcf3289491aa4f590057e304fee33f1c88ca 24-Sep-2013 nicolasroard <nicolasroard@google.com> Fix issues with RTL support

bug:8148068
Change-Id: I869e1a90686c46f8076a66f94040ad03c7c6ca10
iltershow/state/StateView.java
eccdc4285476c98bff3dc5bde113b7f855b18346 23-Sep-2013 nicolasroard <nicolasroard@google.com> Merge "Fix animation in tablet" into gb-ub-photos-carlsbad
2b9dc6be7a216e1eb6607d047cc5cc06e9a94243 23-Sep-2013 nicolasroard <nicolasroard@google.com> Fix animation in tablet

- fix anim in tablet
- fix double-tap timings
- re-add draw in AOSP

Change-Id: I53be8f348ed7927812afa8a4ba84841e4b9d3f4f
iltershow/category/Action.java
iltershow/category/CategoryView.java
iltershow/filters/BaseFiltersManager.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/state/StatePanel.java
889b1b25b9928624ea1ca51cba51642d5cf4044d 23-Sep-2013 Mangesh Ghiware <mghiware@google.com> Merge "Add (back) receiver to disable camera." into gb-ub-photos-carlsbad
32646aabd8228e1494ba090a02ffb8adaa369127 21-Sep-2013 nicolasroard <nicolasroard@google.com> Fix reset

bug:10788166
Change-Id: I989c2caef8ccf4ff7ca84545aed35941248f8034
iltershow/FilterShowActivity.java
iltershow/history/HistoryManager.java
3dcb77a23d80046aa0c9af9ec32394432031d417 19-Sep-2013 Svetoslav Ganov <svetoslavganov@google.com> Update Gallery due to API changes.

bug:10461180

Change-Id: I1c92871ef97b61920410d12d71ac2620ee502b24
til/PrintJob.java
5cf48128283db1def078dea4cc57ee10195e9a47 22-Sep-2013 Mangesh Ghiware <mghiware@google.com> Add (back) receiver to disable camera.

Bug: 10411981
Change-Id: Icff31d2da466746ef6b00d4be32e92067cebd1f1
til/GalleryUtils.java
aff375e3d13c6e593414399e7374ead96b5e43b9 21-Sep-2013 nicolasroard <nicolasroard@google.com> Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad
3bc6e6f3b5ac0bb989c5e2f1580bdb40ead5dc25 21-Sep-2013 nicolasroard <nicolasroard@google.com> Fix crash / jank / presets add

- don't cache immutable bitmaps
- fix junk in anims/zoom/constrain
- fix edge glow when moving
- fix double-tap zoom
- fix presets / user presets adds
- fix state panel names for geometry ops

bug:10803026
Change-Id: I9328d7005d3ecee3566c104c3392de9325c50b74
iltershow/FilterShowActivity.java
iltershow/cache/BitmapCache.java
iltershow/filters/FilterCropRepresentation.java
iltershow/filters/FilterMirrorRepresentation.java
iltershow/filters/FilterRotateRepresentation.java
iltershow/filters/FilterStraightenRepresentation.java
iltershow/imageshow/ImageShow.java
iltershow/pipeline/ImagePreset.java
e56abc7049e35f705161086fe51d0ecdbf451b8b 21-Sep-2013 John Hoford <hoford@google.com> prevent editing of GIF

bug:10642974
Change-Id: Ic61da19f6106c9d42c5b39ae9cc0cf0765f6d1ae
ata/LocalImage.java
ata/MediaObject.java
ata/UriImage.java
i/MenuExecutor.java
c491ad2b7630eed7cf43ef0c1064bd4fe42e06a1 20-Sep-2013 John Hoford <hoford@google.com> remove print for video

bug:10455873
Change-Id: I8f62881b95ad8cd3fff73452eb7d91b05b1ddd8d
i/MenuExecutor.java
998defa31aeb510a1c3c784719100f9cfbf50474 20-Sep-2013 John Hoford <hoford@google.com> fix grid drawing bug in ImageStraighten

Change-Id: I4fec941385dd819afc30922823a087cd9962824b
iltershow/imageshow/ImageStraighten.java
962cf04c60249c2d116f9ee07e747180bee46014 19-Sep-2013 John Hoford <hoford@google.com> change the max print resolution

Change-Id: Ie2cc1c3f40675ae163438c9b09f26e4ac1881367
til/PrintJob.java
cdd4b82b85f5e134b3357e75d735c5faeada70c9 19-Sep-2013 John Hoford <hoford@google.com> remove analytics

bug:9467671
Change-Id: I0d0cfc31e152605c42313db5f6603dbccf76fd82
iltershow/FilterShowActivity.java
iltershow/pipeline/ImagePreset.java
iltershow/tools/SaveImage.java
9029a469b47605420454e0c74d46adeccf4ef94a 18-Sep-2013 John Hoford <hoford@google.com> fix grad filter brightness value stuck at -100

Change-Id: I8e0fa1e0b9537fc530fecb78aac019c220af7ae2
iltershow/editors/EditorGrad.java
iltershow/filters/FilterGradRepresentation.java
b17765a3e9ead269493d7a851a21af3622931c40 18-Sep-2013 John Hoford <hoford@google.com> fix bug in saving preset

bug introduced in CL 361110

Change-Id: I8fd283859d0f0f6a4b9e06e95c533b68085c156a
iltershow/pipeline/ImagePreset.java
iltershow/tools/XmpPresets.java
b867739b4b748fd702b693843220e7691c2e5979 18-Sep-2013 John Hoford <hoford@google.com> display menu indicator in crop

Change-Id: I3ecde3c5e01ace32347e216f2eeb50643e1d9019
iltershow/editors/EditorCrop.java
8a0072e519157b976d7d1fd34ca2aa1c849a983b 17-Sep-2013 John Hoford <hoford@google.com> remove translation in jason encoding

Change-Id: I26c1ae312b3ba71efc40fe0675f53d6b2c377bed
iltershow/data/UserPresetsManager.java
iltershow/pipeline/ImagePreset.java
iltershow/pipeline/ProcessingService.java
iltershow/tools/XmpPresets.java
6aea6b7f4014968fc414554c1530b16437364c80 17-Sep-2013 nicolasroard <nicolasroard@google.com> Fix ImagePreset handling

- fix border ordering
- fix Fx apply

Change-Id: Icf407431a77e150d255d416b983dacb8df5f73fb
iltershow/pipeline/CachingPipeline.java
iltershow/pipeline/ImagePreset.java
ef8d4d2cfbd1ee16d5646a9460a56302d06a0784 17-Sep-2013 nicolasroard <nicolasroard@google.com> Use edge glow instead of snap back

Follow UX guidelines.

Change-Id: Id81d6622e174c8bb2ac53d8b04023070368d945d
iltershow/imageshow/ImageShow.java
463b918edda204f1563dc2e27976cafa6af9a769 17-Sep-2013 John Hoford <hoford@google.com> Prevent edit during view photo intent

bug:9862016
Change-Id: I58e64765630f686f49836dbfb7a7447910e714ef
pp/Gallery.java
pp/PhotoPage.java
5921b53e411a1ee5de8daea34fda90c2ada31974 16-Sep-2013 John Hoford <hoford@google.com> add clear back to draw UI

Change-Id: I5d000518f5972942ffa5ece1fed7650f435c54aa
iltershow/editors/EditorDraw.java
iltershow/editors/EditorDrawTabletUI.java
fcdbaf87020ef96252f57575e5cfc6df11042ab3 16-Sep-2013 nicolasroard <nicolasroard@google.com> Remove Draw tool

bug:10734199
Change-Id: I36f6f63a12b79e6faba8c31f1f90ee13a220e8af
iltershow/filters/BaseFiltersManager.java
9d36d82ff910478a06d186ea7f0eb643ea342551 16-Sep-2013 nicolasroard <nicolasroard@google.com> Merge "Fix flickering while editing" into gb-ub-photos-carlsbad
208262085feca3d7f6a9606b21745323f9e88418 16-Sep-2013 nicolasroard <nicolasroard@google.com> Fix flickering while editing

Change-Id: Ic06e0c59059d97f8dd7c150d22746c1f90d7bed1
iltershow/pipeline/Buffer.java
iltershow/pipeline/CachingPipeline.java
iltershow/pipeline/SharedBuffer.java
f818028e5c78d85bdacd06a6161543d13b42da45 15-Sep-2013 Svetoslav <svetoslavganov@google.com> Merge "DO NOT MERGE Cherry-pick:Update Gallery due to API change." into gb-ub-photos-carlsbad
a085f59b0d36825afd98e6448a5013e5ae73af2a 14-Sep-2013 John Hoford <hoford@google.com> Merge "removed spinner stuck on screen behind image" into gb-ub-photos-carlsbad
f7f24e806ef4646db3f49f637e86417d3a0bebf2 14-Sep-2013 John Hoford <hoford@google.com> removed spinner stuck on screen behind image

Change-Id: I71b2743147244c0fbfe352979c84677ac8ef3fb6
iltershow/FilterShowActivity.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
e30a1cc28e6724d54ba5b20e73d303e734c05559 14-Sep-2013 nicolasroard <nicolasroard@google.com> Fix show original

Change-Id: Ie3ed508c6a60a06f3bc33fb1b017be219a4c2044
iltershow/state/StateView.java
edf4b095a1d904df6c02d49e3ec575c5c3c9c749 14-Sep-2013 nicolasroard <nicolasroard@google.com> Fix various UX bugs

- boolean filters (invert) working
- default value for vignette
- swappable views un-broken (use
same mechanism as categories views)

Change-Id: I65818c1febbf2c862e97542c8134a1188daf5d62
iltershow/FilterShowActivity.java
iltershow/category/Action.java
iltershow/category/CategoryView.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/FilterVignetteRepresentation.java
iltershow/filters/ImageFilterNegative.java
iltershow/filters/ImageFilterWBalance.java
iltershow/state/StateView.java
bae1c10284c23598aa169c7acea0487632ba0da4 13-Sep-2013 John Hoford <hoford@google.com> remove an Icon change that introduced a bug

cl 358665 introduced a bug in the UI for curves & sharpen
This backs out the change to Editor.java

bug:10705772
Change-Id: I46edc834c1db55d7ac38906dc60a42b3f2672509
iltershow/editors/Editor.java
b55bfb6e6000881c56d4de39c9cf71929ed87a18 13-Sep-2013 John Hoford <hoford@google.com> fix crashes in in gallery by reversing previous cl

cl 348551 tried to fix a long existing bug which but
introduced race conditions in the system

bug:10652636
bug:10551751
bug:8794694
Change-Id: Ieb617f85df32a5d82293e555621a7e44b8b84708
pp/AlbumPage.java
pp/PhotoPage.java
86da8be63270b45a8b3ef83403d829a6d3166c83 13-Sep-2013 Svetoslav <svetoslavganov@google.com> DO NOT MERGE Cherry-pick:Update Gallery due to API change.

Change-Id: Iebb5c774a05581ba3c3b29d695ee7d5fa37576b8
til/PrintJob.java
bc7e9fff7e94bb96fb7fe46080dcde2b81e60817 13-Sep-2013 John Hoford <hoford@google.com> Merge "Draw UI fixes" into gb-ub-photos-carlsbad
6125a082a2b5ddc0d34a5198c5a7e826bd77e202 12-Sep-2013 John Hoford <hoford@google.com> Draw UI fixes

bug:10705772
Change-Id: I529d178cdd4fc910b50a3f8c72187b1c61924743
iltershow/FilterShowActivity.java
iltershow/colorpicker/ColorCompareView.java
iltershow/colorpicker/ColorGridDialog.java
iltershow/colorpicker/ColorHueView.java
iltershow/colorpicker/ColorListener.java
iltershow/colorpicker/ColorOpacityView.java
iltershow/colorpicker/ColorPickerDialog.java
iltershow/colorpicker/ColorSVRectView.java
iltershow/controller/ColorChooser.java
iltershow/controller/SliderBrightness.java
iltershow/controller/SliderHue.java
iltershow/controller/SliderOpacity.java
iltershow/controller/SliderSaturation.java
iltershow/editors/EditorColorBorderTabletUI.java
iltershow/editors/EditorDrawTabletUI.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/imageshow/ImageDraw.java
7fa373b0c3143c2c55a0d72487607d5a05c72e1d 13-Sep-2013 nicolasroard <nicolasroard@google.com> Fix pipeline overstress

RenderRequest for filters-only were called too frequently

Change-Id: I04b6a1337d23dcb012544a66b9352f209d98ee72
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/pipeline/ImagePreset.java
8e2a41b7e68338fea06d2a64864348e70d8afe7d 13-Sep-2013 nicolasroard <nicolasroard@google.com> Merge "Fix triangle indicator" into gb-ub-photos-carlsbad
80be412507340d47fc9dbb8a23ba2628f4e3ad1f 13-Sep-2013 nicolasroard <nicolasroard@google.com> Fix triangle indicator

bug:10705772

Change-Id: Ib79f9894c57c77c12f8364fc689638a0aad582e6
iltershow/editors/Editor.java
fcf74f8dddddd350466e406f9f1cb2181077ffda 12-Sep-2013 Mangesh Ghiware <mghiware@google.com> Merge "Enable virtualization" into gb-ub-photos-carlsbad
eb6a9b9cdd2ec4bd9139c32ace454c329f1f3147 12-Sep-2013 John Hoford <hoford@google.com> Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbad
46868d049a2b4b96c50559ad8a50a4104af15c80 12-Sep-2013 John Hoford <hoford@google.com> fix Edit from filmstrip bug

bug:10707676
Change-Id: Idb27d36713782237a66ee2e06cafb603dc107fb4
iltershow/FilterShowActivity.java
e0321526805facb72b307be6120b20a881ee979d 13-May-2013 Marco Nelissen <marcone@google.com> Enable virtualization

When the Intent says to virtualize, and the right virtualizer is
present on the device, enable virtualization.

Bug: 8767565
Bug: 10727216

Change-Id: I8a98404b21c434966b7ae2dc341eb38f2a47eef2
(cherry picked from commit af6b0d2c08afd7803a92856c7c39b5e6144addfa)
pp/MoviePlayer.java
e10fd68874fa3cff0e5c3ca07f1e5b9d40be1299 12-Sep-2013 nicolasroard <nicolasroard@google.com> Fix constrained zoom

Change-Id: I3613ba23154897e9b7c1677ec9911453b5f73c0f
iltershow/imageshow/ImageShow.java
34e8432353acb0c45253cf4ef855512c7472019b 10-Sep-2013 nicolasroard <nicolasroard@google.com> Fix full-res geometry

Change-Id: I25f2fde1031ba7d896c82484a3da0ea03bcff7b8
iltershow/cache/ImageLoader.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/pipeline/CachingPipeline.java
5d727d85d58ad03edbcdd62c533bb14fdd5dda19 12-Sep-2013 nicolasroard <nicolasroard@google.com> Merge "Fix straighten tool" into gb-ub-photos-carlsbad
b08324d588baaebd01a8acd83428f3862c15e7f9 12-Sep-2013 nicolasroard <nicolasroard@google.com> Merge "Add custom border text" into gb-ub-photos-carlsbad
2d9330020b929cc75bbdfd645d3dc9278ca78779 12-Sep-2013 nicolasroard <nicolasroard@google.com> Merge "Fix info panel" into gb-ub-photos-carlsbad
7a53c3d54ed06cc2fe0440fcaa01fa879d19dc88 12-Sep-2013 nicolasroard <nicolasroard@google.com> Fix straighten tool

- fix grid display
- show grid upon launch
- grid disappear after 500ms

bug:10705772

Change-Id: I499d5e6d9c02ddcc8f540f2bedb58c86cc744e44
iltershow/imageshow/ImageStraighten.java
521e94c88a371981142312c777a9842a55338901 12-Sep-2013 nicolasroard <nicolasroard@google.com> Add custom border text

bug:10705772

Change-Id: Idca8cb3179bf9ecc1b6eaef109f79077cf15ec3c
iltershow/filters/FilterColorBorderRepresentation.java
b203968cc53015d9c51b790a56cca638be77818d 12-Sep-2013 nicolasroard <nicolasroard@google.com> Fix info panel

bug:10705772
Change-Id: I9481aec8baf1a7b1782be5cf47acbf3269768cee
iltershow/FilterShowActivity.java
iltershow/info/HistogramView.java
iltershow/info/InfoPanel.java
f7630cbd1786f88256e03c246a2931b3734ab82f 11-Sep-2013 Nicolas Roard <nicolasroard@google.com> Merge "Handle IllegalStateException when cursor contents are empty" into gb-ub-photos-carlsbad
a888340582b3b736d9f71390a670bd23cff0e86a 11-Sep-2013 Amith Yamasani <yamasani@google.com> Handle IllegalStateException when cursor contents are empty

Bug: 10696306
Change-Id: If56b553e34574219de8e3990c9e256f698d08f04
iltershow/cache/ImageLoader.java
2975e608d638a6d707b64a5b31fde3716f12ee9c 11-Sep-2013 John Hoford <hoford@google.com> Merge "fix startup crash" into gb-ub-photos-carlsbad
da713ad257719520234fc071c3d11deea8125ed6 11-Sep-2013 Mangesh Ghiware <mghiware@google.com> Make local copy of reference to bitmap and check for null

Bug: 8694871
Change-Id: If9505a017a86fd6bc8c4a193e6da7167a2af1a27
lrenderer/TiledTexture.java
3759b2d6670df1e645f630d18b2387c458fdfcc1 11-Sep-2013 John Hoford <hoford@google.com> fix startup crash

bug:10673620
Change-Id: If1a8aad0c2258702fe4fc7048b4e82eea302169c
iltershow/FilterShowActivity.java
fddcb482a89e6c30f74f0c8cf7d9d1e6e31a5789 10-Sep-2013 John Hoford <hoford@google.com> small ui fixes in draw

Change-Id: I3d960de02d053cf7a70eeacf773dbe51da69f492
iltershow/editors/EditorDraw.java
iltershow/filters/FilterDrawRepresentation.java
3404ab27a2107880e0c8e96b910de18a47b84b05 10-Sep-2013 John Hoford <hoford@google.com> Merge "fix export on saved images" into gb-ub-photos-carlsbad
863b61f2ddd387473f588e2a9184eabb5a930096 09-Sep-2013 John Hoford <hoford@google.com> fix export on saved images

bug:9466453
Change-Id: I6280e6352d6c7f672692db514e46803df3f91b38
iltershow/pipeline/ImagePreset.java
iltershow/pipeline/ImageSavingTask.java
iltershow/tools/SaveImage.java
iltershow/ui/ExportDialog.java
9346e7fdd448c5ddfc3e47c067618ca0ac9c72fa 09-Sep-2013 nicolasroard <nicolasroard@google.com> Hide debug statement

Change-Id: I978e84cdec3739efa7e5a7f6acf3b23625a5355b
iltershow/cache/BitmapCache.java
16a8079bfddf54ef2c110fba53dadac8512403b8 09-Sep-2013 nicolasroard <nicolasroard@google.com> Fix for anim stutter

Change-Id: Id1b3c9b18e65b4a817b15ee45d0f9dc514a4b700
iltershow/imageshow/ImageShow.java
ec1e009a7faea0478e361bc2d48d856ab48a0209 09-Sep-2013 nicolasroard <nicolasroard@google.com> Improves memory management

Also adds some debugging tracking tools.

bug:10112287

Change-Id: I3f9b3d173db99818e5c9ae9a62b0ec38cd2b341b
iltershow/cache/BitmapCache.java
iltershow/cache/ImageLoader.java
iltershow/filters/ImageFilterTinyPlanet.java
iltershow/imageshow/GeometryMathUtils.java
iltershow/imageshow/MasterImage.java
iltershow/pipeline/Buffer.java
iltershow/pipeline/CacheProcessing.java
iltershow/pipeline/CachingPipeline.java
iltershow/pipeline/FilterEnvironment.java
iltershow/pipeline/ImagePreset.java
iltershow/pipeline/RenderingRequest.java
iltershow/pipeline/SharedBuffer.java
34cfdfcd1867fff67fffbbac7a8e942485f08ea1 07-Sep-2013 nicolasroard <nicolasroard@google.com> Fix information panel

bug:10429488
Change-Id: I80e9e58ba907129cc7b4f5c7f9fafe95d49d86b0
iltershow/FilterShowActivity.java
32cc4dd751569721aa19218b4d947145577060d0 07-Sep-2013 nicolasroard <nicolasroard@google.com> Fix UI performances / glitches

- load/process thumbnails fully in background
- fix reveal slider
- fix race condition when loading
- better memory usage
- fix loading spinner (wasn't shown!)

Change-Id: Id78163556d8ee1c3ad04eae16fe1bf06f4312405
iltershow/FilterShowActivity.java
iltershow/category/Action.java
iltershow/category/CategoryAdapter.java
iltershow/category/CategorySelected.java
iltershow/category/CategoryView.java
iltershow/category/IconView.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/pipeline/CachingPipeline.java
iltershow/pipeline/RenderingRequest.java
iltershow/pipeline/UpdatePreviewTask.java
iltershow/tools/XmpPresets.java
98b296ffc50e11b7950acf1d0df850b617913131 07-Sep-2013 John Hoford <hoford@google.com> fix Gallery crash while deleting a picture

bug:10551751
Change-Id: I9b6a8488b4fa2a3440b85ae8e4c5dc3da83e29f1
pp/PhotoPage.java
708753f5a087eb759ef48fe9b41ef2274d2e88a7 06-Sep-2013 John Hoford <hoford@google.com> fix vignette

Change-Id: I368e34d11eecad7da80531f88d52cf6c4a3b4901
iltershow/filters/ImageFilterVignette.java
iltershow/imageshow/EclipseControl.java
iltershow/imageshow/ImageVignette.java
a78a4897c88edea4374e5102d5e1901fd46e566d 03-Sep-2013 Svetoslav <svetoslavganov@google.com> Update the Gallery API due to API change

This is a cherry-pick of Svetoslav's fix in klp-dev: https://googleplex-android-review.git.corp.google.com/#/c/353376/

Change-Id: Icf61ff059da24630aca8b7eb00575d12cf85e2fb
til/PrintJob.java
4196c7da24f0393887a9eb4f3bbfebfbc122d3b0 05-Sep-2013 John Hoford <hoford@google.com> remove title bar from color picker dialog

Change-Id: I242ded7941dab60a1501dbb4f34dcafbfe302bd3
iltershow/colorpicker/ColorPickerDialog.java
805a7fe57da2534462f4720abc7fe9cdb8f7ecc9 04-Sep-2013 John Hoford <hoford@google.com> put back shade in crop and straighten

Change-Id: I046d98ea61f93d00131eaa7e7058a16bc1be0adc
iltershow/crop/CropDrawingUtils.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageStraighten.java
ec1f915006e5ec2db8be633b5d3d73e568951da4 03-Sep-2013 John Hoford <hoford@google.com> fix crop issues

Change-Id: I885828b041278531fbcbe203d413131ad8f46613
iltershow/imageshow/GeometryMathUtils.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageStraighten.java
b95b3e9d5be75687e5f07cc2b245c27074ce4cf9 03-Sep-2013 nicolasroard <nicolasroard@google.com> Merge "Fix graphic pipeline cache" into gb-ub-photos-carlsbad
c3d21101b14cdc1abf8a055e056019af57c4c7be 03-Sep-2013 nicolasroard <nicolasroard@google.com> Fix graphic pipeline cache

Some bitmaps were thrown back
into the bitmap pool while still
used in the caching pipeline...

Change-Id: I56c47b44d137f16b9a9a6cf79224c296ea6e55a0
iltershow/cache/BitmapCache.java
iltershow/pipeline/Buffer.java
iltershow/pipeline/CacheProcessing.java
iltershow/pipeline/CachingPipeline.java
iltershow/pipeline/FilterEnvironment.java
cac4cedc989b53fdf6b8b46363b3e722c5605cff 03-Sep-2013 ztenghui <ztenghui@google.com> Merge "Show the action bar and edit button when system clear full screen flag." into gb-ub-photos-carlsbad
417f074dbcf07843bf02e762c2fe3b23fe8af32b 31-Aug-2013 ztenghui <ztenghui@google.com> Play the video on top of lock screen

bug:10342963

Change-Id: I8093d877d4d491b83b58b062e61edf6d352bf114
pp/MovieActivity.java
02f459f8e1ef6d6765c9a57ee1866fc5af2f9eb5 31-Aug-2013 ztenghui <ztenghui@google.com> Show the action bar and edit button when system clear full screen flag.

bug:10421879

Change-Id: I2cb4f80685e8feb4ee694ed865d724ccc33c3874
pp/PhotoPage.java
b178c1959c10e57b397490f1f2d882df06104366 30-Aug-2013 Nicolas Roard <nicolasroard@google.com> Merge "Updated Gallery to avoid breaking the build - API change" into gb-ub-photos-carlsbad
ae068f80895d7d075064a5ded59069425b72271f 30-Aug-2013 John Hoford <hoford@google.com> small ui cleanups for color border

Change-Id: I76142afdb44a45936bf32a36b3b45ffdc729308e
iltershow/controller/ColorChooser.java
iltershow/controller/ParameterColor.java
iltershow/editors/EditorColorBorder.java
iltershow/editors/EditorColorBorderTabletUI.java
iltershow/filters/FilterColorBorderRepresentation.java
iltershow/filters/FilterDrawRepresentation.java
2775ff37d7a71fb6e3018468420118bd328e9977 29-Aug-2013 Svetoslav Ganov <svetoslavganov@google.com> Updated Gallery to avoid breaking the build - API change

Change-Id: Iaf80496629773dfffab4d1475a711384fa96e010
til/PrintJob.java
834efce0da12e6a4664c3f3c63bfd2e77b6e750a 29-Aug-2013 John Hoford <hoford@google.com> Merge "vignette fix & enhance to remove center focus" into gb-ub-photos-carlsbad
37f8e432f4eb94d0ab483bfdc2a1fa024508e85f 28-Aug-2013 John Hoford <hoford@google.com> vignette fix & enhance to remove center focus

Change-Id: Ide19925c5a9113518815d3aacc2204ef5ab9661d
iltershow/editors/EditorVignette.java
iltershow/filters/FilterVignetteRepresentation.java
iltershow/filters/ImageFilterVignette.java
iltershow/filters/vignette.rs
iltershow/imageshow/EclipseControl.java
iltershow/imageshow/ImageVignette.java
960e83bd57b6236f4eb7fff98aeb7082a48f6b97 29-Aug-2013 nicolasroard <nicolasroard@google.com> Fix toast message when saving to Gallery

Change-Id: I0c4850185cf19e6e239c7d2d7bf7167b4ebaee0d
iltershow/tools/SaveImage.java
3b311c3ffc7e9c6b7f5a89337787a656d6e10dbc 28-Aug-2013 nicolasroard <nicolasroard@google.com> Fix saving

Use the preview image to provide
a faster result in Gallery

Change-Id: Icfcdc2f423bf2e21428d9f7a5116a2b4c02eb79b
iltershow/pipeline/ImageSavingTask.java
iltershow/pipeline/ProcessingService.java
iltershow/tools/SaveImage.java
fc667540266a05d3f207bff009bc2c29eed37f5a 29-Aug-2013 nicolasroard <nicolasroard@google.com> Merge "Fix rotation anims on slow device (svelte)" into gb-ub-photos-carlsbad
3c0befde1461bd5dad6794bc889a24f3a3ebf475 29-Aug-2013 nicolasroard <nicolasroard@google.com> Fix rotation anims on slow device (svelte)

Change-Id: If9050f7a17d9e3964d6bf35d649567c222f7fefe
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
87bb65723a286c6e3833a5e8719752b51df2d416 29-Aug-2013 ztenghui <ztenghui@google.com> Merge "Fix ISE in Gallery related to muxer." into gb-ub-photos-carlsbad
71e27598c6c7cbba1792fffceaf653946a3bd2e4 28-Aug-2013 ztenghui <ztenghui@google.com> Fix ISE in Gallery related to muxer.

bug:10512258
Change-Id: I45f579a3b0b16e8378c1e5937da98a0f45de6d6c
pp/VideoUtils.java
80b216d5c8e17e0358cf1508a1e177ccada8383f 28-Aug-2013 nicolasroard <nicolasroard@google.com> Fix empty screen on Svelte

bug:10526507
Change-Id: I2506ae03a32e01ea62a25efa06acf1602147e78a
iltershow/FilterShowActivity.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageStraighten.java
iltershow/imageshow/MasterImage.java
a7415dd97d9da190e8c23541dcd38f7f670573f6 28-Aug-2013 nicolasroard <nicolasroard@google.com> Fix crash for svelte

bug:10526507
Change-Id: Ifc22bee4af446b09449ee64d137b93573f47025a
iltershow/imageshow/MasterImage.java
e40690d73eb611f3f461f51a2841e73bcbd01f79 27-Aug-2013 Svetoslav Ganov <svetoslavganov@google.com> Updated printing in Gallery due to API changes.

1. Now there is two fitting modes: scale to fill and scale to fit.
Updated the Gallery print code to support them both.

2. Now we have APIs for specifying which constraints in the print
attributes have been satisfied by the app so the pritner does
not satisfy them again, e.g. if the app rotated the content then
the printer should not do it.

Change-Id: I78b2925965068bd528fe6ec739bfd1e93084dd24
til/PrintJob.java
4d34f390561e002fddfa88f2a1273e16c8a90f00 28-Aug-2013 Svetoslav Ganov <svetoslavganov@google.com> Cherry-pick of KLP CL
(printing support)

Fixing the build

Change-Id: I48eb47c071b2060dfea430cee968bf99225a8bb1
til/PrintJob.java
655afcf4a88cf9dcdbab708212df1dec0a4c05d6 28-Aug-2013 nicolasroard <nicolasroard@google.com> Fix param border

needed to replace bitmap borders

bug:9470514
Change-Id: I69f6324246ee8c9491ec430c5e20d87574302fcf
iltershow/filters/FilterColorBorderRepresentation.java
iltershow/filters/ImageFilterColorBorder.java
8141e2414467458c6e98b40845fc22a9cdcfffb0 27-Aug-2013 nicolasroard <nicolasroard@google.com> Merge "Improves UI / size" into gb-ub-photos-carlsbad
9f452e09889199a28a86d9bd8f8fdaa8508ca0c1 23-Aug-2013 nicolasroard <nicolasroard@google.com> Improves UI / size

- improves overdraw
- filter change anim
- better borders
- remove unused images

bug:9470514
bug:8658176

Change-Id: I764879be415acbfba5a36f239d1905ec54e2d3cb
iltershow/EditorPlaceHolder.java
iltershow/FilterShowActivity.java
iltershow/cache/BitmapCache.java
iltershow/category/CategorySelected.java
iltershow/category/CategoryView.java
iltershow/editors/Editor.java
iltershow/filters/FilterMirrorRepresentation.java
iltershow/imageshow/GeometryMathUtils.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/pipeline/CacheProcessing.java
iltershow/pipeline/CachingPipeline.java
iltershow/pipeline/FilterEnvironment.java
iltershow/pipeline/ImagePreset.java
iltershow/pipeline/RenderingRequest.java
iltershow/pipeline/RenderingRequestTask.java
61c634ab70a10cbd68482ad03caa4470e9e9ecc5 27-Aug-2013 John Hoford <hoford@google.com> fix selection bug

bug:4174707
Change-Id: Ia1a465e9f27d920d53545cba4c96dd3eab92e374
i/SelectionManager.java
0594bd40959aaa55ec4f4204fbe3d12240f51480 27-Aug-2013 John Hoford <hoford@google.com> Merge "fix menu indicator inconsistency" into gb-ub-photos-carlsbad
3e6ca1692d499fce6842c00428368598b68b86cb 27-Aug-2013 John Hoford <hoford@google.com> Merge "Prevent slide show request with only on slide" into gb-ub-photos-carlsbad
fa2b9222725e96fdb584aca1b1213b0bda8af110 26-Aug-2013 Sascha Haeberling <haeberling@google.com> Make parsing integers for details dialog more robust.

Bug: 7141309

Also make sure "orientation" is localized.

Change-Id: Ib950eca6becd2eed21bebfbd48e11a182b76e45a
i/DialogDetailsView.java
1304be5806124591d1d6c5c632700ca0361b1431 26-Aug-2013 John Hoford <hoford@google.com> fix menu indicator inconsistency

bug:10492779
Change-Id: I5746bb2e8066ec985423a9d972d44593653d3c31
iltershow/editors/Editor.java
iltershow/editors/EditorChanSat.java
iltershow/editors/EditorCurves.java
iltershow/editors/EditorDraw.java
iltershow/editors/EditorGrad.java
601bbb6da7ed8241cda50323b46090ecfff61bdd 23-Aug-2013 John Hoford <hoford@google.com> Prevent slide show request with only on slide

bug:8794694
Change-Id: Id3354733c7f35d9303b01f07ddf30f5555b07ddd
pp/AlbumPage.java
pp/PhotoPage.java
5996f43546b629a01166904943eda1f788078634 23-Aug-2013 Sascha Haeberling <haeberling@google.com> I18N the Gallery's Details dialog.

Bug: 7141309

Change-Id: I9e658ea3972713fa39e76894f8ae7d8e3d5cdf2c
i/DialogDetailsView.java
49798939f1bc58eaf5842bbc8bc5424284ab7930 22-Aug-2013 John Hoford <hoford@google.com> border UI editor

bug:9470514
Change-Id: I4d5cd91775c9b8742f847fd9a955f6f28e66cd38
iltershow/FilterShowActivity.java
iltershow/controller/ParameterColor.java
iltershow/editors/EditorColorBorder.java
iltershow/editors/EditorColorBorderTabletUI.java
iltershow/editors/EditorDraw.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterColorBorderRepresentation.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/ImageFilterColorBorder.java
iltershow/filters/ImageFilterParametricBorder.java
iltershow/pipeline/FilterEnvironment.java
eb2950384846a3797e13b04765f65df70d80982e 21-Aug-2013 ztenghui <ztenghui@google.com> Fix the Google Drive issue

Here a local cache file will be downloaded and sent over to Gallery / Editor.
So we need to handle that well.

bug:9356969

Change-Id: Ic09a2f5de2c9c55ca2ed21c77ddf7517f5939bfb
pp/PhotoPage.java
iltershow/tools/SaveImage.java
d74271e58c33ac178d935cca6843d41de95e7fcf 21-Aug-2013 John Hoford <hoford@google.com> Merge "fix gif issue" into gb-ub-photos-carlsbad
82f3ed2cec637ce516cf0270dde8f910fe9f78e5 21-Aug-2013 nicolasroard <nicolasroard@google.com> Merge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad
441d7a8930360d1c043daabd76a6599f2a8a60ba 21-Aug-2013 John Hoford <hoford@google.com> fix gif issue

bug:7877538
Change-Id: I807198ca6d0d0db33fdbcc8b6bd1bf6dab9ba86a
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/tools/SaveImage.java
1af7be9378009180f7873e177b430dbefae83edc 21-Aug-2013 nicolasroard <nicolasroard@google.com> Revert to loading 8888 bitmaps

bug:10305385
Change-Id: I3c8ff6e848e79631f9b9e887244495b094e730a3
iltershow/filters/ImageFilterRS.java
675948f8f6337fe2873067a74db789d46a41ec36 21-Aug-2013 Mangesh Ghiware <mghiware@google.com> Fix discrepancy in RemoteViewsFactory impl.

Bug: 7633198
Change-Id: I96db437ac4452d001a2c380ecdbedee40f4c2468
adget/WidgetService.java
708569b460235ed28248de1aefdd635197d3fb28 20-Aug-2013 John Hoford <hoford@google.com> Merge "fix draw issues on tablet" into gb-ub-photos-carlsbad
97d76abecd25656bcd622c56d9cf4e2c9b236ea3 20-Aug-2013 John Hoford <hoford@google.com> fix draw issues on tablet

bug:8579593
Change-Id: I75c9daa4d1048b02943ab33362dd8674faa39149
iltershow/colorpicker/ColorHueView.java
iltershow/colorpicker/ColorOpacityView.java
iltershow/controller/StyleChooser.java
iltershow/editors/EditorDraw.java
iltershow/editors/EditorDrawTabletUI.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/ImageFilterDraw.java
7a4412d19a355e78f472eba2f3a8d90234b69ee9 20-Aug-2013 Sascha Haeberling <haeberling@google.com> Merge "Prevent NPE." into gb-ub-photos-carlsbad
2f3a8e1c95e1a689086e585a9db2482dc66ea39b 20-Aug-2013 George Mount <mount@google.com> Merge "Allow for extension for pano-based navigation." into gb-ub-photos-carlsbad
1c83a7cfed7057f5d3719bce40bd3f54f8298c52 20-Aug-2013 Sascha Haeberling <haeberling@google.com> Prevent NPE.

Bug: 10388167

Change-Id: I9293d29e6a1a4f052513409b80fe7d4aaac87529
pp/PhotoPageBottomControls.java
929d90ca51c2856c0a8cb5a812f0e70628bb71d7 20-Aug-2013 nicolasroard <nicolasroard@google.com> Fix crash

bug:10390767
Change-Id: Ie300762048daffb80dee79e75a0993cae76bb839
iltershow/imageshow/MasterImage.java
f8b8c708f30aeb632ef7064cc5be7c65669f1762 20-Aug-2013 nicolasroard <nicolasroard@google.com> Merge "Add printing to Gallery" into gb-ub-photos-carlsbad
513eb24fe6b9376ce41bff0abc53d6d14daf8325 20-Aug-2013 nicolasroard <nicolasroard@google.com> Add printing to Gallery

Change-Id: I26aad645759f95813003badffbd03845e0df37bb
pp/AbstractGalleryActivity.java
pp/PhotoPage.java
til/PrintJob.java
50a1674e3f34b6daccbb1634bd10793ee5985aaa 20-Aug-2013 ztenghui <ztenghui@google.com> Merge "Check whether save button should be enabled when time bar updates" into gb-ub-photos-carlsbad
70df03bea1eb05ac5adf9c5425e5e4a0cc6aed16 20-Aug-2013 ztenghui <ztenghui@google.com> Check whether save button should be enabled when time bar updates

bug:10260216

Change-Id: Ic9714d5b5415ddc6f181bf2caf9efedf3fd871ac
pp/TrimVideo.java
f29cc45abb96754e954d56673e3a959d8bb9787e 20-Aug-2013 nicolasroard <nicolasroard@google.com> Merge "Remove simple edit menu item" into gb-ub-photos-carlsbad
d872eee0790efcce9635fcd9d0dd481df310d0a4 20-Aug-2013 nicolasroard <nicolasroard@google.com> Remove simple edit menu item

bug:10362505
Change-Id: I730457c4e0d35b48be0a71e14fac60c5194c5d1f
i/MenuExecutor.java
97dd05ad6ed8bfb9fde741919738bec5d87daf79 19-Aug-2013 George Mount <mount@google.com> Allow for extension for pano-based navigation.

Bug 9265629

Change-Id: Ief895285991b2200a423636580a68f1d21a31cdf
iltershow/crop/CropActivity.java
55705d5a9baadfe0e19170b2075e4a273033c260 19-Aug-2013 Mangesh Ghiware <mghiware@google.com> Fix RTE in PhotoPage

Bug: 10341736
Change-Id: Iff005411cff8f8923c465da99804c14a3783bcf9
pp/PhotoPage.java
a4f38c0f8f70c998391780b672eea5d5e49277c7 16-Aug-2013 John Hoford <hoford@google.com> fix first draw bug

bug:8579593
Change-Id: Ifb4727fcf23b0696db14427f00aa2a911b4a367b
iltershow/colorpicker/ColorHueView.java
iltershow/colorpicker/ColorOpacityView.java
iltershow/colorpicker/ColorPickerDialog.java
iltershow/colorpicker/ColorSVRectView.java
iltershow/controller/ColorChooser.java
iltershow/controller/ParameterColor.java
iltershow/editors/EditorDraw.java
iltershow/editors/ParametricEditor.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/ImageFilterDraw.java
iltershow/imageshow/ImageDraw.java
9c5d6700209699c3f1a47b6fa37618ddcd2f24c3 16-Aug-2013 nicolasroard <nicolasroard@google.com> Implements Printing in the editor

Change-Id: Ib307f8b9c1aaaee2ab96f8e8ddcd86abe38bdc72
iltershow/FilterShowActivity.java
til/PrintJob.java
d33fe6fd37d8c506ab0e47139ef0f77746a275b8 16-Aug-2013 nicolasroard <nicolasroard@google.com> Fix geometry updates

Change-Id: I985f9f564db09924c172e01dda7915ecc3bba1ba
iltershow/FilterShowActivity.java
iltershow/editors/Editor.java
iltershow/imageshow/MasterImage.java
3cd6fc8e632e406628b5977ee47c191523552500 16-Aug-2013 nicolasroard <nicolasroard@google.com> Fix copies / undo manager issues in filters

Change-Id: Icc7671ccfe52a2519ad8f4833e746768ec97cff8
iltershow/FilterShowActivity.java
iltershow/filters/FilterVignetteRepresentation.java
iltershow/history/HistoryItem.java
f904939a3613902d4a0cc06741a00377bb55d44b 15-Aug-2013 nicolasroard <nicolasroard@google.com> Fix draw cache issue

Change-Id: Ib61dfb7763b929c9e51853da21031adcd16004d6
iltershow/cache/BitmapCache.java
iltershow/pipeline/CachingPipeline.java
75f5e650e05c89c17417f9a9250f2662642c0bf1 15-Aug-2013 George Mount <mount@google.com> Merge "Revert "Give CropActivity minimal touchpad support."" into gb-ub-photos-carlsbad
a44805bb8c90ea6b8017a24e84c5e4a38778c726 15-Aug-2013 George Mount <mount@google.com> Revert "Give CropActivity minimal touchpad support."

This reverts commit 8dd1afedc5899c7539978b706fb165fba8d1e2f2.

Change-Id: I1f1d1acd6034910815d4c7f5433ab2319fc9d00b
iltershow/crop/CropActivity.java
473b5f07ec24426d07fe0c7d0db58d6401d25477 15-Aug-2013 George Mount <mount@google.com> Merge "Give CropActivity minimal touchpad support." into gb-ub-photos-carlsbad
8b3d65ba27b24308b3edba1e4e0c574e1acbdbb7 15-Aug-2013 nicolasroard <nicolasroard@google.com> Merge "Improves bitmap reuse / memory usage bug:8782701" into gb-ub-photos-carlsbad
bd9a4acc7a9b607d18d08cb2199d46afa023548b 15-Aug-2013 nicolasroard <nicolasroard@google.com> Improves bitmap reuse / memory usage
bug:8782701

Change-Id: Ic655d6f1704dd0429e96819566f50927de02b994
iltershow/cache/BitmapCache.java
iltershow/cache/ImageLoader.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/pipeline/Buffer.java
iltershow/pipeline/CacheProcessing.java
iltershow/pipeline/CachingPipeline.java
iltershow/pipeline/FilterEnvironment.java
iltershow/pipeline/SharedBuffer.java
d1db305b2992c6d5c484e91e08fead7d3c15868f 15-Aug-2013 Bobby Georgescu <georgescu@google.com> Merge "Fix MTP importer notification issue" into gb-ub-photos-carlsbad
1d6725c8074cc47949452a7236d37cbba8633585 15-Aug-2013 Bobby Georgescu <georgescu@google.com> Fix MTP importer notification issue

Bug: 10136971
Change-Id: I3e4ba869401bcd0418a6280a1c2771884cb016be
ngest/IngestService.java
8cb64bba90333b7b54c4b270fd4448b3d856f2bc 15-Aug-2013 John Hoford <hoford@google.com> fix broken sliders

Change-Id: Ib1073516efd039838ea2e2e13e027197b6383adf
iltershow/controller/BasicSlider.java
iltershow/editors/Editor.java
8dd1afedc5899c7539978b706fb165fba8d1e2f2 15-Aug-2013 George Mount <mount@google.com> Give CropActivity minimal touchpad support.

Bug 9265629

Change-Id: If42442b763fbeff639122ab2f5aeb8b43e43457b
iltershow/crop/CropActivity.java
330e19d627a3a5e91a68ad21516b1ba9990cb2fa 15-Aug-2013 nicolasroard <nicolasroard@google.com> Fix for clipped shadow

Change-Id: I41b10f41499a9de168ff619c8c348860243a889f
iltershow/imageshow/ImageShow.java
20667d21eac2074b0e265d8839539bd9cfec9f92 15-Aug-2013 nicolasroard <nicolasroard@google.com> Fix problem with state panel navigation

Change-Id: Ia117bb087ca27cfe439bd39b1cd40ab33f4def4e
iltershow/FilterShowActivity.java
iltershow/state/StatePanelTrack.java
e19cb8725655869092a73bed24a66395dd89013c 15-Aug-2013 John Hoford <hoford@google.com> fix tiny planet launch

bug:8732041
Change-Id: Id874e7e6f9ebc13f740e924e532512e7aadb26dd
iltershow/filters/FilterTinyPlanetRepresentation.java
3e3e9e219a76e8ef4fb56b8ef4c6e0bac06c6cd1 14-Aug-2013 John Hoford <hoford@google.com> fix vignette dragged off screen

bug:9471206
Change-Id: I4a64db869f05521fb4e1f32fffe67757c0e74348
iltershow/imageshow/EclipseControl.java
iltershow/imageshow/ImageVignette.java
a044ee9746c40ec003ba5a96bea91abd7cee2bb5 14-Aug-2013 John Hoford <hoford@google.com> Merge "fix RGB text" into gb-ub-photos-carlsbad
58e2f6effa634e853d521f57d284c248adc69057 14-Aug-2013 John Hoford <hoford@google.com> fix RGB text

bug:9471079
Change-Id: Ifaf893e7ed518a9efc81b2f968fd411b9d35f7a8
iltershow/editors/Editor.java
iltershow/editors/EditorCurves.java
9530962f09e4ef5cefd81cb3cbc5cff2a6e5b818 14-Aug-2013 nicolasroard <nicolasroard@google.com> Fix spacing in saturation panel

Change-Id: I405874cd7c5cf2d6a203125bc4ea978f0e49be38
iltershow/filters/FilterChanSatRepresentation.java
f4d211d89a3a054dbabc5d5d6c636013ba063e26 14-Aug-2013 nicolasroard <nicolasroard@google.com> Fix graphics glitch in IconView

Change-Id: I46e501755cdd271f41f9fbf558d7939dd34d9c46
iltershow/category/CategoryView.java
5d1cf1f9c8c6359905988e096b50f07ce326df21 14-Aug-2013 John Hoford <hoford@google.com> Add close button to info panel

Change-Id: Iba4c64af4e37bc3d03cc3cb1ee371158d210c5f8
iltershow/FilterShowActivity.java
iltershow/info/InfoPanel.java
3130144bcd9403153b9385f9b91d4262d626a113 14-Aug-2013 nicolasroard <nicolasroard@google.com> Center add button text in landscape

Change-Id: I33a66ce0607cb3832d6373e64e92204e8dc52d92
iltershow/category/CategoryView.java
iltershow/category/IconView.java
89c60a9d0be113585799dd903fc005b315251314 14-Aug-2013 nicolasroard <nicolasroard@google.com> Fix for state panel not appearing

Change-Id: I687e2d744a6cd8a914344718c6292e1597679422
iltershow/editors/EditorPanel.java
9737f3a18a8c302160e213afa30a4db710e41fb6 14-Aug-2013 nicolasroard <nicolasroard@google.com> Fix swiping in categories in landscape mode

Change-Id: I58ecb212792e3e8432791ee29f8a0ef26a819362
iltershow/FilterShowActivity.java
iltershow/category/CategoryView.java
4b82f6f516ae100ae7c88441f4372dda65f01179 14-Aug-2013 nicolasroard <nicolasroard@google.com> Fix add button size and placement in looks

Change-Id: I5c7fd0f460de222e76228ea3da9703d4b579aeca
iltershow/category/CategoryAdapter.java
iltershow/category/CategoryView.java
5af55f4f37c3d8fd471144f1175a45e2933ca015 14-Aug-2013 nicolasroard <nicolasroard@google.com> Fix refresh of looks panel

Change-Id: Ib38b3aefc8ca9891251458b03587ffa5e41bfbe6
iltershow/FilterShowActivity.java
iltershow/category/CategoryPanel.java
iltershow/category/MainPanel.java
99c1eeb3929c4faa15e3347a83ce9c4ae6551f0b 14-Aug-2013 John Hoford <hoford@google.com> Merge "fix tablet ui" into gb-ub-photos-carlsbad
0b33ef03f2023a49d82cd608d79bb9b59c791e06 14-Aug-2013 John Hoford <hoford@google.com> fix tablet ui

Change-Id: I38aba41e92fdd555391b8ae3ebd65b473bd48366
iltershow/editors/EditorGrad.java
iltershow/editors/ParametricEditor.java
0a24e52185c4e88dd52b8e072cf7cd1d04f74b0a 14-Aug-2013 nicolasroard <nicolasroard@google.com> Clean up user preset dialog

Change-Id: Idefafe3a877e8a0cf25ca955f689818e193fde72
iltershow/FilterShowActivity.java
iltershow/category/CategoryAdapter.java
iltershow/data/UserPresetsManager.java
iltershow/presets/PresetManagementDialog.java
2e1bc2e37f285bfaf302a0533a372d4373474d9c 14-Aug-2013 nicolasroard <nicolasroard@google.com> Fix UI Tablet for saturation panel

Change-Id: Id2fffcefc8af3cf8f6ffe2c84447c3f54070f160
iltershow/editors/EditorChanSat.java
iltershow/editors/ParametricEditor.java
55a0279ee420c649606edd7815403d3ca1820c07 14-Aug-2013 nicolasroard <nicolasroard@google.com> Fix for user presets
remove menu item
add spacer

Change-Id: I8a83aed6da00c6692f2204fefd17dfff3a599b8d
iltershow/FilterShowActivity.java
iltershow/category/Action.java
iltershow/category/CategoryAdapter.java
iltershow/category/CategoryView.java
iltershow/category/IconView.java
d3ca24707a0a0ab019dec0a17b0d540b685e459a 14-Aug-2013 John Hoford <hoford@google.com> add solid round mode to draw

Change-Id: I60249711602fa3aaf2bce0b5035e75f746caa5eb
iltershow/editors/EditorDraw.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/ImageFilterDraw.java
9977d45fcae932581c1788cf3fa96a3f4040a8dc 14-Aug-2013 nicolasroard <nicolasroard@google.com> Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad
dbc7f5878da3038fbe96609ad21b5324e9645367 14-Aug-2013 John Hoford <hoford@google.com> Merge "fix draw size and style display" into gb-ub-photos-carlsbad
e799626df47f99e4ba70bcfe787fdbdac64a8cc7 14-Aug-2013 nicolasroard <nicolasroard@google.com> Fix tablet UI layout

Change-Id: I19a6f6751dd7754e8b0de6eb22a82041b1dff29f
iltershow/FilterShowActivity.java
iltershow/category/MainPanel.java
iltershow/editors/EditorPanel.java
iltershow/state/StatePanel.java
4e289659f746cf659e300c9fcd2048960e115f0c 13-Aug-2013 John Hoford <hoford@google.com> fix draw size and style display

Change-Id: Ia7419e0f03e48fd099b678aa81c351462ee6937a
iltershow/editors/EditorDraw.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/FilterGradRepresentation.java
iltershow/filters/ImageFilterDraw.java
iltershow/imageshow/ImageDraw.java
c41fdd6f37df5dbd7f44b1c79cdd6d025937209d 13-Aug-2013 nicolasroard <nicolasroard@google.com> Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad
a0cd22d21474c112ad78b011fbd6f0be977400e6 13-Aug-2013 nicolasroard <nicolasroard@google.com> Fix icons rendering to be consistent

Change-Id: Ie9384df9a34a39311dfe7ccc1cff1250d2f3918e
iltershow/category/Action.java
iltershow/category/CategoryPanel.java
iltershow/category/CategoryView.java
iltershow/category/IconView.java
a7836003e689af28725930ba6a2c191275876577 13-Aug-2013 John Hoford <hoford@google.com> add circle brush

Change-Id: Iee5bc138599853b9c5343ae2e6f02b22ea4abe2d
iltershow/editors/EditorDraw.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/ImageFilterDraw.java
c31d762d7630f2e5edd451ce5ddb200cf5743ee4 13-Aug-2013 John Hoford <hoford@google.com> Merge "fix serialization on draw" into gb-ub-photos-carlsbad
370bd3d1678c7b214b28320913c7a632ebba47b8 13-Aug-2013 John Hoford <hoford@google.com> fix serialization on draw

Change-Id: Id99acdb9ac6d65e0c8239ef6737f6e6a7fe5c04b
iltershow/filters/FilterDrawRepresentation.java
06327e44d392dbd18abc19d9be87de91c27b0c70 12-Aug-2013 nicolasroard <nicolasroard@google.com> Remove red eye tool

Change-Id: I3ec169bc6b0948d3218a2e3457475ba57ea2f4c7
iltershow/filters/BaseFiltersManager.java
57bd092bd5757576f07341135272ed1c3df729ff 12-Aug-2013 nicolasroard <nicolasroard@google.com> Makes rotate and mirror direct operations

Change-Id: I10128c211ec6e269603e3b3f3cbafadbeabdaac5
iltershow/FilterShowActivity.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterMirrorRepresentation.java
iltershow/filters/FilterRotateRepresentation.java
8b9cc5f374fa8bded7f84af6ce73123be2754ccc 12-Aug-2013 nicolasroard <nicolasroard@google.com> Fix for wrong bitmap picked after geometry change

Change-Id: I48d7892c761bb1d8a83553786367aa11d1841fb5
iltershow/editors/Editor.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/pipeline/CacheProcessing.java
iltershow/pipeline/FilterEnvironment.java
55d6abe58c3a7574a5d76c68ec5c21848848e399 11-Aug-2013 nicolasroard <nicolasroard@google.com> Fix export dialog (size export)

Change-Id: Ifa4bb6a990622bfc00f6b4fe4998417fec32e650
iltershow/imageshow/GeometryMathUtils.java
iltershow/pipeline/ImagePreset.java
iltershow/pipeline/ImageSavingTask.java
iltershow/pipeline/ProcessingService.java
iltershow/tools/SaveImage.java
iltershow/ui/ExportDialog.java
fc4700c0e9f1804d4b61bd586f066172a25c7035 11-Aug-2013 nicolasroard <nicolasroard@google.com> Fix crash when we can't load the exif

Change-Id: I014518f727128676e9189d19c9e1073daeb2ee4b
iltershow/cache/ImageLoader.java
1a1cb07982f574a59cd84b0501770da97accad89 11-Aug-2013 nicolasroard <nicolasroard@google.com> Fix crash and missing content

Change-Id: I477599491921fc4319834f32d5806cdc165679e6
iltershow/FilterShowActivity.java
iltershow/state/StatePanel.java
0786afd7628be6668a2658290ec07785fbc64921 06-Aug-2013 John Hoford <hoford@google.com> fix draw part 2

Change-Id: Ib508cf5fd75403e5a36168255bf3613526436428
iltershow/editors/EditorDraw.java
iltershow/filters/FilterDrawRepresentation.java
9071438baef1705413c756132493f148e19ae046 10-Aug-2013 John Hoford <hoford@google.com> Merge "fix draw" into gb-ub-photos-carlsbad
f4b659334750a5aa75f929d18857a2ab93c9d939 06-Aug-2013 John Hoford <hoford@google.com> fix draw

Change-Id: I535221edd992c1a8c659c398dba61158e0c1d87d
iltershow/colorpicker/ColorBrightnessView.java
iltershow/colorpicker/ColorHueView.java
iltershow/colorpicker/ColorSaturationView.java
iltershow/colorpicker/ColorValueView.java
iltershow/controller/BasicParameterStyle.java
iltershow/controller/BitmapCaller.java
iltershow/controller/FilterView.java
iltershow/controller/ParameterBrightness.java
iltershow/controller/ParameterHue.java
iltershow/controller/ParameterIconStyle.java
iltershow/controller/ParameterOpacity.java
iltershow/controller/ParameterSaturation.java
iltershow/controller/ParameterStyles.java
iltershow/controller/SliderBrightness.java
iltershow/controller/SliderHue.java
iltershow/controller/SliderOpacity.java
iltershow/controller/SliderSaturation.java
iltershow/controller/StyleChooser.java
iltershow/editors/Editor.java
iltershow/editors/EditorChanSat.java
iltershow/editors/EditorDraw.java
iltershow/editors/ParametricEditor.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/ParametericFilterRepresentation.java
iltershow/imageshow/ImageDraw.java
7321f1d82c7b72b491bf7c20b03e3491cb91fcab 09-Aug-2013 nicolasroard <nicolasroard@google.com> Fix histogram view

Change-Id: Ic0c3a1103f5fa1f0ef1e72ae92fecfcb343bad74
iltershow/info/HistogramView.java
1ec293e09fcb43b430d8f77e9f18e76470d5a02f 09-Aug-2013 nicolasroard <nicolasroard@google.com> Add shadow

Change-Id: Iba10c5d01bad8f0f49986150b2b4f6cf905be3cb
iltershow/imageshow/ImageShow.java
5bf3bf4b44dee73e2ba54680460a2237cd1258ec 09-Aug-2013 nicolasroard <nicolasroard@google.com> Merge "Add version category Fix bugs when loading Add info panel" into gb-ub-photos-carlsbad
860af325f2030a03c526e8551a85230d17df7b15 09-Aug-2013 nicolasroard <nicolasroard@google.com> Add version category
Fix bugs when loading
Add info panel

Change-Id: I28966f2419b902405bc60e9cc927b109777a6a2d
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/category/CategoryAdapter.java
iltershow/category/CategoryPanel.java
iltershow/category/CategoryTrack.java
iltershow/category/CategoryView.java
iltershow/category/MainPanel.java
iltershow/category/SwipableView.java
iltershow/imageshow/MasterImage.java
iltershow/info/HistogramView.java
iltershow/info/InfoPanel.java
iltershow/state/StatePanel.java
723bf81990245a07739146ac10357703c9839de1 08-Aug-2013 Sascha Haeberling <haeberling@google.com> Remove Camera from Gallery2.

Change-Id: I89adebffcacd1269217d7bd8c630c2f78886f590
pp/GalleryApp.java
pp/GalleryAppImpl.java
pp/PhotoPage.java
pp/StateManager.java
ata/Exif.java
ata/LocalImage.java
ngest/data/MtpBitmapFetch.java
a6b80cccafe0a4c2de575ec69d1960c3c0d88062 08-Aug-2013 ztenghui <ztenghui@google.com> Merge "WAR the crash from re-editing missing online image" into gb-ub-photos-carlsbad
430e46b06f8e7ee1ca3e7ecdcef3e0a978637c03 02-Aug-2013 nicolasroard <nicolasroard@google.com> Fix full res zoom
Also add filters merging in the cache.

Change-Id: Ic34c918b732159f3703cd83d30de907fdbbcb451
iltershow/editors/Editor.java
iltershow/filters/FilterCropRepresentation.java
iltershow/filters/FilterMirrorRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/FilterRotateRepresentation.java
iltershow/filters/FilterStraightenRepresentation.java
iltershow/filters/FilterUserPresetRepresentation.java
iltershow/imageshow/GeometryMathUtils.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageStraighten.java
iltershow/imageshow/MasterImage.java
iltershow/pipeline/CacheProcessing.java
iltershow/pipeline/CachingPipeline.java
iltershow/pipeline/FilterEnvironment.java
iltershow/pipeline/FullresRenderingRequestTask.java
iltershow/pipeline/ImagePreset.java
iltershow/pipeline/ProcessingService.java
5843ba18bfd1ed81bdfde267af550aec30936a58 07-Aug-2013 George Mount <mount@google.com> Merge "Move PanoramaViewHelper out of LightCycleHelper" into gb-ub-photos-carlsbad
d1763a30cb0191e926467dc529e252b545ec9a9f 07-Aug-2013 George Mount <mount@google.com> Move PanoramaViewHelper out of LightCycleHelper

PanoramaViewHelper can be used outside of LightCycle panorama
picture creation.

Change-Id: I40bb357385fa311f9115dffaa143119cfcb5f45f
pp/AbstractGalleryActivity.java
e58cb0d26c9fc8d1eb04d3cb86233b918053a47b 06-Aug-2013 George Mount <mount@google.com> Remove MediaCache and MediaCacheUtils.

Change-Id: Iebf4b10ecde56bc490a1b5a4add31a1cf766e9c9
pp/GalleryAppImpl.java
53339bd6881da030359de86efbeb394e7ef87128 02-Aug-2013 nicolasroard <nicolasroard@google.com> Fix display bug with highres

Change-Id: I8961beca6bf80efdf3cf1c3b6cae691dd0f473ed
iltershow/pipeline/CachingPipeline.java
iltershow/pipeline/HighresRenderingRequestTask.java
077e718ecb6eb07997ad7c458d38eb21b3b2e6f9 02-Aug-2013 Ruben Brunk <rubenbrunk@google.com> Add quality selector to export.

- Adds the option to change the quality of the jpeg compression
when flattening an exported bitmap.

Change-Id: I252913fc15ff32a0fcff683edb5b33e17b5daac4
iltershow/FilterShowActivity.java
iltershow/pipeline/ImageSavingTask.java
iltershow/pipeline/ProcessingService.java
iltershow/tools/SaveImage.java
iltershow/ui/ExportDialog.java
bc8e077e77cf6f0dda8efd8318b8a8e7eda16f61 30-Jul-2013 John Hoford <hoford@google.com> add Per Channel Saturation

Change-Id: Icfd24c817674b81ac9caecc2d73348dc7734f037
iltershow/FilterShowActivity.java
iltershow/controller/BasicParameterInt.java
iltershow/editors/EditorChanSat.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterChanSatRepresentation.java
iltershow/filters/FilterGradRepresentation.java
iltershow/filters/ImageFilterChanSat.java
iltershow/filters/saturation.rs
iltershow/pipeline/ImagePreset.java
b0f7a8f7f7d95ae12e92f529fd9a8a37f75b105c 19-Jul-2013 Ruben Brunk <rubenbrunk@google.com> Refactoring Geometry handling.

Bug: 9170644
Bug: 9366654
Bug: 9366263

- Consolidates all the geometry transforms in GeometryMathUtils and
significantly reduces complexity.
- Removes GeometryMetadata object and dependent code.
- Removes ImageGeometry and geometry update callbacks.

Change-Id: I59add51907459593244c9ebaadef585efc7486d5
iltershow/EditorPlaceHolder.java
iltershow/FilterShowActivity.java
iltershow/crop/BoundedRect.java
iltershow/crop/CropMath.java
iltershow/crop/CropObject.java
iltershow/crop/CropView.java
iltershow/editors/Editor.java
iltershow/editors/EditorCrop.java
iltershow/editors/EditorFlip.java
iltershow/editors/EditorMirror.java
iltershow/editors/EditorPanel.java
iltershow/editors/EditorRotate.java
iltershow/editors/EditorStraighten.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterCropRepresentation.java
iltershow/filters/FilterMirrorRepresentation.java
iltershow/filters/FilterRotateRepresentation.java
iltershow/filters/FilterStraightenRepresentation.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterGeometry.java
iltershow/filters/ImageFilterStraighten.java
iltershow/imageshow/GeometryListener.java
iltershow/imageshow/GeometryMath.java
iltershow/imageshow/GeometryMathUtils.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageDraw.java
iltershow/imageshow/ImageFlip.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageMirror.java
iltershow/imageshow/ImagePoint.java
iltershow/imageshow/ImageRotate.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageStraighten.java
iltershow/imageshow/MasterImage.java
iltershow/pipeline/CacheProcessing.java
iltershow/pipeline/CachingPipeline.java
iltershow/pipeline/FilterEnvironment.java
iltershow/pipeline/ImagePreset.java
8f442fae60e0154867d2a6927eb9a35bcb7014e6 01-Aug-2013 nicolasroard <nicolasroard@google.com> Fix problem with N-1 caching when no filters / one filter

- also fix equals() for geometry

Change-Id: I6f6f21d1e274b3b95ac4b5189b2fa7f419912864
iltershow/FilterShowActivity.java
iltershow/filters/FilterCropRepresentation.java
iltershow/filters/FilterMirrorRepresentation.java
iltershow/filters/FilterRotateRepresentation.java
iltershow/filters/FilterStraightenRepresentation.java
iltershow/imageshow/GeometryMetadata.java
iltershow/pipeline/CacheProcessing.java
8e33c2b402983070eb0cc9ace16ecfa4b9728447 31-Jul-2013 nicolasroard <nicolasroard@google.com> Implements N-1 Caching

Change-Id: Ief1a04dbe4f6ced15f937177a556733cfcdb5879
iltershow/filters/FilterVignetteRepresentation.java
iltershow/pipeline/CacheProcessing.java
iltershow/pipeline/CachingPipeline.java
iltershow/pipeline/ImagePreset.java
a7b81a0bc392f74663620b4e2592f50ca849ae0c 31-Jul-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Do antialiasing on wallpaper preview." into gb-ub-photos-carlsbad
b647b432bb7024e5ce01e10e0f06f63670cac2be 31-Jul-2013 Ruben Brunk <rubenbrunk@google.com> Do antialiasing on wallpaper preview.

Bug: 9052851
Change-Id: I890fae2d4bb9907c7204cc6fa34c42c7fe7c7309
iltershow/crop/CropView.java
1a8760622fccea0b1f60d1db530d8404a87209a5 31-Jul-2013 John Hoford <hoford@google.com> Merge "clean up some bugs and update the icons" into gb-ub-photos-carlsbad
db7b89f63ec342d217efe6af90a3949f47e2fd33 31-Jul-2013 John Hoford <hoford@google.com> clean up some bugs and update the icons

Change-Id: I6952bae8cfea2ec64064f3126eece93687c02eae
iltershow/filters/FilterGradRepresentation.java
iltershow/filters/ImageFilterGrad.java
iltershow/filters/grad.rs
iltershow/imageshow/ImageGrad.java
fa474a198019851ecc3824a1dfbac94cd1928efc 15-Jul-2013 nicolasroard <nicolasroard@google.com> Add user presets saving/loading

Change-Id: I85c5dd0df1e9264a01c8d7a6d44602e87799890c
iltershow/FilterShowActivity.java
iltershow/category/Action.java
iltershow/category/CategoryAdapter.java
iltershow/category/CategoryTrack.java
iltershow/data/FilterStackSource.java
iltershow/data/UserPresetsManager.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterUserPresetRepresentation.java
iltershow/pipeline/FilterEnvironment.java
iltershow/pipeline/ImagePreset.java
iltershow/presets/PresetManagementDialog.java
iltershow/presets/UserPresetsAdapter.java
41c10a66ee55978b0673ac68a097d556b719887a 30-Jul-2013 John Hoford <hoford@google.com> Merge "add Grad filter" into gb-ub-photos-carlsbad
e162b032fe387eabbd69d367dae6fe7003e850a1 20-Jul-2013 John Hoford <hoford@google.com> add Grad filter

Change-Id: I30fc0810c54f3daa31726188a4c3762df33953a7
iltershow/FilterShowActivity.java
iltershow/editors/EditorGrad.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterGradRepresentation.java
iltershow/filters/ImageFilterGrad.java
iltershow/filters/grad.rs
iltershow/imageshow/GradControl.java
iltershow/imageshow/ImageGrad.java
iltershow/imageshow/Line.java
b9b95fb792c2b0f0b1ecbbcb30713b345475b332 26-Jul-2013 nicolasroard <nicolasroard@google.com> Fix disappearing fragment

Change-Id: Ic478ad75a458bb36001c91f8627aab7643fa0a47
iltershow/FilterShowActivity.java
c62333b112403ef59a1c745e5ae705cfee752451 26-Jul-2013 nicolasroard <nicolasroard@google.com> Fix geometry serialization

Change-Id: I3040cfdb08f6cc6dbd4fd1eb5444b3395a68c7da
iltershow/pipeline/ImagePreset.java
568b8d8bade4aac4bc598dff9b76ced159c533bf 25-Jul-2013 Ruben Brunk <rubenbrunk@google.com> Added support to export to a flattened photo.

Bug: 10008212

- Adds a menu item to allow a photo with edits to be flattened
into a separate photo.
- Fixes bug where crop intents fail to save cropped images.

Change-Id: I1dcf1bb9ba22e72378f24e7971a74f81b8db7564
iltershow/FilterShowActivity.java
iltershow/pipeline/ImageSavingTask.java
iltershow/pipeline/ProcessingService.java
iltershow/tools/SaveImage.java
db68fbd8857ca83b5a54402d1b07c75d36921641 24-Jul-2013 nicolasroard <nicolasroard@google.com> Fix geometry transform

Change-Id: I0c3af6f4122d045f5a8656bc709127aa7ae2ecab
iltershow/imageshow/ImageShow.java
915304ca96ee8b686944d39c48a5442f27de4b92 23-Jul-2013 nicolasroard <nicolasroard@google.com> Merge "Move ImageCurves to the ImageShow package" into gb-ub-photos-carlsbad
a08fab5958ecd50ada4b7c013af362029c61f117 22-Jul-2013 ztenghui <ztenghui@google.com> WAR the crash from re-editing missing online image

Instead of crashing, we get a toast now.
As a bonus, this will show the same toast if .aux directory is removed
manually.

bug:9961671
Change-Id: I92f38fc752a48d3cb5a9a80aa041cd9b290937ea
iltershow/FilterShowActivity.java
368ae73ad0627dac41709b925fc02a12548ab80d 22-Jul-2013 nicolasroard <nicolasroard@google.com> Move ImageCurves to the ImageShow package

Change-Id: I458d20df930b9228dcbc60c3ec27f74b152d38cf
iltershow/FilterShowActivity.java
iltershow/editors/EditorCurves.java
iltershow/filters/FilterCurvesRepresentation.java
iltershow/filters/ImageFilterCurves.java
iltershow/imageshow/ControlPoint.java
iltershow/imageshow/ImageCurves.java
iltershow/imageshow/Spline.java
iltershow/ui/ControlPoint.java
iltershow/ui/ImageCurves.java
iltershow/ui/Spline.java
08f4cc3988e54937f191e61588f50535df34712e 22-Jul-2013 ztenghui <ztenghui@google.com> Fix saving issues with online image.

bug:9468909

Change-Id: I10762dba307999d87fac08b3a2ce7e104264a813
iltershow/tools/SaveImage.java
f6d74812fe3ec8195ecc30f9b66dd3cf74f53a36 20-Jul-2013 nicolasroard <nicolasroard@google.com> Merge "Remove FilteringPipeline" into gb-ub-photos-carlsbad
db5d060e8077f70d650e1ce56618f953114551e0 19-Jul-2013 nicolasroard <nicolasroard@google.com> Remove FilteringPipeline

Reorganize things around the filtering service.
- add HighresRenderingTask
- add RenderingRequestTask
- add UpdatePreviewTask

Change-Id: I3da34fee8c624fb55311c3e1639857fc1bcdadad
iltershow/FilterShowActivity.java
iltershow/category/Action.java
iltershow/imageshow/MasterImage.java
iltershow/pipeline/FilteringPipeline.java
iltershow/pipeline/HighresRenderingRequestTask.java
iltershow/pipeline/ProcessingService.java
iltershow/pipeline/ProcessingTask.java
iltershow/pipeline/ProcessingTaskController.java
iltershow/pipeline/RenderingRequest.java
iltershow/pipeline/RenderingRequestTask.java
iltershow/pipeline/UpdatePreviewTask.java
bf045dcfe1970f0a396e4ea703b620916c893d02 20-Jul-2013 ztenghui <ztenghui@google.com> Merge "Update Uri instead of removing" into gb-ub-photos-carlsbad
09169dd269f1a82efb83ea1cebf75abe4daabd26 18-Jul-2013 ztenghui <ztenghui@google.com> Update Uri instead of removing

In this way, the processing service can have a better presentation.
The cache key now include the file Uri and local abs path if exists.

bug:9468909

Change-Id: I0919c09ad26bea2e798c99ad376996547f8f2bf8
ata/ImageCacheRequest.java
ata/ImageCacheService.java
ata/LocalImage.java
ata/LocalVideo.java
iltershow/tools/SaveImage.java
76a8b489a62ed82919c8b6339123488c09fc0168 16-Jul-2013 Ruben Brunk <rubenbrunk@google.com> Refactoring GeometryMetadata.

Bug: 9170644

- First part of multi-step refactor, splits
GeometryMetadata functionality into 4
FilterRepresentation subclasses as requested.

Change-Id: I212193db8c154f64c550adb9735c0502bcaa7468
iltershow/filters/FilterCropRepresentation.java
iltershow/filters/FilterMirrorRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/FilterRotateRepresentation.java
iltershow/filters/FilterStraightenRepresentation.java
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageFlip.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageRotate.java
iltershow/pipeline/ImagePreset.java
3f0034140c165b86fbaf5c0369f39431548308e9 16-Jul-2013 John Hoford <hoford@google.com> remove clone

Change-Id: Ia9f4c1778e06416018eeb07be657bcdd0af1496b
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterBasicRepresentation.java
iltershow/filters/FilterColorBorderRepresentation.java
iltershow/filters/FilterCurvesRepresentation.java
iltershow/filters/FilterDirectRepresentation.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/FilterFxRepresentation.java
iltershow/filters/FilterImageBorderRepresentation.java
iltershow/filters/FilterPointRepresentation.java
iltershow/filters/FilterRedEyeRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/FilterTinyPlanetRepresentation.java
iltershow/filters/FilterVignetteRepresentation.java
iltershow/history/HistoryItem.java
iltershow/imageshow/GeometryMetadata.java
iltershow/pipeline/ImagePreset.java
06e34ad198138a9b9b5252af9dd54f2915d0551f 17-Jul-2013 John Reck <jreck@google.com> Fix help for GalleryGoogle builds

Bug: 9886976

Change-Id: I23fc78b924f3757f8ab12f84d3a0c97c1adc2333
(cherry picked from commit 7a43c8c3b85d6f9162651d8ed8b3a11a87490824)
pp/AlbumSetPage.java
til/HelpUtils.java
24d6ec7beb37eb3a5449f1fa49b4adb123391d24 13-Jul-2013 nicolasroard <nicolasroard@google.com> Add background processing service

bug:7298624

Change-Id: Ie79f88fd84fdf8f4dab6a8071f06a819e247b357
ata/LocalImage.java
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/crop/CropActivity.java
iltershow/filters/BaseFiltersManager.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/pipeline/CachingPipeline.java
iltershow/pipeline/FilteringPipeline.java
iltershow/pipeline/ImagePreset.java
iltershow/pipeline/ImageSavingTask.java
iltershow/pipeline/ProcessingService.java
iltershow/pipeline/ProcessingTask.java
iltershow/pipeline/ProcessingTaskController.java
iltershow/tools/SaveCopyTask.java
iltershow/tools/SaveImage.java
til/SaveVideoFileUtils.java
b279681ff115205aee81eb52ee8793fd709f0908 16-Jul-2013 ztenghui <ztenghui@google.com> Add equality check into FilterCurveRep

Consequently add equality check support in Spline and ControlPoint.

bug:9468909
Change-Id: I8078b994beac4056ca92e76da0e15d618389e56e
iltershow/filters/FilterCurvesRepresentation.java
iltershow/imageshow/MasterImage.java
iltershow/ui/ControlPoint.java
iltershow/ui/Spline.java
d483f8bf7024e41e1aeb7e36c5938a12ebcb4a04 15-Jul-2013 ztenghui <ztenghui@google.com> FilterDirectRepresentation always should be considered as has modification.

Therefore isNil should be false.

bug:9468909
Change-Id: I9946d060e7a1c73b6dc27c73d8f3b7986343de98
iltershow/filters/FilterDirectRepresentation.java
47886ac74f2874633d4c1284b91c33117f056581 13-Jul-2013 Ruben Brunk <rubenbrunk@google.com> Combine ImageLoader and CropLoader utility classes.

Bug: 9356969
Bug: 9170644

- Refactor to eliminate code duplication in image loading classes.
- Fix bugs caused by the inability to determine MIME types for images
that aren't in Gallery's content provider (causes b/9356969).

Change-Id: I30c2ba5c0cd37aac624681a2cec9abddaa78f9c2
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/crop/CropActivity.java
iltershow/crop/CropLoader.java
iltershow/filters/ImageFilterDraw.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/tools/SaveCopyTask.java
0c1b4c6422a4d2d9b81cc0946d1c9675440a94e2 09-Jul-2013 Ruben Brunk <rubenbrunk@google.com> Refactoring ImageLoader.

- Moves state (history, loadlisteners, bitmaps, etc.)
from ImageLoader to MasterImage.
- Makes ImageLoader into a utility class.

Change-Id: I7a8a988c61848694a86a4b2919bf8f30bfd2be8c
iltershow/EditorPlaceHolder.java
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/editors/Editor.java
iltershow/editors/EditorCrop.java
iltershow/editors/EditorFlip.java
iltershow/editors/EditorRotate.java
iltershow/editors/EditorStraighten.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterDownsample.java
iltershow/filters/ImageFilterDraw.java
iltershow/filters/ImageFilterTinyPlanet.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageVignette.java
iltershow/imageshow/MasterImage.java
iltershow/pipeline/CachingPipeline.java
iltershow/pipeline/FilteringPipeline.java
iltershow/pipeline/ImagePreset.java
iltershow/pipeline/RenderingRequest.java
860dfcfa96936adf716ab89fb41ed18994fbbd71 11-Jul-2013 nicolasroard <nicolasroard@google.com> Fix selection in categories

Change-Id: Ica9ff5ba4a6d195f8b1ea1a686e9bbc6772d655f
iltershow/category/CategoryAdapter.java
iltershow/category/CategoryPanel.java
ffc6aea8d586de43e246e60155e573fd34d90da2 11-Jul-2013 nicolasroard <nicolasroard@google.com> Fix state panel

Labels were not reflecting looks changes

bug:9746512
Change-Id: Ia2dd2a760f38dbd48c8a4d43e3d46ee2b875771f
iltershow/FilterShowActivity.java
iltershow/imageshow/MasterImage.java
iltershow/state/State.java
0c6bf51126220554a7aa416d3486ee9b8928540b 03-Jul-2013 nicolasroard <nicolasroard@google.com> Remove FilterIconButton

Change-Id: Ie1d7c4e8d3f397323f702eba2809f2589b8071f0
iltershow/category/CategoryAdapter.java
iltershow/ui/FilterIconButton.java
iltershow/ui/IconButton.java
4d1c49cbb750ca928487ea436febfa0b5d50abca 03-Jul-2013 nicolasroard <nicolasroard@google.com> Merge "Improves portrait categories buttons" into gb-ub-photos-carlsbad
2332f652d86e98887996505002d34b4f7940c34a 03-Jul-2013 nicolasroard <nicolasroard@google.com> Improves portrait categories buttons

- use only CategoryView, no FilterIconButton
- add xml values for the font size/margins
- for now reuse the same Action bitmap
- add accessibility contentDescription

Change-Id: Ic1ae8015abba27bea0b3c4a2bccbd1a7c9ff4731
iltershow/FilterShowActivity.java
iltershow/category/Action.java
iltershow/category/CategoryAdapter.java
iltershow/category/CategoryPanel.java
iltershow/category/CategoryView.java
8d90cb8d8629a56be63cff10035232f587c2d4bd 28-Jun-2013 ztenghui <ztenghui@google.com> Try to restore the original file instead of copying when appropiate.

bug:9468909

Change-Id: I09ac244459389b0fdf6f64a79987c176ba8756d8
iltershow/tools/SaveCopyTask.java
ce9ceff5776a9b0479c30cbeb2a9388b44df1865 03-Jul-2013 nicolasroard <nicolasroard@google.com> Move classes to pipeline package

Change-Id: I9d664537d845d9daeb352c8006d0296a3f546dca
iltershow/FilterShowActivity.java
iltershow/cache/CachingPipeline.java
iltershow/cache/FilteringPipeline.java
iltershow/cache/ImageLoader.java
iltershow/cache/RenderingRequest.java
iltershow/cache/RenderingRequestCaller.java
iltershow/category/Action.java
iltershow/category/CategoryAdapter.java
iltershow/controller/BasicParameterStyle.java
iltershow/controller/FilterView.java
iltershow/controller/ParameterStyles.java
iltershow/controller/StyleChooser.java
iltershow/editors/Editor.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterDraw.java
iltershow/filters/ImageFilterRS.java
iltershow/filters/ImageFilterTinyPlanet.java
iltershow/filters/ImageFilterVignette.java
iltershow/history/HistoryItem.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/pipeline/Buffer.java
iltershow/pipeline/CachingPipeline.java
iltershow/pipeline/FilterEnvironment.java
iltershow/pipeline/FilteringPipeline.java
iltershow/pipeline/ImagePreset.java
iltershow/pipeline/PipelineInterface.java
iltershow/pipeline/RenderingRequest.java
iltershow/pipeline/RenderingRequestCaller.java
iltershow/pipeline/SharedPreset.java
iltershow/presets/FilterEnvironment.java
iltershow/presets/ImagePreset.java
iltershow/presets/PipelineInterface.java
iltershow/tools/SaveCopyTask.java
iltershow/tools/XmpPresets.java
iltershow/ui/FilterIconButton.java
iltershow/ui/ImageCurves.java
5d24515190c1664f944b7950d1a75b0df0de2ff8 03-Jul-2013 nicolasroard <nicolasroard@google.com> Fix crash in geometry

Change-Id: I4c9292b539643f2e2738d788dcb58f0a129254f9
iltershow/editors/Editor.java
be84355fddceb9690eef752707c42457ea251e77 03-Jul-2013 nicolasroard <nicolasroard@google.com> Speed up load times

Compute the small res image on the fly
Load the high res preview image after first load

Change-Id: Icc556c2204cb4fd25766d90064a5756c877b11cc
iltershow/FilterShowActivity.java
iltershow/cache/CachingPipeline.java
iltershow/cache/FilteringPipeline.java
iltershow/cache/ImageLoader.java
6a2491c0afff0243b2174743937ea4be463a22b0 02-Jul-2013 nicolasroard <nicolasroard@google.com> Add stop check in ImageFilterFX

speed up switching / interrupting of rendering.

Change-Id: I3ef4b1d16047b00a062c86d72cdfff2bfe9817a2
iltershow/filters/IconUtilities.java
iltershow/filters/ImageFilterFx.java
7f7755f76210a500e6ce63bfa880f23303556294 02-Jul-2013 nicolasroard <nicolasroard@google.com> Pipeline refactoring

Remove the temp representations and instead use a triple
buffer for ImagePresets.

Change-Id: I4cdcfbe4941af72b38fe42385085ff4a20eb78cc
iltershow/cache/CachingPipeline.java
iltershow/cache/FilteringPipeline.java
iltershow/filters/FilterRepresentation.java
iltershow/imageshow/MasterImage.java
iltershow/pipeline/Buffer.java
iltershow/pipeline/SharedBuffer.java
iltershow/pipeline/SharedPreset.java
iltershow/presets/ImagePreset.java
cf68d2f5d9f886995797a3fc8e844a0602227224 02-Jul-2013 nicolasroard <nicolasroard@google.com> Pipeline refactoring

Add SharedBuffer and Buffer class

Change-Id: I823a9520541e3be5321a3deb5e58a358588b6cf3
iltershow/cache/CachingPipeline.java
iltershow/cache/FilteringPipeline.java
iltershow/cache/TripleBufferBitmap.java
iltershow/imageshow/MasterImage.java
iltershow/pipeline/Buffer.java
iltershow/pipeline/SharedBuffer.java
iltershow/presets/FilterEnvironment.java
43cd49f38db7bd41b9d5d481a483495b6c766919 02-Jul-2013 ztenghui <ztenghui@google.com> Merge "Fix the save button issue." into gb-ub-photos-carlsbad
545eca119e7b2dc783f8d89a0de4330b5444ed79 28-Jun-2013 ztenghui <ztenghui@google.com> Fix the save button issue.

When dealing with non Fx filters, the hasModification() really need to go deep
to figure out whether things has changed.

bug:9468909

Change-Id: I89495f147f7af7c35490def84805aae98e3f917f
iltershow/FilterShowActivity.java
iltershow/filters/FilterRepresentation.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
d1e1f5ae3f351882dd186895fc9e595d03e03bd9 28-Jun-2013 ztenghui <ztenghui@google.com> Merge "Add a switch to turn on/off the aux directory saving" into gb-ub-photos-carlsbad
b55e3368300c01913067a87976cfaf9a3dcaef5e 28-Jun-2013 ztenghui <ztenghui@google.com> Add a switch to turn on/off the aux directory saving

bug:9468909

Change-Id: Iaecda20a74a02556d883f0e97250e9ec4d856677
iltershow/tools/SaveCopyTask.java
312efd6469dd0a26e26d8838af4f5db6b40efe2f 28-Jun-2013 John Hoford <hoford@google.com> small bug in reading presets

Change-Id: I791a8407d72b92f5e46a33c254d44747308b2ba5
iltershow/presets/ImagePreset.java
6a50273a45cdda757daf9840e9e36a2b60eff1aa 27-Jun-2013 nicolasroard <nicolasroard@google.com> Refactor HistoryAdapter

- Remove the adapter part
- Rename into HistoryManager

Change-Id: I58de5661770f8796882ff4a633aec700bd8bc1a5
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/editors/EditorPanel.java
iltershow/history/HistoryAdapter.java
iltershow/history/HistoryManager.java
iltershow/imageshow/MasterImage.java
d2e9ea0ce1949e192e80ce806e702606694440ac 24-Jun-2013 ztenghui <ztenghui@google.com> Save button now behaves correctly for filter changes.

Basically, save the original filter from the file's XMP.
Compare the current filter against original one to decide whether or not the
file has been modified and needed to be saved.

At the same time, make sure we don't save "None" filter in the ImagePreset.

bug:9468909

Change-Id: I5b86ab95556b6b010367c9577b02c0bb42ffb824
iltershow/FilterShowActivity.java
iltershow/filters/FilterRepresentation.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
5180e681e1b68eae403b2740c609792ca44f77ce 27-Jun-2013 nicolasroard <nicolasroard@google.com> Move history classes to their own package

Change-Id: Ib4f50c56b445788cad3b973673008d8a89244867
iltershow/FilterShowActivity.java
iltershow/HistoryAdapter.java
iltershow/HistoryItem.java
iltershow/cache/ImageLoader.java
iltershow/editors/EditorPanel.java
iltershow/history/HistoryAdapter.java
iltershow/history/HistoryItem.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/MasterImage.java
acc00f8fed8960b079448db8f05c3fbac8642ca4 26-Jun-2013 nicolasroard <nicolasroard@google.com> Fix selected frame in looks and borders

Change-Id: Id1839a028f3044929043d7c910df30a1fcabdda1
iltershow/FilterShowActivity.java
iltershow/category/CategoryAdapter.java
iltershow/category/CategoryPanel.java
iltershow/category/CategoryTrack.java
iltershow/category/CategoryView.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
ed60979e64de8837dd1e2e8b2d208e34583d853c 27-Jun-2013 nicolasroard <nicolasroard@google.com> ImagePreset cleanup

Get rid of remaining ivars related to history

Change-Id: Ic106ef6a96f4727c6dd46d7be3d059bdc42e5a2a
iltershow/FilterShowActivity.java
iltershow/HistoryAdapter.java
iltershow/HistoryItem.java
iltershow/cache/CachingPipeline.java
iltershow/category/CategoryAdapter.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageFlip.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageRotate.java
iltershow/imageshow/ImageStraighten.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
2d0eaf53ef11c9fd9b3abb824c12087fe1230cdf 27-Jun-2013 John Hoford <hoford@google.com> fix icon repaint on simple load

Change-Id: I841475949e67b63fd3d24a2267fda9f2e450898d
iltershow/FilterShowActivity.java
e6a96014e46f80658d5e2c7e4f28d14007c14429 27-Jun-2013 John Hoford <hoford@google.com> Merge "support non destructive edits of Curves" into gb-ub-photos-carlsbad
e65bc86b6285596d6fdf23f31b59c67b7a53e95d 27-Jun-2013 nicolasroard <nicolasroard@google.com> Fix tot

Change-Id: I75b28ac56f9c3b295280690078f5c854fda7eb66
iltershow/imageshow/ImageGeometry.java
iltershow/presets/ImagePreset.java
5762138f8c561cb377d52f3379b89977fc2fbc14 25-Jun-2013 John Hoford <hoford@google.com> support non destructive edits of Curves

Change-Id: I597be6570a17072a4116bf6227a6a35796266bc3
iltershow/filters/FilterCurvesRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/presets/ImagePreset.java
e5f4b784ddfaf359fe460998d0edc25755df8bdc 26-Jun-2013 nicolasroard <nicolasroard@google.com> Cleanup in ImagePreset

Move GeometryMetadata to the list of filters

Change-Id: I0bef13ca0d9cb41e68eddd108000ff7bd426b313
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilter.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
iltershow/ui/FilterIconButton.java
4b04ebaf495b0c533c3ccedf68a3f01e451007c1 26-Jun-2013 ztenghui <ztenghui@google.com> Merge "Fix ambiguous naming and typo" into gb-ub-photos-carlsbad
c9ca6d1eb85a71b7667f4c25d879e78cce16ac4c 26-Jun-2013 ztenghui <ztenghui@google.com> Fix ambiguous naming and typo

bug:9468909
Change-Id: Ic52f3b6f6b5d0c874e8291ce7b3a76cb6c22f60f
iltershow/FilterShowActivity.java
iltershow/filters/FilterColorBorderRepresentation.java
iltershow/filters/FilterFxRepresentation.java
iltershow/filters/FilterImageBorderRepresentation.java
iltershow/filters/FilterRepresentation.java
299df694252f40a05a21822a08fe41aca8882aa3 26-Jun-2013 nicolasroard <nicolasroard@google.com> Merge "Cleanup ImagePreset to remove special-casing for borders" into gb-ub-photos-carlsbad
bb92950836df40142f34834259af476d01bfc751 26-Jun-2013 nicolasroard <nicolasroard@google.com> Cleanup ImagePreset to remove special-casing
for borders

Change-Id: I6410a7a44d72c3dfa51c1d18f5a6fcba854ba9c2
iltershow/presets/ImagePreset.java
b7c71a6ec1fbe7ec003f0820a7b0c198d6dda2e8 25-Jun-2013 ztenghui <ztenghui@google.com> Merge "Fix the missing filter name after deserialization." into gb-ub-photos-carlsbad
099e5fc37091823f448b95bc4f3d3511e9919fbf 25-Jun-2013 ztenghui <ztenghui@google.com> Fix the missing filter name after deserialization.

bug:9468909

Change-Id: I63aaf0bad02c2afdddf9b162f695fc0a9165befa
iltershow/filters/FilterRepresentation.java
7b031c3ed700c806dc1248931ae33c19e267010e 24-Jun-2013 nicolasroard <nicolasroard@google.com> Merge "Add a MatrixFit class" into gb-ub-photos-carlsbad
f349b1b2b2d3a1c024a979328e89c112d3e2cf25 21-Jun-2013 Bobby Georgescu <georgescu@google.com> MTP Importer: show overlay icon on video items

Bug: 4099088
Change-Id: Ia785f889aff91329e9d7c7026238b2588336963d
ngest/ui/MtpImageView.java
0c63c43455348ce01aff5f50f8b50b4612c0f8bf 20-Jun-2013 Bobby Georgescu <georgescu@google.com> MTP Importer: improve experience when importing large files

Bug: 4099088
Change-Id: Ie5d9da1be0b8891b9123eceaadfe9c2ec2d3e408
ngest/IngestActivity.java
605a7cae72e081ee4014ef4cfad2ebb3b499dc1b 20-Jun-2013 Bobby Georgescu <georgescu@google.com> Merge "Add support for importing videos in MTP importer" into gb-ub-photos-carlsbad
baa68886db66f4beb6a07e4441b122975b778f1c 17-Jun-2013 Bobby Georgescu <georgescu@google.com> Add support for importing videos in MTP importer

Bug: 4099088

Change-Id: Ic3ac00cb730381dd2d7f4802aa8001a60e439748
ngest/ImportTask.java
ngest/MtpDeviceIndex.java
ngest/ui/MtpImageView.java
593e5cddfa50865d42ef344353e6aad65948b0a7 20-Jun-2013 ztenghui <ztenghui@google.com> Merge "Fix LUT3D information lost after re-edit" into gb-ub-photos-carlsbad
7ebd97114cf069342d7b75d3c9a9ece8f448f4fc 20-Jun-2013 ztenghui <ztenghui@google.com> Merge "Setup the saving framework to support hiding original photo for editor." into gb-ub-photos-carlsbad
667762f9381190c8a1d1c66bbaad15b680bb24b5 19-Jun-2013 ztenghui <ztenghui@google.com> Fix LUT3D information lost after re-edit

bug:9427243

Change-Id: I8535c8776c866fd6c84d391a8de82df9cb214694
iltershow/filters/FilterFxRepresentation.java
70e303692f3308905209adbc54cf298d441b03f4 19-Jun-2013 nicolasroard <nicolasroard@google.com> Add a MatrixFit class

Change-Id: I67d2eb92fe5bbdff56ff50330c7eed48e7593f75
iltershow/tools/MatrixFit.java
b3f62e4ed7a80010017dc3893460ca9043afb383 11-Jun-2013 ztenghui <ztenghui@google.com> 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
ata/LocalImage.java
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/tools/SaveCopyTask.java
til/SaveVideoFileUtils.java
43d796d5c098be9f92c89db5501b986daf52763e 14-Jun-2013 Doris Liu <tianliu@google.com> Switch over to use new camera activity

Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
pp/StateManager.java
842985c1561b6e0447c71ebb18298cf5cb62fce2 18-Jun-2013 Bobby Georgescu <georgescu@google.com> 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
iltershow/FilterShowActivity.java
iltershow/presets/ImagePreset.java
iltershow/tools/SaveCopyTask.java
ebd3dbd2cea94c6cf1fd84c24de073f937b2fb3a 17-Jun-2013 Ruben Brunk <rubenbrunk@google.com> Added serialization IDs for frames, adds frames to analytics.

Bug: 9467671
Change-Id: I6f21e7bc9ca7255a290ba7cd1a94e9b07e7b06cb
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
43958ed6e309ac4ec2bcd81bc590b521cbabdbd5 17-Jun-2013 Ruben Brunk <rubenbrunk@google.com> Fix IDs for analytics, unlocalize serialization IDs.

Bug: 9467671
Bug: 9336168
Change-Id: Icb0037ab853598b8ad6b931808074f824ea706ed
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterFxRepresentation.java
iltershow/presets/ImagePreset.java
a724219282b78872932c64c008f5d98e0fed7186 13-Jun-2013 John Hoford <hoford@google.com> Merge "fix start up crash" into gb-ub-photos-carlsbad
52fa110135563740ebc27326afab4326bbb9b9f5 11-Jun-2013 John Hoford <hoford@google.com> fix start up crash

bug:8734160

Change-Id: Iaf7f6bdbd70ab04011b9af7816a6991724363e49
iltershow/FilterShowActivity.java
5c57134ef2636f452bd6ec907d6510840390d982 12-Jun-2013 nicolasroard <nicolasroard@google.com> Fix icon sizes and jaggies

bug:9105608
bug:8791729
Change-Id: I828e9d4daf4025f53d505a3412c27dd8c54a607e
iltershow/category/Action.java
iltershow/tools/IconFactory.java
3de1ebebe75042cd7dc342c4e3fa094bbb5cbc8d 11-Jun-2013 nicolasroard <nicolasroard@google.com> am a4d93ac0: Fix text size in the state panel

* commit 'a4d93ac033712096c820840b31e7017f850f8e74':
Fix text size in the state panel
58f222cffc292318a2f1c89a87ab5c7b89b563e1 11-Jun-2013 Ruben Brunk <rubenbrunk@google.com> Mirror CL 319301 in Bryce.

Change-Id: If84a08aa1969415a0d5d9ad3b9153743b1951108
iltershow/crop/CropLoader.java
a4d93ac033712096c820840b31e7017f850f8e74 11-Jun-2013 nicolasroard <nicolasroard@google.com> Fix text size in the state panel

bug:9377153

Change-Id: I6a3a383e4180d757f0272492dcadcbfdb580b154
(cherry picked from commit 68cb2b7efda1b35c79279c670b0d3a0bd6df72ae)
iltershow/state/StateView.java
af59322ac944e6e17aaf718045949a3352016945 11-Jun-2013 nicolasroard <nicolasroard@google.com> Fix panel anim in ICS

Change-Id: Ie2e5a6a36c5bec309b5848e50a90f089f9aeffa9
iltershow/FilterShowActivity.java
c8d14359ff37276640b8d0e31736700311223b6c 11-Jun-2013 nicolasroard <nicolasroard@google.com> Fix state panel text size
bug:9377153

Change-Id: Id5243539e2f8d3ee737e24eeb204145fbaa9138d
iltershow/state/StateView.java
af85f6423ad5969f12ed68fd12a0fe3abce3e409 10-Jun-2013 nicolasroard <nicolasroard@google.com> Fix warnings

Change-Id: I736364e538c2cb03f58c05b9b38252e7771f23e8
iltershow/filters/FilterRepresentation.java
e5c6c9b09881478b4649b284656eee53d7c7e90d 07-Jun-2013 Bobby Georgescu <georgescu@google.com> Fix NPE in PreparePageFadeoutTexture

Bug: 8837688
Change-Id: Ie8fbd9a42497195b8a01cc5638cb0c44d4532d09
i/PreparePageFadeoutTexture.java
7c5340b672285c230eb8e672ad7ac0cd63bd8a70 05-Jun-2013 John Reck <jreck@google.com> Merge "Fix graphical corruption due to tear down race" into gb-ub-photos-carlsbad
6adf13c2aeee89735df1b7c12670a026e5087161 05-Jun-2013 John Reck <jreck@google.com> Fix graphical corruption due to tear down race

Bug: 9278945

Change-Id: I7594680322768f60eaed8a1037d139cbadf9706b
i/GLRootView.java
3cb106ddd7ad0f8494ac9c7a33660831c1694295 04-Jun-2013 Ruben Brunk <rubenbrunk@google.com> Removing unused UI fields in FilterRepresentation.

Bug: 9170644

Change-Id: Ic197123286e06d9eb64d30eb345f8cc5797659a2
iltershow/FilterShowActivity.java
iltershow/category/Action.java
iltershow/category/CategoryAdapter.java
iltershow/filters/FilterColorBorderRepresentation.java
iltershow/filters/FilterCurvesRepresentation.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/FilterFxRepresentation.java
iltershow/filters/FilterImageBorderRepresentation.java
iltershow/filters/FilterPointRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/FilterTinyPlanetRepresentation.java
iltershow/filters/FilterVignetteRepresentation.java
iltershow/filters/ImageFilterBwFilter.java
iltershow/filters/ImageFilterContrast.java
iltershow/filters/ImageFilterDownsample.java
iltershow/filters/ImageFilterEdge.java
iltershow/filters/ImageFilterExposure.java
iltershow/filters/ImageFilterHighlights.java
iltershow/filters/ImageFilterHue.java
iltershow/filters/ImageFilterKMeans.java
iltershow/filters/ImageFilterNegative.java
iltershow/filters/ImageFilterSaturated.java
iltershow/filters/ImageFilterShadows.java
iltershow/filters/ImageFilterSharpen.java
iltershow/filters/ImageFilterVibrance.java
iltershow/filters/ImageFilterWBalance.java
iltershow/presets/ImagePreset.java
b619ded0b604c5b34e2ecdb3f082cc34bc3ab012 03-Jun-2013 Ruben Brunk <rubenbrunk@google.com> Fixes save filename for panos after edit.

Bug: 9258209
Change-Id: Ib7404242e5886a38b9e6f9fd6f28a52f1a703590
iltershow/tools/SaveCopyTask.java
8481c661729888b86f2958de3ac3f4008bcac078 03-Jun-2013 Ruben Brunk <rubenbrunk@google.com> am 536c651c: am 8bb4e1a0: Fixes reading exif tags in editor.

* commit '536c651c7fa0c8e70990ba8ff302cdc98e8c3105':
Fixes reading exif tags in editor.
bade99fb4e50911293588eacba1d20b5def2d362 03-Jun-2013 Ruben Brunk <rubenbrunk@google.com> am 8bb4e1a0: Fixes reading exif tags in editor.

* commit '8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9':
Fixes reading exif tags in editor.
536c651c7fa0c8e70990ba8ff302cdc98e8c3105 03-Jun-2013 Ruben Brunk <rubenbrunk@google.com> am 8bb4e1a0: Fixes reading exif tags in editor.

* commit '8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9':
Fixes reading exif tags in editor.
8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9 03-Jun-2013 Ruben Brunk <rubenbrunk@google.com> Fixes reading exif tags in editor.

Bug: 9140401
Change-Id: Ic84efca90c5297ab2c6a65b13d512c4799e623f6
iltershow/tools/SaveCopyTask.java
53f79011c7ca434932e9eec75aaf8b48368d5a9e 03-Jun-2013 ztenghui <ztenghui@google.com> Merge "Add LUT3D filter state saving" into gb-ub-photos-carlsbad
8ad8047fe862a1c6547e2aaf4bec73c20b6cbaec 01-Jun-2013 ztenghui <ztenghui@google.com> Add LUT3D filter state saving

Change-Id: I195fad1dcad5639c30a2eb94ce28cfd0a2464018
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterFxRepresentation.java
cdadeb52f12d26844db65abf9f445faee1cba199 31-May-2013 Ruben Brunk <rubenbrunk@google.com> Mirroring google3 for CL 47368174.

Change-Id: Ic29d8d6784870660e0bd83f870ec2cf0c244746d
iltershow/filters/FilterRepresentation.java
a2c4bda1ed7b44085516b2e8f140637e4691bab1 29-May-2013 Ruben Brunk <rubenbrunk@google.com> Cleaning up ImageShow.

Bug: 9170644
Change-Id: Iab44ec425462e9afe8c104c52e4a28c4145d4690
iltershow/FilterShowActivity.java
iltershow/editors/Editor.java
iltershow/editors/EditorPanel.java
iltershow/imageshow/ImageDraw.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageShow.java
iltershow/ui/ImageCurves.java
cb18a9a2c6c35c3ccda7902ec28cd5be85180cd2 29-May-2013 John Hoford <hoford@google.com> Merge "zoom to center of double tap" into gb-ub-photos-carlsbad
c031ffc8c8c54f292e30532146c46b5bbbb27eef 29-May-2013 John Hoford <hoford@google.com> zoom to center of double tap

Change-Id: Idfc257f92dd1a97d9109b9f5325299b8e1432c37
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
96e009051c326c399e47e5a56e448a2d44b0bf06 28-May-2013 Ruben Brunk <rubenbrunk@google.com> Removed unused ZoomCache class.

Bug: 9170644

Note: this class doesn't appear to have been used by the zoom
on doubletap.

Change-Id: Ie3319511ade7732976488f2bb7d76c5e1c130db9
iltershow/cache/ImageLoader.java
iltershow/cache/ZoomCache.java
d25fdea42988c72312ab3be0be76ab75e4d944c8 28-May-2013 Ruben Brunk <rubenbrunk@google.com> Removed unused handling for intent extras in editor.

Bug: 9170644
Change-Id: I569b16d278d1813f5a96f9e0231ed71ff9e33687
pp/AlbumPage.java
pp/Wallpaper.java
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/imageshow/ImageShow.java
iltershow/tools/BitmapTask.java
adget/WidgetConfigure.java
c4ef64c8cc8ba7edc543f64efcb25c401cc94466 28-May-2013 Bobby Georgescu <georgescu@google.com> am c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce

* commit 'c1aaf4b526507245428ef56a03727a5d0fb68659':
Prevent lock screen appearing during active slideshow
b2379a3cc15233b05cc10782bb5059d1cf4101bc 28-May-2013 Bobby Georgescu <georgescu@google.com> am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce

* commit 'e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e':
Prevent lock screen appearing during active slideshow
c1aaf4b526507245428ef56a03727a5d0fb68659 28-May-2013 Bobby Georgescu <georgescu@google.com> am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce

* commit 'e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e':
Prevent lock screen appearing during active slideshow
e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e 28-May-2013 Bobby Georgescu <georgescu@google.com> Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
ef132358deba6acbbeaf0a63014c77c98bca1d9a 25-May-2013 Bobby Georgescu <georgescu@google.com> Prevent lock screen appearing during active slideshow

Bug: 9094678
Change-Id: I8efb988911c75275430da934474df1e65265b234
pp/SlideshowPage.java
07a438da6d0c4dcd383c4d5e8a10e63066481dc9 24-May-2013 Christian Wichner <cwichner@google.com> 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
iltershow/filters/ImageFilter.java
iltershow/presets/FilterEnvironment.java
0d2e0608cce21d4d80d6b0270af71f86b150294f 23-May-2013 John Hoford <hoford@google.com> am 7b3d8d85: am a7a6a3a5: Fix issues with Local

* commit '7b3d8d85e8602c0f6b43a13b3b0b1deccb8600cd':
Fix issues with Local
123e5734716e7375b6c4041a5301f8e8c867e0ed 23-May-2013 John Hoford <hoford@google.com> am a7a6a3a5: Fix issues with Local

* commit 'a7a6a3a5efaf62cdd5d562a9141678671952d27d':
Fix issues with Local
7b3d8d85e8602c0f6b43a13b3b0b1deccb8600cd 23-May-2013 John Hoford <hoford@google.com> am a7a6a3a5: Fix issues with Local

* commit 'a7a6a3a5efaf62cdd5d562a9141678671952d27d':
Fix issues with Local
e5261fe32d324cdea531eda86c899f8b710d7ee0 23-May-2013 John Hoford <hoford@google.com> am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce

* commit '4d25d129d1c9f92033382e12260d3f40521cf3fd':
fix ellipse logic for portrait
a41fbbc17d94e1cb883b68d3c5cd1574a466bb66 23-May-2013 Michael Kolb <kolby@google.com> am be4f113f: Fix editor on ICS

* commit 'be4f113fa1fea32e8d8865a52491b9f25760eaba':
Fix editor on ICS
98aa64d42a19ba5189d002302550ce800747cb3d 23-May-2013 Michael Kolb <kolby@google.com> am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce

* commit '37be6658075cac2bad0e30d93705dddeaaf1e421':
Fix selection highlight for tablets
45e0a9e8ee29c98a9fcce7b69ce08880af2e8f9b 23-May-2013 John Reck <jreck@google.com> am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce

* commit '01ae91aa0e347c5a8b335afc8cb0f02459ee5adc':
Fix height
a7a6a3a5efaf62cdd5d562a9141678671952d27d 23-May-2013 John Hoford <hoford@google.com> Fix issues with Local

bug:9085638
Change-Id: I8d10373b4cd65b3f1338d88f1816ccb0b3a0166d
iltershow/FilterShowActivity.java
4eb1825cb6c305f1c4479f55fac9047a4001b8e4 22-May-2013 John Hoford <hoford@google.com> am 3d4fbf40: am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce

* commit '3d4fbf40115389ed33487db2059048163c9afd1a':
fix ellipse logic for portrait
3d4fbf40115389ed33487db2059048163c9afd1a 22-May-2013 John Hoford <hoford@google.com> am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce

* commit '4d25d129d1c9f92033382e12260d3f40521cf3fd':
fix ellipse logic for portrait
4d25d129d1c9f92033382e12260d3f40521cf3fd 22-May-2013 John Hoford <hoford@google.com> Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce
dc5c77d6e56171b7f879e9558e491f93b0def3a6 22-May-2013 Michael Kolb <kolby@google.com> am 02593125: am be4f113f: Fix editor on ICS

* commit '0259312504eddbae2f29a1d8a09892fb0e95d8c8':
Fix editor on ICS
0259312504eddbae2f29a1d8a09892fb0e95d8c8 22-May-2013 Michael Kolb <kolby@google.com> am be4f113f: Fix editor on ICS

* commit 'be4f113fa1fea32e8d8865a52491b9f25760eaba':
Fix editor on ICS
be4f113fa1fea32e8d8865a52491b9f25760eaba 22-May-2013 Michael Kolb <kolby@google.com> Fix editor on ICS

Bug: 9079902

Change-Id: I1159708b0a9db4a0369044cdf9f3620bca433e14
iltershow/category/CategoryAdapter.java
52fab9f1595cfcabe85d81325bdb9b486bc8c306 22-May-2013 John Hoford <hoford@google.com> fix ellipse logic for portrait

bug:9054114
Change-Id: I4bdc7301a60e74bf663fda031c0f2c76ee34b7ec
iltershow/imageshow/EclipseControl.java
28d3467e5dbad9e21e7a7695a15faedea5e9c8ef 22-May-2013 Michael Kolb <kolby@google.com> am 7da344a4: am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce

* commit '7da344a46f348a5bc9ac958ccf7186b4f7d1c899':
Fix selection highlight for tablets
7da344a46f348a5bc9ac958ccf7186b4f7d1c899 22-May-2013 Michael Kolb <kolby@google.com> am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce

* commit '37be6658075cac2bad0e30d93705dddeaaf1e421':
Fix selection highlight for tablets
37be6658075cac2bad0e30d93705dddeaaf1e421 22-May-2013 Michael Kolb <kolby@google.com> Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce
a4a09f9c0d73876a92c4fddbbd5086fa21899af2 22-May-2013 John Reck <jreck@google.com> am 550eefae: am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce

* commit '550eefae642049dea0023168643b54d1c7a73b8e':
Fix height
550eefae642049dea0023168643b54d1c7a73b8e 22-May-2013 John Reck <jreck@google.com> am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce

* commit '01ae91aa0e347c5a8b335afc8cb0f02459ee5adc':
Fix height
5df43365995e2929d831302a76f08f2cd50d698d 20-May-2013 John Reck <jreck@google.com> Fix height

Change-Id: I133063acdad4a1afe8e0a9105591dd90354913f0
iltershow/category/CategoryAdapter.java
2fa659f93347df6a78392679092bf9af42a64635 22-May-2013 Michael Kolb <kolby@google.com> Fix selection highlight for tablets

Bug: 9044356

Fixes selection highlight for the new asset sizes.

Change-Id: Ibf21a1f90d6cd1faf62a221d71d55928dc7a3b4a
iltershow/category/CategoryView.java
iltershow/ui/SelectionRenderer.java
ef2d4a1d0fd6b2676c5b650dfbdba07b99528328 21-May-2013 Doris Liu <tianliu@google.com> am bfce0515: am aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce

* commit 'bfce0515165aa381b730b4dd772132c41dea4e28':
Fix camera controls blink on startup
bfce0515165aa381b730b4dd772132c41dea4e28 21-May-2013 Doris Liu <tianliu@google.com> am aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce

* commit 'aa77f39a3a18ee7945177189c358ef6208e6da2b':
Fix camera controls blink on startup
1c23cad3a2ecdd663ed0176c9572d626931397ea 21-May-2013 Doris Liu <tianliu@google.com> am aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce

* commit 'aa77f39a3a18ee7945177189c358ef6208e6da2b':
Fix camera controls blink on startup
aa77f39a3a18ee7945177189c358ef6208e6da2b 21-May-2013 Doris Liu <tianliu@google.com> Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce
a8d103b48174c9313aed9e4db026c1c19d7dd56c 21-May-2013 John Hoford <hoford@google.com> am c6038e29: am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce

* commit 'c6038e29aea5012a8c342d1a4c72aa26a9895519':
fix TinyPlanets Filter landscape crash
c6038e29aea5012a8c342d1a4c72aa26a9895519 21-May-2013 John Hoford <hoford@google.com> am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce

* commit 'a285bc130ff1175c60085410f317e90f6443c39b':
fix TinyPlanets Filter landscape crash
789a06e68d222d97393e9c7ab19e2d77804e1e4b 21-May-2013 John Hoford <hoford@google.com> am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce

* commit 'a285bc130ff1175c60085410f317e90f6443c39b':
fix TinyPlanets Filter landscape crash
f57e5885f74f586760daa9eeb0808c53ac4b2c9d 21-May-2013 John Hoford <hoford@google.com> fix TinyPlanets Filter landscape crash

bug:9038163
Change-Id: Ice1e01dfa0e9ac72e5019fac900e76bd38955e05
iltershow/FilterShowActivity.java
58ed4d197795147f9f4a202da00b411a6ed53bd2 21-May-2013 Doris Liu <tianliu@google.com> Fix camera controls blink on startup

Bug: 9052837
Change-Id: Ie15b812c6e6e7879d29d96a345173a2130b2fe91
i/PhotoView.java
e28b45f0372195330237d8f30607b19b9b817c05 20-May-2013 Ruben Brunk <rubenbrunk@google.com> am 96c48dee: am 286afab1: Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce

* commit '96c48dee541fae960c23234a71d0f287e0e13489':
Avoid using region decoder for bad image types when setting wallpaper.
96c48dee541fae960c23234a71d0f287e0e13489 20-May-2013 Ruben Brunk <rubenbrunk@google.com> 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.
428c8c09e44d7838ed92e118a50b65ebbddcc248 20-May-2013 Ruben Brunk <rubenbrunk@google.com> 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.
286afab10fb4c528ea503981c4f1bdbcfbdbde77 20-May-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce
4925d79902524b506c04aa769c6aa3788a7be2d0 20-May-2013 Sascha Haeberling <haeberling@google.com> am f2697daa: am 7af7156a: Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce

* commit 'f2697daa3a5f114216488022ca513cb7811075b9':
Make sure canceling a filter does not undo previous filter.
f2697daa3a5f114216488022ca513cb7811075b9 20-May-2013 Sascha Haeberling <haeberling@google.com> 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.
d979c1a20a3c552bf2a7e792e9c37a2c01fca6e1 20-May-2013 Sascha Haeberling <haeberling@google.com> 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.
7af7156a809934951877b1f9b9ad1ceeb9c9a5ce 20-May-2013 Sascha Haeberling <haeberling@google.com> Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce
f6be3f0d8968383cfa7e76ef2d480fdfadcc9b7f 20-May-2013 Ruben Brunk <rubenbrunk@google.com> Avoid using region decoder for bad image types when setting wallpaper.

Bug: 8893617
Change-Id: I9830ea0d76acff8a524186cf505963c48d9f1fbe
iltershow/crop/CropActivity.java
112c7fee94a3f31f85fa44ada54274652f1f2596 20-May-2013 John Hoford <hoford@google.com> am 22fcfeb2: am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce

* commit '22fcfeb20d601ca73dcfa374a46d3b370bef1929':
Disable zoom
dd0e6379c6cf604e58449fd55774a495a9e88e75 20-May-2013 John Hoford <hoford@google.com> am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce

* commit '26e3c48b831e39ced1db18673f12fb3c7a2d56d8':
Disable zoom
22fcfeb20d601ca73dcfa374a46d3b370bef1929 20-May-2013 John Hoford <hoford@google.com> am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce

* commit '26e3c48b831e39ced1db18673f12fb3c7a2d56d8':
Disable zoom
26e3c48b831e39ced1db18673f12fb3c7a2d56d8 20-May-2013 John Hoford <hoford@google.com> Merge "Disable zoom" into gb-ub-photos-bryce
111e70bc1b962151a3cb5aef83914aad07185022 17-May-2013 John Hoford <hoford@google.com> Disable zoom

Bug: 8791729


Change-Id: I2ee9d9e644842ce0a7014a1665e6bd1d001e4f06
iltershow/imageshow/MasterImage.java
34243e8ff2784c9d2ee9b72cf6c4ec54b7f65a42 18-May-2013 Michael Kolb <kolby@google.com> am cf4b66a9: am 1a266f16: Highlight selected option in FX and Borders

* commit 'cf4b66a9a4d794d93c75798fab81fad006897167':
Highlight selected option in FX and Borders
03263543ebd79dd27fa5928ce58abd86abe5ae5c 18-May-2013 Michael Kolb <kolby@google.com> am 1a266f16: Highlight selected option in FX and Borders

* commit '1a266f16edbef7cb0a770d37fcad958fc55a5862':
Highlight selected option in FX and Borders
cf4b66a9a4d794d93c75798fab81fad006897167 18-May-2013 Michael Kolb <kolby@google.com> am 1a266f16: Highlight selected option in FX and Borders

* commit '1a266f16edbef7cb0a770d37fcad958fc55a5862':
Highlight selected option in FX and Borders
1a266f16edbef7cb0a770d37fcad958fc55a5862 17-May-2013 Michael Kolb <kolby@google.com> Highlight selected option in FX and Borders

Bug: 8791729

Change-Id: I8ac2c3deabe7b293df48db9f44f52956443a92a4
iltershow/category/CategoryAdapter.java
iltershow/category/CategoryPanel.java
iltershow/category/CategoryView.java
iltershow/category/MainPanel.java
iltershow/ui/FilterIconButton.java
iltershow/ui/SelectionRenderer.java
72b6bd030c21553f32073790ac8276111ac4e684 17-May-2013 John Reck <jreck@google.com> am 8d07b582: am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce

* commit '8d07b582341df0262eda91da7fbed5938bdd2337':
Switch back to old crop
8d07b582341df0262eda91da7fbed5938bdd2337 17-May-2013 John Reck <jreck@google.com> am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce

* commit '3b7347daf572c20996607afe4cc32f9a96f8fe5d':
Switch back to old crop
2f1b2d1932c1492961cbaec8716b769cfc2b0ee0 17-May-2013 John Reck <jreck@google.com> am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce

* commit '3b7347daf572c20996607afe4cc32f9a96f8fe5d':
Switch back to old crop
1bfe7cb96a5a042f238d048eda771169d6ad93ac 17-May-2013 John Reck <jreck@google.com> Switch back to old crop

Bug: 8950255

Change-Id: I3f78901e65a17a1d5867d3f76a6031cff5f65fed
i/MenuExecutor.java
4242391413fe3b5e12502794cefc7caf689e3044 16-May-2013 John Reck <jreck@google.com> am 5c95e49f: am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce

* commit '5c95e49faad25acca47639ed97ada8b50567793e':
toUpper() some strings
2c596d7f5988c942774fb9f8044162b4149f9ab2 16-May-2013 John Reck <jreck@google.com> am 80835b0a: am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce

* commit '80835b0aa14ad477adf3f23b69b2bf7c83fe0c20':
Fix reset
5c95e49faad25acca47639ed97ada8b50567793e 16-May-2013 John Reck <jreck@google.com> am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce

* commit '75084da1b34e0ff9f269b5409d206c213532edbc':
toUpper() some strings
4b1faeb1c04e7d1096b821c8cd0397695ac209fd 16-May-2013 John Reck <jreck@google.com> am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce

* commit '75084da1b34e0ff9f269b5409d206c213532edbc':
toUpper() some strings
75084da1b34e0ff9f269b5409d206c213532edbc 16-May-2013 John Reck <jreck@google.com> Merge "toUpper() some strings" into gb-ub-photos-bryce
80835b0aa14ad477adf3f23b69b2bf7c83fe0c20 16-May-2013 John Reck <jreck@google.com> am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce

* commit '5a9716fe6de7af4585a24dd1d749b38a4ab48195':
Fix reset
acdef4fa8d98a06b266c37c4fb57e812a0eeab6a 16-May-2013 John Reck <jreck@google.com> am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce

* commit '5a9716fe6de7af4585a24dd1d749b38a4ab48195':
Fix reset
7638772c0ceb5528b12c9943bad5391658d6c78d 16-May-2013 John Reck <jreck@google.com> toUpper() some strings

Bug: 8791729

Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb
iltershow/editors/Editor.java
iltershow/editors/SwapButton.java
iltershow/ui/ImageCurves.java
be9c8105b431de765f5811bfd170c899d1c8d3b3 15-May-2013 John Reck <jreck@google.com> Fix reset

Bug: 8791729

Change-Id: Id39ef76f013a38bae3d92f45b02de7cd184edfec
iltershow/FilterShowActivity.java
04d952217a2dd51b86ddecbe4dc56f98329d78a2 15-May-2013 Michael Kolb <kolby@google.com> am f8d78d2f: am c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce

* commit 'f8d78d2fda5b706e5932f8d428f6316f4e68a32a':
Grey out undo/redo/reset according to state
76582a062e3c9333f55c5d43c5900637feeb0492 15-May-2013 ztenghui <ztenghui@google.com> am 0e0644ad: am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce

* commit '0e0644ad8538253bfb0e07bdafaa2dacba6c6a56':
Fix another annoying warning log spam
f8d78d2fda5b706e5932f8d428f6316f4e68a32a 15-May-2013 Michael Kolb <kolby@google.com> 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
93888625605a1795f0f0886ef8825496ec0aed27 15-May-2013 Michael Kolb <kolby@google.com> 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
c2f813a36711742af3b23743ef1849cec13a9a95 15-May-2013 Michael Kolb <kolby@google.com> Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce
0e0644ad8538253bfb0e07bdafaa2dacba6c6a56 15-May-2013 ztenghui <ztenghui@google.com> am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce

* commit '4aa8d5fc9d3478d511786cb99d5ba704d3e1f426':
Fix another annoying warning log spam
9dc98452a58bf2edeab9c1fd0dfaed3e114419c4 15-May-2013 ztenghui <ztenghui@google.com> am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce

* commit '4aa8d5fc9d3478d511786cb99d5ba704d3e1f426':
Fix another annoying warning log spam
d41597fda5f25c4915cde35566f357903c56c37e 15-May-2013 Marco Nelissen <marcone@google.com> am 6e59979d: Merge "Enable virtualization" into jb-mr2-dev

* commit '6e59979de90664d5e93d25a4bf2e165de2e20ac2':
Enable virtualization
dff7d0ec9cb635ef7381e518d32de5b7457dd655 15-May-2013 Michael Kolb <kolby@google.com> Grey out undo/redo/reset according to state

Bug: 8791729

Change-Id: I1252a9634870e56c8989688eeb28b1b4c2781827
iltershow/HistoryAdapter.java
753926be2acd7bf173999635f638ea1607ae98f0 14-May-2013 Ruben Brunk <rubenbrunk@google.com> Fix FP rounding error for crop bounds.

Bug: 8874599
Change-Id: I94198e4dcdbb0afa1dd788130645855b33e8f30b
iltershow/crop/CropMath.java
af6b0d2c08afd7803a92856c7c39b5e6144addfa 13-May-2013 Marco Nelissen <marcone@google.com> Enable virtualization

When the Intent says to virtualize, and the right virtualizer is
present on the device, enable virtualization.
b/8767565

Change-Id: I8a98404b21c434966b7ae2dc341eb38f2a47eef2
pp/MoviePlayer.java
5e21003398e687fb66880878858c1a6df1e9eef6 11-May-2013 ztenghui <ztenghui@google.com> 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
iltershow/ui/FilterIconButton.java
4433a05abfc33e99223d89fcc28b924cdd754104 10-May-2013 Ruben Brunk <rubenbrunk@google.com> Revert "Reinitialize all the filters after Crop is applied."

This reverts commit 1cfbaca7bef29b7d510c5e1de424e68cd8804022.
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FiltersManagerInterface.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterRS.java
1cfbaca7bef29b7d510c5e1de424e68cd8804022 10-May-2013 Victor Doba <dobavictor@google.com> Reinitialize all the filters after Crop is applied.

Change-Id: I192918a3f28eac400e2e35f3b410dc8adc1a8ad4
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FiltersManagerInterface.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterRS.java
8cbdeb310a769b02c61f2ec0a231821bc6ee5fa2 10-May-2013 George Mount <mount@google.com> am 09e1a5ac: am ac94740c: Remove GL dependency on unused stencil buffers.

* commit '09e1a5ac2cdd9bccd543df91859152a0aa3c3879':
Remove GL dependency on unused stencil buffers.
5de39656f1b9e906c373c7b244bf11fcdfc86936 10-May-2013 George Mount <mount@google.com> am ac94740c: Remove GL dependency on unused stencil buffers.

* commit 'ac94740cd673a016542d803c8600633c99b7427e':
Remove GL dependency on unused stencil buffers.
ac94740cd673a016542d803c8600633c99b7427e 09-May-2013 George Mount <mount@google.com> Remove GL dependency on unused stencil buffers.

Bug 8884435

Change-Id: I8e7f0563a4a901953e3e2b14e35457b4fefe2e34
lrenderer/GLCanvas.java
lrenderer/GLES11Canvas.java
lrenderer/GLES20Canvas.java
i/GLRootView.java
i/GalleryEGLConfigChooser.java
940509361fb83e3d9b3c3910bf3123c277d10a15 09-May-2013 ztenghui <ztenghui@google.com> resolved conflicts for merge of 9a4fb2dc to gb-ub-photos-carlsbad

Change-Id: I90ffd8732cf34bb3dea7a849fc37fb1f3d82df39
d49fd01c2547c4630c1d3665e70523698ea7f48b 09-May-2013 ztenghui <ztenghui@google.com> am f4733e6f: am 9a4fb2dc: Merge "Fix the verbose log" into gb-ub-photos-bryce

* commit 'f4733e6f0f8c7012a448f375627478bfb9e53c96':
Fix the verbose log
9a4fb2dc95722c45e2acb4f4fe380d27830f8d8b 09-May-2013 ztenghui <ztenghui@google.com> Merge "Fix the verbose log" into gb-ub-photos-bryce
a60a303c3c5de42cc6d0d2765008c4728bb9aab7 09-May-2013 Sascha Haeberling <haeberling@google.com> Make sure canceling a filter does not undo previous filter.

Bug: 8770921

Change-Id: I2b8e5fac980f562eaf97b231ad15612004608164
iltershow/HistoryAdapter.java
502244165ab673f3d0b1d0c0288de4b010c5c5c9 08-May-2013 ztenghui <ztenghui@google.com> Fix the verbose log

Now use adb shell log.tag.BasicRepresentation VERBOSE to turn on the logging.

bug:8771541

Change-Id: Ib9e1e44dbbd4e46798226d8ab5dc7365e8a90e27
iltershow/filters/FilterBasicRepresentation.java
d829a6c52cdcf87001e8d4189a1eb80905083abc 09-May-2013 Sascha Haeberling <haeberling@google.com> am b51819ba: am 58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce

* commit 'b51819ba4e1690aa43ba112be707220414e44f3b':
Reduce max size of bitmap returned by crop dialog.
a04b6c02b2a5f46b2d8ae15ed1bf772cd8c69c81 09-May-2013 Sascha Haeberling <haeberling@google.com> 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.
e39fa23e113587219f5647656b8abe041fb7de31 08-May-2013 Sascha Haeberling <haeberling@google.com> Reduce max size of bitmap returned by crop dialog.

Bug: 8851336

Change-Id: Id69c46c44b22ce753900c52e34944428a38d02c6
iltershow/crop/CropActivity.java
bc2cab3df0341e112c9a9363b7e327cff56a1622 08-May-2013 Sascha Haeberling <haeberling@google.com> am a8e0de46: am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce

* commit 'a8e0de46eea85c30f4817f2c2517d061d12ba994':
Avoid rounding errors from cropping uncropped images.
5f6dd41f496af53f66682292ad2e17728551b925 08-May-2013 Sascha Haeberling <haeberling@google.com> am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce

* commit '6febbfc6c9c2d645f22fb200574fe14fa1201046':
Avoid rounding errors from cropping uncropped images.
a01423869bd4dbef3054e232592494aab43edc18 07-May-2013 Sascha Haeberling <haeberling@google.com> Avoid rounding errors from cropping uncropped images.

Bug: 8736111

Also don't treat "none" as a non-modifying filter.

Change-Id: I6478c557dbb68d7eecabb29f062285b83de05cda
iltershow/imageshow/GeometryMetadata.java
iltershow/presets/ImagePreset.java
614d365088a1959ad44831fa9b1065ecbd4eefb8 06-May-2013 Elliott Hughes <enh@google.com> resolved conflicts for merge of f959df75 to jb-mr2-dev-plus-aosp

Change-Id: Ic56346cb59b2817482c3c33a2bcd1d552dd432da
816b3361beacca39a22c2d59a57e982cc66d8229 06-May-2013 Elliott Hughes <enh@google.com> Someone's IDE chose the wrong Date.

Part 2 of the mystery of the java.sql.Date in preloaded-classes solved.

Change-Id: If819d89d1cb7ac015adee7a39a6fda963c6a1022
pp/TrimVideo.java
iltershow/tools/SaveCopyTask.java
fddad7fc5db79c8d1946dbba77ae97638bc7df55 02-May-2013 nicolasroard <nicolasroard@google.com> am f469a168: Fix flashing (remove clipping)

* commit 'f469a1689a9563f3c5bb68f46a5d9cd152d67053':
Fix flashing (remove clipping)
f469a1689a9563f3c5bb68f46a5d9cd152d67053 02-May-2013 nicolasroard <nicolasroard@google.com> Fix flashing (remove clipping)

bug:8747333

Change-Id: Ie1e7f1a58bf195b1f427b75ee9a1390e29b3ba2a
iltershow/imageshow/ImageShow.java
76d0960463317b0ae10d5b25c66eca1d071dafe9 02-May-2013 nicolasroard <nicolasroard@google.com> am 00259461: Fix UI

* commit '00259461be82e601b58d3e970afbf0c012c5f3e7':
Fix UI
00259461be82e601b58d3e970afbf0c012c5f3e7 01-May-2013 nicolasroard <nicolasroard@google.com> Fix UI

bug:8664728
Change-Id: I90b903e8935b2b6c0dbd6590cff36865644c49b4
iltershow/FilterShowActivity.java
iltershow/category/Action.java
iltershow/category/CategoryView.java
iltershow/editors/ParametricEditor.java
iltershow/filters/FilterRepresentation.java
iltershow/presets/ImagePreset.java
iltershow/state/State.java
iltershow/state/StateAdapter.java
iltershow/state/StatePanelTrack.java
iltershow/state/StateView.java
ff25e91ecc8e468e46455f765c573ac0b5ac4380 02-May-2013 Bobby Georgescu <georgescu@google.com> am 5a352be0: Increase selection limit

* commit '5a352be0df79b03c942eb67a799ddb3aaa1a26a2':
Increase selection limit
5a352be0df79b03c942eb67a799ddb3aaa1a26a2 02-May-2013 Bobby Georgescu <georgescu@google.com> Increase selection limit

Bug: 8606565
Bug: 8721237
Bug: 8752803
Change-Id: I578536389146fb4d8735c8171ec346ebe49de729
i/ActionModeHandler.java
d1b895c92ca4abe707e64c755ab9eabc1985b4c0 02-May-2013 Ruben Brunk <rubenbrunk@google.com> Merge "G+ activity xform stack and pipeline cleanup." into gb-ub-photos-carlsbad
17c23e642ed7eb5fe9aaa16b4250f8e06530b501 02-May-2013 John Hoford <hoford@google.com> fix crash due to no ImageFilterDraw

Change-Id: I0c8bfaa7d162f5c1a49f05d853f4700322fe5901
iltershow/filters/BaseFiltersManager.java
7f4827c7066293ae4c4371a096b4db42ab558f93 01-May-2013 John Hoford <hoford@google.com> resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbad

Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4
fc47c52f552ad8ed6adfc177e9ba90b1f4e93ca4 01-May-2013 Ruben Brunk <rubenbrunk@google.com> G+ activity xform stack and pipeline cleanup.

Change-Id: I3277dd4e709146ca2c06b56a1db200d3130dd5e3
iltershow/filters/ImageFilterRS.java
36e567afff815bc821c2859ebdeec86b1fca1ef6 26-Apr-2013 nicolasroard <nicolasroard@google.com> Modifications for simple edit

Change-Id: Ic200a4f1e843deb119d68f627d5b8adb201f0f7f
iltershow/cache/CachingPipeline.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/FiltersManagerInterface.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterDraw.java
iltershow/filters/ImageFilterRS.java
iltershow/filters/ImageFilterSharpen.java
iltershow/filters/ImageFilterTinyPlanet.java
iltershow/filters/ImageFilterVignette.java
iltershow/presets/FilterEnvironment.java
iltershow/presets/ImagePreset.java
iltershow/presets/PipelineInterface.java
33de212ec780eaf2bc8d86908f07da33ea8dd7f2 29-Apr-2013 John Hoford <hoford@google.com> small ui changes based on UX/PM feedback

bug:8664728
Change-Id: I4e0651c011b9a6c4742d86c898a0821187f43043
iltershow/FilterShowActivity.java
iltershow/controller/TitledSlider.java
iltershow/editors/BasicEditor.java
iltershow/editors/Editor.java
iltershow/editors/EditorStraighten.java
iltershow/editors/ParametricEditor.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterBasicRepresentation.java
iltershow/filters/FilterImageBorderRepresentation.java
iltershow/imageshow/EclipseControl.java
fc95e6d031da31dfa6a2e26221223f98a5e497e5 29-Apr-2013 Ruben Brunk <rubenbrunk@google.com> am 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryce

* commit '9e5b079934538f2c90d0ac995330fb006b738cc7':
Cleanup crop activity UI.
9e5b079934538f2c90d0ac995330fb006b738cc7 29-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Cleanup crop activity UI." into gb-ub-photos-bryce
31096b20d621d31360cde48d562e92c63f98b297 29-Apr-2013 Bobby Georgescu <georgescu@google.com> am 384971f7: Instrument importer for usage statistics

* commit '384971f7ce93c98249825d0498ad4bcbd4104895':
Instrument importer for usage statistics
384971f7ce93c98249825d0498ad4bcbd4104895 28-Apr-2013 Bobby Georgescu <georgescu@google.com> Instrument importer for usage statistics

Bug: 8744068
Change-Id: I416463ba15713d363ac0ce68109532b770fb02b3
ngest/ImportTask.java
ngest/IngestActivity.java
ngest/IngestService.java
250f3b9439d70c68fed9ce5bc01eafe50d2d2296 27-Apr-2013 Bobby Georgescu <georgescu@google.com> am 45377ce9: Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce

* commit '45377ce902eb0dce6fb6b1e58925654822e25a19':
Log name of borders and filters of saved images
45377ce902eb0dce6fb6b1e58925654822e25a19 27-Apr-2013 Bobby Georgescu <georgescu@google.com> Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce
b29ff19e2ebd00e502ecbaae2aee5d97168c37f7 27-Apr-2013 Bobby Georgescu <georgescu@google.com> am 568a8cf9: Dismiss MTP notification on device disconnect

* commit '568a8cf9ec253a635a36866efc0e3acebbba2a2e':
Dismiss MTP notification on device disconnect
1401b2fec43ebc349a3102153bb1b3597f358838 27-Apr-2013 Bobby Georgescu <georgescu@google.com> Log name of borders and filters of saved images

Bug: 8712946
Change-Id: Id7b32ceb00b131299c6d8630bca181141dc204fd
iltershow/presets/ImagePreset.java
568a8cf9ec253a635a36866efc0e3acebbba2a2e 27-Apr-2013 Bobby Georgescu <georgescu@google.com> Dismiss MTP notification on device disconnect

Bug: 8158516
Change-Id: I7d7fd78b5fb9dc199e9ecdd78440e0f8147fe58d
ngest/IngestService.java
c166f5c4c34478f1c192fbbfc4c7e1f993bd2ad1 26-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Cleanup crop activity UI.

Bug: 8734193
Bug: 8723843

Change-Id: I09f0e8fcb0d919c573ad9a6f7b9f060f667d1d0d
iltershow/crop/CropActivity.java
iltershow/crop/CropDrawingUtils.java
iltershow/crop/CropMath.java
iltershow/crop/CropView.java
5f391559cc6fa8976cf289cb9082659b2e7d6b11 26-Apr-2013 Bobby Georgescu <georgescu@google.com> am ec6d1d85: Merge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce

* commit 'ec6d1d852e7970da5c64dd9e37f58f741b713fa2':
Show notification to relaunch MTP importer
ec6d1d852e7970da5c64dd9e37f58f741b713fa2 26-Apr-2013 Bobby Georgescu <georgescu@google.com> Merge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce
dc31fc285fe7e77485dc5aa8cf0be72178aeb6ad 26-Apr-2013 Ruben Brunk <rubenbrunk@google.com> am d5060931: Merge "Remove UI param for straighten." into gb-ub-photos-bryce

* commit 'd50609310e425df36e340120c794f08691d55808':
Remove UI param for straighten.
13fec90b6a03e21a88cb8b8425e65289904d4186 26-Apr-2013 Bobby Georgescu <georgescu@google.com> Show notification to relaunch MTP importer

Bug: 8158516
Change-Id: I98a57f9ac6e6935595b44e1277ddffa378065068
ngest/IngestService.java
d50609310e425df36e340120c794f08691d55808 26-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Remove UI param for straighten." into gb-ub-photos-bryce
fee08c6af18f5fb6f6ced9b668051132a49b6363 25-Apr-2013 Ruben Brunk <rubenbrunk@google.com> am 69f5d8cb: Fixes EDIT intents.

* commit '69f5d8cbf51422454257a00d7959b2e8d50cb0ca':
Fixes EDIT intents.
69f5d8cbf51422454257a00d7959b2e8d50cb0ca 25-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Fixes EDIT intents.

Bug: 8712238

Change-Id: I63bb07dc304b2745a29e3bf7510e8b38ccb59c48
iltershow/FilterShowActivity.java
iltershow/cache/CachingPipeline.java
iltershow/imageshow/MasterImage.java
c7b38f384ce7d4dd8cc472c802d691e490c8e162 25-Apr-2013 nicolasroard <nicolasroard@google.com> resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbad

Change-Id: Ide133370403bbcc6a509aa9f064ee8da38abac25
f5eedf1635eba7edfa7d41fd4e991cced978c4b2 20-Apr-2013 nicolasroard <nicolasroard@google.com> UI changes

bug:8664728

Change-Id: I133328543af534c745526d0d58aa7a61f5748a9d
iltershow/EditorPlaceHolder.java
iltershow/FilterShowActivity.java
iltershow/ImageStateAdapter.java
iltershow/MovableLinearLayout.java
iltershow/PanelController.java
iltershow/category/Action.java
iltershow/category/CategoryAdapter.java
iltershow/category/CategoryPanel.java
iltershow/category/CategoryTrack.java
iltershow/category/CategoryView.java
iltershow/category/MainPanel.java
iltershow/editors/BasicEditor.java
iltershow/editors/Editor.java
iltershow/editors/EditorPanel.java
iltershow/editors/ParametricEditor.java
iltershow/filters/ImageFilterVignette.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageStraighten.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
iltershow/state/StateAdapter.java
iltershow/state/StatePanel.java
iltershow/state/StatePanelTrack.java
iltershow/state/StateView.java
iltershow/ui/FilterIconButton.java
iltershow/ui/ImageCurves.java
9e5656be77bc3d06e414915a99c5346873ddab80 25-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Remove UI param for straighten.

Bug: 8322933
Change-Id: I718fc15fb551572ab2452097ac850fd395e59302
iltershow/editors/EditorStraighten.java
8e4aa80c85ea3e9393edd965c845ed1dd6527438 24-Apr-2013 John Hoford <hoford@google.com> am cc7bcd07: Merge "Fix Curves" into gb-ub-photos-bryce

* commit 'cc7bcd0721735723c683b2f27267a52a76ff4244':
Fix Curves
cc7bcd0721735723c683b2f27267a52a76ff4244 24-Apr-2013 John Hoford <hoford@google.com> Merge "Fix Curves" into gb-ub-photos-bryce
18aba9991a51ad8e980cd4cee3c430cd29f30440 24-Apr-2013 Mangesh Ghiware <mghiware@google.com> am ef95774e: Merge "Fix for blank Gallery widgets on a DB upgrade" into gb-ub-photos-bryce

* commit 'ef95774e2463a3d3537d1ddd9b0dfca21c6d56df':
Fix for blank Gallery widgets on a DB upgrade
ef95774e2463a3d3537d1ddd9b0dfca21c6d56df 24-Apr-2013 Mangesh Ghiware <mghiware@google.com> Merge "Fix for blank Gallery widgets on a DB upgrade" into gb-ub-photos-bryce
d009e38321c3e46966370623f950215534d96925 24-Apr-2013 John Hoford <hoford@google.com> Fix Curves

bug:8710572
Change-Id: I49a8ea124be59de6d246ae0f9fb16f04fe447af7
iltershow/filters/FilterCurvesRepresentation.java
iltershow/ui/ImageCurves.java
iltershow/ui/Spline.java
ba0c994c63b5dd8b8c36efa6b7c0a7cb4537d0ee 24-Apr-2013 Mangesh Ghiware <mghiware@google.com> Fix for blank Gallery widgets on a DB upgrade

Bug: 8660303
Change-Id: I06910ab0811d5f71ba6849d53ddc03c008fc77ad
adget/MediaSetSource.java
adget/WidgetService.java
5429cc4e8b8448f35320020d2b2d73d22f6ed136 24-Apr-2013 John Hoford <hoford@google.com> am dc464a12: Merge "Fix local adjust" into gb-ub-photos-bryce

* commit 'dc464a129bad2a2918531fc8a4415c41b60605e6':
Fix local adjust
7112720bc6100049d24845cfbf3de69cdbd4fdeb 20-Apr-2013 John Hoford <hoford@google.com> Fix local adjust

bug:8655977
Change-Id: I0aa4ac30de077663f52418528757a842372e0fc2
iltershow/controller/ActionSlider.java
iltershow/controller/BasicParameterStyle.java
iltershow/controller/ParameterActionAndInt.java
iltershow/editors/Editor.java
iltershow/editors/ParametricEditor.java
9cabc58d1dce93aef401ebe0b8a8b86ab3e507cb 24-Apr-2013 John Hoford <hoford@google.com> am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce

* commit '0c71308c9d2a72d4a3faf00242707de773d5beba':
interruptible renderer
0c71308c9d2a72d4a3faf00242707de773d5beba 24-Apr-2013 John Hoford <hoford@google.com> Merge "interruptible renderer" into gb-ub-photos-bryce
3564326e076d7291ef0c2bdd1d6a82f1894b193c 24-Apr-2013 Angus Kong <shkong@google.com> am 7d62e546: Use FULL_SENSOR for unlocked orientation.

* commit '7d62e546b3b9eedc1f5c9d8f3ee644025f554fe3':
Use FULL_SENSOR for unlocked orientation.
7d62e546b3b9eedc1f5c9d8f3ee644025f554fe3 24-Apr-2013 Angus Kong <shkong@google.com> Use FULL_SENSOR for unlocked orientation.

bug:8689453
Change-Id: Ia81d970772f091fbd9bec142acfd5e9f84e0a0fb
pp/OrientationManager.java
17218987cfa32cff5dc719cfb88d0e3ce3677f00 24-Apr-2013 John Hoford <hoford@google.com> interruptible renderer

bug:8632908
Change-Id: I4df59fb0c82370491d953292fd1cd17443054ab3
iltershow/cache/CachingPipeline.java
iltershow/cache/FilteringPipeline.java
iltershow/presets/FilterEnvironment.java
iltershow/presets/ImagePreset.java
e751c45d3da204ae566c0adbc59c07136d7eef3d 23-Apr-2013 Ruben Brunk <rubenbrunk@google.com> am 8600c562: Fix to check if crop activity got bad bitmap.

* commit '8600c562b8ed0f636bc966a8aac83dc90326f0fb':
Fix to check if crop activity got bad bitmap.
8600c562b8ed0f636bc966a8aac83dc90326f0fb 23-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Fix to check if crop activity got bad bitmap.

Bug: 8692297
Change-Id: I1900c45c71b3d1c6203e4d25a7ad5354f409fcf2
iltershow/crop/CropActivity.java
7f9fee89af36100fd02661bb29a1012332d1a14c 23-Apr-2013 Sascha Haeberling <haeberling@google.com> am d313bb0a: Merge "Make sure we don\'t add the pano sharing menu in the secure lock screen." into gb-ub-photos-bryce

* commit 'd313bb0acf2bc8b1114180fa9a7f50d6393168a2':
Make sure we don't add the pano sharing menu in the secure lock screen.
d313bb0acf2bc8b1114180fa9a7f50d6393168a2 23-Apr-2013 Sascha Haeberling <haeberling@google.com> Merge "Make sure we don't add the pano sharing menu in the secure lock screen." into gb-ub-photos-bryce
35c046ca83176b50cd08acbace9ed29d42bac654 23-Apr-2013 Ruben Brunk <rubenbrunk@google.com> am 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce

* commit '98698ea0dd09f0cdc4ecdc92ae4718ea60164fd2':
Fix wallpaper crop UI.
8e5828374ffd5d96e7d1efeb36db1b940972b818 23-Apr-2013 Sascha Haeberling <haeberling@google.com> Make sure we don't add the pano sharing menu in the secure lock screen.

Bug: 8473022

Change-Id: Ie2221b6a660b7c9dc39cef89a509da4b2659adb3
pp/PhotoPage.java
e02dc6458f039b536d74cb7cca827a04af6c9500 23-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Fix wallpaper crop UI.

Bug: 8687759
Change-Id: Ice32fdabdae585fc39e78ce1f3e7e1796c5d99b3
iltershow/crop/CropActivity.java
iltershow/crop/CropDrawingUtils.java
iltershow/crop/CropView.java
90d390e68005214665c88e92c83b7901199ab774 22-Apr-2013 Ruben Brunk <rubenbrunk@google.com> am 9c48a6c3: Fixes build. Removes dead code.

* commit '9c48a6c30b2d663d382a8a4bc1c61ea75dfe46a1':
Fixes build. Removes dead code.
b8af4a677525d31736c28d758cfdb016a71e5c18 22-Apr-2013 Ruben Brunk <rubenbrunk@google.com> am 1365eec6: Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce

* commit '1365eec634694796c1e3432abff54dd658bd4641':
Fix orientation changes for wallpaper setter.
7f756df8102644d1722251c429c9ae40634c5171 22-Apr-2013 Ruben Brunk <rubenbrunk@google.com> am 4a6dc2b1: Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce

* commit '4a6dc2b147af34ab4545f6f647b4038c64fc80d0':
Reenables crop aspect ratio menu.
e3049d4c69e2876a2998356e787993bf38591c88 22-Apr-2013 Bobby Georgescu <georgescu@google.com> am ca6f04e2: Remove dead code

* commit 'ca6f04e27bbcab953bd3f9dcf50476a1c4b70aac':
Remove dead code
eca6d7d4aef05b90471ec9a5144915647d77914d 22-Apr-2013 Ruben Brunk <rubenbrunk@google.com> am f53eea80: Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce

* commit 'f53eea80c773a1686631f9e2ec6edab23c8944b5':
Ensure consistent image thumbnail handling.
b6754c1cea1c1b7974b9eedc0b0357dd9fccb9d5 22-Apr-2013 John Hoford <hoford@google.com> am 91d26f6c: tiny planet fix

* commit '91d26f6c3b183862eeffc1856e2d758e800d13f4':
tiny planet fix
909cf84020e30ba901b5fd35d26d5d29fcbc5a85 22-Apr-2013 Bobby Georgescu <georgescu@google.com> am faf2f040: Fix multi selection issue

* commit 'faf2f040f38532213fa237cf45c9794cf1a85859':
Fix multi selection issue
9c0d72d36fa20fc9d2a21a87d37501589a7ffde4 22-Apr-2013 Michael Kolb <kolby@google.com> am 32049103: Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce

* commit '32049103305c99e8be1f7af3e46933277e02a7c3':
Lock camera orientation using FW API
fd3cf498227972e3b1f6e4e105bec92e5f430ac4 22-Apr-2013 Ruben Brunk <rubenbrunk@google.com> am 316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce

* commit '316af8dd675d777f4bd9512b8af5391c7c89363f':
Fix crop activity aspect ratio and orientation handling.
63f82ea45bf9f39818a21096cf178eab9aebfa71 22-Apr-2013 repo sync <hoford@google.com> resolved conflicts for merge of a1939d22 to gb-ub-photos-carlsbad

Change-Id: Ic6759448c932823720021e85e1232736ff2085f8
9c48a6c30b2d663d382a8a4bc1c61ea75dfe46a1 22-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Fixes build. Removes dead code.

Change-Id: Ieef56407304254235295d81e09e55f1cd69b87cb
iltershow/imageshow/ImageCrop.java
1365eec634694796c1e3432abff54dd658bd4641 22-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce
4a6dc2b147af34ab4545f6f647b4038c64fc80d0 22-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce
87151ce304c45d67e1e578816edb864b95d09edf 22-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Fix orientation changes for wallpaper setter.

Bug: 8670036
Change-Id: I44932bcc8cd8b89686186e42fa1eb2644af87b47
iltershow/crop/CropActivity.java
b08acdc5bf6b6fd937636434fa28849ef0a8c040 20-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Reenables crop aspect ratio menu.

Bug: 8471812

Change-Id: I50044f4c787ba326e24f67c5370e1f8a220eb005
iltershow/editors/EditorCrop.java
iltershow/imageshow/ImageCrop.java
ca6f04e27bbcab953bd3f9dcf50476a1c4b70aac 20-Apr-2013 Bobby Georgescu <georgescu@google.com> Remove dead code

Bug: 8672542
Change-Id: Ia6046b17f8ae77ffe6b8090b5fbd1dda2bc0327e
pp/AbstractGalleryActivity.java
aee6dffcadf2a5387fde1c9c123698f602d9bb18 20-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Ensure consistent image thumbnail handling.

Bug: 7192433

Change-Id: Ie86ade06b7234681a0d955a87cacfb337bc39145
iltershow/tools/SaveCopyTask.java
91d26f6c3b183862eeffc1856e2d758e800d13f4 19-Apr-2013 John Hoford <hoford@google.com> tiny planet fix

bug:8323524
Change-Id: I39283face7079574dbe25e797323a84141930f9a
iltershow/EditorPlaceHolder.java
iltershow/FilterShowActivity.java
iltershow/cache/CachingPipeline.java
iltershow/cache/TripleBufferBitmap.java
iltershow/editors/Editor.java
iltershow/editors/EditorTinyPlanet.java
iltershow/editors/ParametricEditor.java
iltershow/filters/FilterTinyPlanetRepresentation.java
iltershow/filters/ImageFilterTinyPlanet.java
iltershow/imageshow/ImageTinyPlanet.java
iltershow/presets/FilterEnvironment.java
faf2f040f38532213fa237cf45c9794cf1a85859 19-Apr-2013 Bobby Georgescu <georgescu@google.com> Fix multi selection issue

Bug: 8663155
Change-Id: Ic6aa98c04b5134df9deb1b14736e614bf1618f03
i/SelectionManager.java
e2a466d12d0d68f28606cbd5b8c3294014025671 19-Apr-2013 ztenghui <ztenghui@google.com> Merge "Update the duration information when saving new video" into gb-ub-photos-carlsbad
32049103305c99e8be1f7af3e46933277e02a7c3 19-Apr-2013 Michael Kolb <kolby@google.com> Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce
316af8dd675d777f4bd9512b8af5391c7c89363f 19-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce
a1939d22f631ddcb7e942cc0ad2ffa7ef78b763f 19-Apr-2013 John Hoford <hoford@google.com> Merge "fixed borders issues" into gb-ub-photos-bryce
88cd551c2f42061ca7482b884c0c5bb686ec7eb2 19-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Fix crop activity aspect ratio and orientation handling.

Bug: 8659064
Bug: 8647628
Change-Id: I3e4293cc3bba7d55334acb396e20a23cc92f8f82
iltershow/crop/CropActivity.java
iltershow/crop/CropLoader.java
iltershow/crop/CropObject.java
iltershow/crop/CropView.java
91d28ba0b11060cf36c6b4750e53b887a5d1a193 19-Apr-2013 ztenghui <ztenghui@google.com> Update the duration information when saving new video

Change-Id: I9c3fd33dba7f04d9d905429c6bb17cf9a10b7628
til/SaveVideoFileUtils.java
0a5d37c880553d439a0d761414e929a1f7b3cf02 19-Apr-2013 Flavio Lerda <flerda@google.com> am ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce

* commit 'ed2f17903bbbca08ac98af4aa6c1dd9d22504a1d':
Remove unused imports.
11f2b39b9a44f7f26177fbeecf7c07b9dc4edc86 18-Apr-2013 Flavio Lerda <flerda@google.com> Remove unused imports.

This is follow-up on the previous fix for b/8433834, addressing reviewer
comments.

Bug: 8433834
Change-Id: I06f466704175a62d8febc5be471a2ca1f50e898d
pp/PhotoPage.java
4c792cc7b44be1ea0a2cfc2e7259828b81b0e4a4 18-Apr-2013 John Hoford <hoford@google.com> fixed borders issues

bug:8315216
Change-Id: I04d62984c70e7e514b8625e6a4b5ed9395137471
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/cache/FilteringPipeline.java
iltershow/editors/ImageOnlyEditor.java
iltershow/filters/BaseFiltersManager.java
1251b7cdd52f5fe42b99f8419326c8d43612bbff 18-Apr-2013 Ruben Brunk <rubenbrunk@google.com> am c3178ca4: Gallery crop uses new activity. Fixed image quality.

* commit 'c3178ca4daf7ed570f3432f3433959c208ecc105':
Gallery crop uses new activity. Fixed image quality.
c3178ca4daf7ed570f3432f3433959c208ecc105 17-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Gallery crop uses new activity. Fixed image quality.

Bug: 8639287
Bug: 8617799
Bug: 8600483
Bug: 8586301
Bug: 8526929
Bug: 8181859
Bug: 7561681

Change-Id: Ib275b970931dd324e93d1629be75e5309c9dcb4e
pp/PhotoPage.java
iltershow/crop/CropActivity.java
iltershow/crop/CropDrawingUtils.java
iltershow/crop/CropLoader.java
iltershow/crop/CropMath.java
iltershow/crop/CropView.java
8b118bf1437b18eb3f6f9b5698daf43c378eacbf 18-Apr-2013 nicolasroard <nicolasroard@google.com> Add extra perf logging

Change-Id: Iebbb4491e69d356c0c73cd314c295857a2d6e357
iltershow/filters/ImageFilterRS.java
d4aafbc3b14a77774b0835c402058ccac6e85739 18-Apr-2013 Flavio Lerda <flerda@google.com> am 47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce

* commit '47f28614605a19726d2ab81b90333ba718223b72':
Usage statistics for sharing.
47f28614605a19726d2ab81b90333ba718223b72 18-Apr-2013 Flavio Lerda <flerda@google.com> Merge "Usage statistics for sharing." into gb-ub-photos-bryce
ee071cf15e65913095a345dadf4dcb3ae82da6ee 18-Apr-2013 John Hoford <hoford@google.com> Merge "Support for save state in images" into gb-ub-photos-carlsbad
6d183bc6ab64429412b9dd9d477008f6d863275e 18-Apr-2013 Ruben Brunk <rubenbrunk@google.com> am 61f3f111: Remove call to superclass onTouch in curves.

* commit '61f3f1113a5b4f8583fd9fcae4d24734617cae21':
Remove call to superclass onTouch in curves.
61f3f1113a5b4f8583fd9fcae4d24734617cae21 18-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Remove call to superclass onTouch in curves.

Bug: 8523301
Change-Id: I0102a228c2d1b3199412c9897a9f1abdb4bcb41f
iltershow/ui/ImageCurves.java
7176d152c49f0f16edb3de1fd857acfa2a06f79d 18-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Revert "Remove redeye filter."

Bug: 8609003
Change-Id: Iac397cf2db7fd991b278f70de63fa18f1b620312
iltershow/filters/BaseFiltersManager.java
32f8dbced8877b658f66d321a7f06f26d096f3d6 18-Apr-2013 Ruben Brunk <rubenbrunk@google.com> am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce

* commit '869cb0484c1c9e77d089abe198817709d3e89eb9':
Remove redeye filter.
21512659d1f098f13249516a40bee69d7e98de29 18-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Remove redeye filter.

Bug: 8609003
Change-Id: I7f10e928fa775e5186146f06877dda34b3df699a
iltershow/filters/BaseFiltersManager.java
39f9e8e79e9c060fe6d00120f34cdef33515744e 18-Apr-2013 John Hoford <hoford@google.com> am 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce

* commit '12cd022273f14a64d9cdf79aa6a27feb099b9107':
improve pinch to zoom behavior
0a52dc428a9c185305d360b0792f7da0281d165b 17-Apr-2013 John Hoford <hoford@google.com> improve pinch to zoom behavior

bug:8630925
Change-Id: Ica4c4ab83e726901a8e729056529aa8379cb52ae
iltershow/imageshow/ImageShow.java
6a0efe6d483e1d4b61ca888a76381cf791b4b66b 17-Apr-2013 ztenghui <ztenghui@google.com> Merge "When video not seekable, don't show the scrubber" into gb-ub-photos-carlsbad
e8b4b34cb77b179f397641e2f4572e4aa6be1943 17-Apr-2013 ztenghui <ztenghui@google.com> When video not seekable, don't show the scrubber

bug:7117365

Change-Id: I133ea68eaebf1d875a27336ac524d785efe71cc2
pp/CommonControllerOverlay.java
pp/MoviePlayer.java
pp/TimeBar.java
75408cd38e7efe0755addcf3170932c8b3190bc1 16-Apr-2013 ztenghui <ztenghui@google.com> Add accessibility to video player controller.

bug:5714277

cherry pick the Carlsbad CL:
https://googleplex-android-review.git.corp.google.com/#/c/297944/

Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
pp/CommonControllerOverlay.java
afa8ed9d46e760d4b0c0331cfcb4bb49ef6ba280 16-Apr-2013 John Hoford <hoford@google.com> Support for save state in images

bug:8626775

Change-Id: I2a34a6027b23dab9c1802f672bfbf399cac0c4f7
iltershow/FilterShowActivity.java
iltershow/controller/BasicParameterStyle.java
iltershow/controller/BasicSlider.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterBasicRepresentation.java
iltershow/filters/FilterCurvesRepresentation.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/FilterFxRepresentation.java
iltershow/filters/FilterRedEyeRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/FilterTinyPlanetRepresentation.java
iltershow/filters/FilterVignetteRepresentation.java
iltershow/filters/ImageFilterBwFilter.java
iltershow/filters/ImageFilterContrast.java
iltershow/filters/ImageFilterDownsample.java
iltershow/filters/ImageFilterEdge.java
iltershow/filters/ImageFilterExposure.java
iltershow/filters/ImageFilterFx.java
iltershow/filters/ImageFilterHighlights.java
iltershow/filters/ImageFilterHue.java
iltershow/filters/ImageFilterKMeans.java
iltershow/filters/ImageFilterNegative.java
iltershow/filters/ImageFilterSaturated.java
iltershow/filters/ImageFilterShadows.java
iltershow/filters/ImageFilterSharpen.java
iltershow/filters/ImageFilterVibrance.java
iltershow/filters/ImageFilterWBalance.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
iltershow/tools/SaveCopyTask.java
iltershow/tools/XmpPresets.java
2aa37f270a077c8a409190f891aa838a8c1653c3 17-Apr-2013 nicolasroard <nicolasroard@google.com> Fix border apply if no filter applied

Change-Id: Ic5b319625b42adb298094c4ad202d6c161538644
iltershow/cache/CachingPipeline.java
iltershow/presets/ImagePreset.java
2251386437163898eb4b6f7546705d1365744fd1 16-Apr-2013 Flavio Lerda <flerda@google.com> Usage statistics for sharing.

Bug: 8433834
Change-Id: Iaec6150443258daa213395b6fb1e8d8d3e6123b3
pp/GalleryActionBar.java
pp/PhotoPage.java
f7b8ac02984b3e8136db405471979b160b6485a6 17-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Revert "Shows final set of filters in UI."" into gb-ub-photos-carlsbad
2b8e90666e646e200b0d7b7d361815733e0d5d66 17-Apr-2013 nicolasroard <nicolasroard@google.com> am 83bd8d34: Remove History panel

* commit '83bd8d346d295e4fe06212da957feb77ee23c04d':
Remove History panel
83bd8d346d295e4fe06212da957feb77ee23c04d 17-Apr-2013 nicolasroard <nicolasroard@google.com> Remove History panel

Now that we have the state, history
is not that useful. For clarity's sake
we are removing it.

bug:8620913
bug:8503386
bug:8324322
bug:8324023
Change-Id: Ife86f3ab67c05d5781234496c7518866b506631b
iltershow/FilterShowActivity.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
23b35402630e8e8fb21462329fc1ac233bcbce1d 17-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Revert "Shows final set of filters in UI."

Bug: 8609003
Change-Id: I24c343f62aa5e5c9a903cdd746abf2dc2b992418
iltershow/FilterShowActivity.java
5eab0b8e7a7b74d3b2d20a222312680591cb98b6 17-Apr-2013 Ruben Brunk <rubenbrunk@google.com> am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce

* commit '113e0fbd251966629719f390e43b320b84751304':
Shows final set of filters in UI.
409d9c36c3b6d8ff2128d50a391ce8617b632127 17-Apr-2013 nicolasroard <nicolasroard@google.com> Re-enable Simple Editor menu item

Change-Id: I080dfffeb6394b78a1dc2bd10b52ff15b1e55ac9
i/MenuExecutor.java
113e0fbd251966629719f390e43b320b84751304 17-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Shows final set of filters in UI." into gb-ub-photos-bryce
c08af6a3b2c466982fa54a69afd619586dd29391 17-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Shows final set of filters in UI.

Bug: 8609003
Change-Id: Id7530da3e11fb88a964b881ba8f8fad70b40bc23
iltershow/FilterShowActivity.java
05f2332b281acd38d31a76cd1e6d47e2fdb4dbd4 17-Apr-2013 Doris Liu <tianliu@google.com> am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce

* commit '953f109b688477b086281fe09074d3886ef87fba':
Fix face unlock failure
953f109b688477b086281fe09074d3886ef87fba 17-Apr-2013 Doris Liu <tianliu@google.com> Merge "Fix face unlock failure" into gb-ub-photos-bryce
0333247337b910bb981c6ba17ca0cc76d5b614ff 17-Apr-2013 nicolasroard <nicolasroard@google.com> Make convertBitmap() protected so that Frames can use it.

bug:8633011
Change-Id: Ic731a1d906a6a388a22568f396111f8ca3b4475e
iltershow/filters/ImageFilterRS.java
4a10c9782bc397ab3b77e5d7a439a90169484b1a 17-Apr-2013 Doris Liu <tianliu@google.com> Fix face unlock failure

Bug: 7494156
Change-Id: I6c909e498305ff3e66efdeeb9fb5581ea8f51715
pp/SlideshowPage.java
7f9d77ea19b308aa1fccea97be93b928cb0a86d4 17-Apr-2013 ztenghui <ztenghui@google.com> Merge "Add accessibility to video player controller." into gb-ub-photos-carlsbad
a71c2620b3d8303b5bc4aaa51545e5bcc5010e62 17-Apr-2013 nicolasroard <nicolasroard@google.com> am f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce

* commit 'f3f0aae490911245ad6a5602b77b72f0546b93cc':
Remove the Simple Edit menu item in Gallery
634248d313c88f14ff851e7b6769b432ce45e15e 16-Apr-2013 ztenghui <ztenghui@google.com> Add accessibility to video player controller.

bug:5714277

Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
pp/CommonControllerOverlay.java
8f5580a4aa1376be22395024ebda2b9dcda23170 16-Apr-2013 nicolasroard <nicolasroard@google.com> Remove the Simple Edit menu item in Gallery

bug:8609003
Change-Id: Ida6bfec65bf4b78c7c1b64f759c750ef9255bb6c
i/MenuExecutor.java
2635937ebf0f2df6450b623f6ca74bac6f7e2941 16-Apr-2013 nicolasroard <nicolasroard@google.com> am fb6a8e16: New state panel

* commit 'fb6a8e166f0a46d2a994a408b1679e3a67fdcb52':
New state panel
a225f182540914e286ed18117f40e960244255c5 16-Apr-2013 Christian Wichner <cwichner@google.com> convertBitmap is needed by ImageFilterFixedFrame.

Change-Id: I2094c54745f94dab2283e2a466371d15d5a57b0a
iltershow/filters/ImageFilterRS.java
fb6a8e166f0a46d2a994a408b1679e3a67fdcb52 15-Apr-2013 nicolasroard <nicolasroard@google.com> New state panel

bug:8620913
bug:8503386

Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
iltershow/state/DragListener.java
iltershow/state/PanelTrack.java
iltershow/state/State.java
iltershow/state/StateAdapter.java
iltershow/state/StatePanel.java
iltershow/state/StatePanelTrack.java
iltershow/state/StateView.java
55fccf8e63d3eb50800f81ca1211b2205fe15060 16-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Add local database for filters.

Bug: 8621039
Change-Id: I7b13ff0167483f148b354204cb01262fe40da2ba
iltershow/data/FilterStackDBHelper.java
iltershow/data/FilterStackSource.java
72d611a96c9c0458b3d8a41cd9b9b19a6ca061ae 15-Apr-2013 Michael Kolb <kolby@google.com> Lock camera orientation using FW API

Bug: 8617536

Change-Id: Id3a5ae777f6f87d24984cbca48202470651cd71c
pp/OrientationManager.java
3dc6a630aff5be323c54b4616fd3a373cbad31f7 15-Apr-2013 Bobby Georgescu <georgescu@google.com> Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce
d2f5fe607ee6d7b5f79862b495495e2f6024cdab 10-Apr-2013 John Hoford <hoford@google.com> support for simplified parameters in filter

Change-Id: I623e6fb90e8175c7e5e2dfc146f927eecba29817
iltershow/controller/BasicParameterInt.java
iltershow/controller/BasicParameterStyle.java
iltershow/controller/FilterView.java
iltershow/controller/Parameter.java
iltershow/controller/ParameterSet.java
iltershow/editors/BasicEditor.java
iltershow/filters/FilterBasicRepresentation.java
4b6ea5bce9b68eea16eb8a0980501f671e7fbf44 13-Apr-2013 nicolasroard <nicolasroard@google.com> Add direct rendering for border

bug:8603245

Change-Id: Ibc1bde9adb19f930b474e4076a0c2720fbe0bc8d
iltershow/cache/CachingPipeline.java
iltershow/presets/ImagePreset.java
549c968947cccc8bacca994f954629228b6b877f 13-Apr-2013 Bobby Georgescu <georgescu@google.com> Fix performance and other issues related to multi-selection

Bug: 8606565
Bug: 8607510
Change-Id: I5bd01745b6d1047571d562e1637a2999afddfec2
i/ActionModeHandler.java
i/SelectionManager.java
93ef658bf44d7ecd79894a9a225a400c2741058f 11-Apr-2013 nicolasroard <nicolasroard@google.com> Add a direct rendering mode

This takes input and output allocations.
Also added a utility method in ImageFilterRS
to scale textures at screen resolution.

bug:8603245
bug:8588853

Change-Id: Ic5e4dea2289f0edd7518fc07f04b523be5316e82
iltershow/cache/CachingPipeline.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterRS.java
iltershow/presets/FilterEnvironment.java
iltershow/presets/ImagePreset.java
6cfb081cdf5acf454ecb05c50c575bcb3ce74cf0 12-Apr-2013 Ruben Brunk <rubenbrunk@google.com> G+ crop overlay shadows. Aspect ratios.

Bug: 8597538

Change-Id: I9a7225a125bef7e11d6bf420bf1fa55e7f22c909
iltershow/crop/CropDrawingUtils.java
iltershow/crop/CropMath.java
iltershow/crop/CropObject.java
0683fe0a1c913d6cc48a127bf6a1486422d1b040 12-Apr-2013 Bobby Georgescu <georgescu@google.com> Show loading indicator in full-screen importer view

Bug: 8599282
Change-Id: I568d5077e8e5450da49cd4d75df39973b84d081f
ngest/ui/MtpImageView.java
ea2fa83c2dd2b59b8a67ec363e4ac431748f997b 11-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Setup geometry xforms and propogation chain.

Bug: 8597538

Change-Id: I4a6b8ebcfadfd30850a73217742c740835761388
iltershow/crop/BoundedRect.java
iltershow/crop/CropObject.java
41185c4fdbccad17b79697306a7f8044b8f7ffd3 11-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Fix downsampling check in crop.

Bug: 8586301
Change-Id: I4c5441f779122adb984368609cfea39a60190848
iltershow/crop/CropLoader.java
6b138c2240d35571e1f49258f84ec2659223d251 10-Apr-2013 Bobby Georgescu <georgescu@google.com> Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
573dfae59a96663b6ff6e47b4c7db326c651a3cf 10-Apr-2013 Bobby Georgescu <georgescu@google.com> Correctly scale images in MTP importer

Bug: 8293048
Change-Id: Ib46a6ce13aeea6a59706790b69be29215be7ebc4
ngest/ui/MtpImageView.java
b6b2d1c45f889ca0388b11bb49ae0ce1a1694e90 10-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
3eb2fb4dd2ede7f65ee307061213f0e8860f15f6 10-Apr-2013 ztenghui <ztenghui@google.com> Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
8b9de91b3c01664b24deda202acb5db8594db503 08-Apr-2013 ztenghui <ztenghui@google.com> Use MediaMuxer for the video trim and mute.

bug:8548085

Change-Id: I55955285ee141ebab6437950a154280cc5fefcc0
pp/TrimVideo.java
pp/VideoUtils.java
3bc806a8575072c9459fe3698675d3713300d1d3 10-Apr-2013 nicolasroard <nicolasroard@google.com> Small cleanup in setting resources

Change-Id: Icd275aaddcee59a578f916c57903012ce35469ad
iltershow/FilterShowActivity.java
iltershow/cache/FilteringPipeline.java
iltershow/filters/BaseFiltersManager.java
4c538286a5fd604c8ac22c480def31b2e56e6c25 10-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Adding simple crop ui. Refactoring.

Change-Id: I904ce776ca31cf2f782b0aa8e6456ab54b15e540
iltershow/crop/CropDrawingUtils.java
iltershow/crop/CropLoader.java
iltershow/crop/CropView.java
e29b57330be471dd74672a7bdc74a93dcae3a98b 10-Apr-2013 nicolasroard <nicolasroard@google.com> Add a third pipeline reserved for the high res preview

Change-Id: I1f35f0a7195157e5fe742d7d7c5506b3f84ece1b
iltershow/FilterShowActivity.java
iltershow/cache/FilteringPipeline.java
701955ac93bb05bff2a826c79ea60f921b3745fc 10-Apr-2013 John Hoford <hoford@google.com> Merge "support icon styles" into gb-ub-photos-bryce
7668544ee3e8ba3b14d127b9ecd1cf4a3b2f3e11 10-Apr-2013 nicolasroard <nicolasroard@google.com> Detach old editor

Change-Id: I1b0a30aa334a83011d9f03ea629e1b0f36ea21d2
iltershow/PanelController.java
iltershow/editors/Editor.java
4ee3cfd8a59f5daaf271b67c2f634d72290d45d0 10-Apr-2013 John Hoford <hoford@google.com> support icon styles

Change-Id: I9a4af2826824fd519099363b3190fc417b67c022
iltershow/cache/CachingPipeline.java
iltershow/cache/RenderingRequest.java
iltershow/controller/StyleChooser.java
iltershow/filters/FilterRepresentation.java
iltershow/presets/ImagePreset.java
8eb8dd6ba1957d7e8e75e6fab9f5654ad55d2fe4 10-Apr-2013 nicolasroard <nicolasroard@google.com> Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
dcd1dd986bc8455ce822e8d9e7a46ea103228351 10-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
6fe165b7d28299d5b2f97deb135b233d84eb300f 05-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Moving crop to a separate activity. Refactoring.

Bug: 8526929

Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce
pp/AlbumPage.java
pp/Wallpaper.java
iltershow/CropExtras.java
iltershow/FilterShowActivity.java
iltershow/crop/BoundedRect.java
iltershow/crop/CropActivity.java
iltershow/crop/CropExtras.java
iltershow/crop/CropLoader.java
iltershow/crop/CropMath.java
iltershow/crop/CropObject.java
iltershow/crop/CropView.java
iltershow/editors/EditorCrop.java
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/BoundedRect.java
iltershow/imageshow/CropMath.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageCrop.java
adget/WidgetConfigure.java
2ff0e04ddcf770a782f94ddee936a1c205e1f322 10-Apr-2013 nicolasroard <nicolasroard@google.com> Implements swipe in editor menu

Change-Id: I5871da89d2e911d5b6663cdee8dc660ab0777393
iltershow/editors/Editor.java
iltershow/editors/SwapButton.java
a4ff177637432e9f1e5eeb29b9c5dc6bb2949b2a 09-Apr-2013 nicolasroard <nicolasroard@google.com> Merge "Hide the category panel when editing" into gb-ub-photos-bryce
efe8b71220d03bdeb84ed095a4dd0c8434a35e3d 09-Apr-2013 nicolasroard <nicolasroard@google.com> Hide the category panel when editing

Change-Id: I181ab1aa3ee27bf38a88999caf31eedc263cfe96
iltershow/FilterShowActivity.java
iltershow/PanelController.java
9e0d687320eb9302b4b96f615083c31edbdeb08b 09-Apr-2013 John Hoford <hoford@google.com> ui cleanup

Change-Id: Ifb08af6bfad2f049b66932360901b2e52ff07f01
iltershow/controller/StyleChooser.java
01a4beb197d74dddf788efaf6aedef434dfb8f8f 09-Apr-2013 nicolasroard <nicolasroard@google.com> Fix history original image
Change 1st and 2nd panel background color

Change-Id: Ib6a1033f99a4a1460c1a31be1e67ebd965e00add
iltershow/FilterShowActivity.java
iltershow/HistoryAdapter.java
948a4e6e38d8d9ec9926877524478d6692437105 09-Apr-2013 nicolasroard <nicolasroard@google.com> Fix history panel first appearance

Change-Id: I49c3f91d1d65cc64b15080c64709f769fc8a8f22
iltershow/FilterShowActivity.java
1fe7caeeaab314cd70d0b54f8f3dd3225c71c081 09-Apr-2013 nicolasroard <nicolasroard@google.com> Fix crash in curves

Change-Id: Ic5b61b3a4653f718bf2e4327f3920b5f39162a49
iltershow/ui/ImageCurves.java
166524339e9f8ad86c0922142b961776e0da3d8f 09-Apr-2013 John Hoford <hoford@google.com> make basic editor based on ParametricEditor

Change-Id: Ie0a799d7e85f4e21fdd86ffbdca9814a3cc40c61
iltershow/controller/BasicSlider.java
iltershow/controller/ParameterStyles.java
iltershow/controller/StyleChooser.java
iltershow/controller/TitledSlider.java
iltershow/editors/BasicEditor.java
iltershow/editors/ParametricEditor.java
719fa31bc4df6605f45a65feb504d5c4e6e59db3 09-Apr-2013 nicolasroard <nicolasroard@google.com> Deactivate Vintage & BW Color FX

bug:8503451
Change-Id: I5415551698a3f3db4cd0739b7d90c3576d458587
iltershow/FilterShowActivity.java
8c4e95f4380a4104c9968963a363b62746e6c967 09-Apr-2013 nicolasroard <nicolasroard@google.com> Add menu item to start the simple editor

Change-Id: Iac3ca76838a5f91186527863b3d990cbcad3faf0
pp/PhotoPage.java
i/MenuExecutor.java
7a584e068d274ca95286fcf2804c068d38fe8753 08-Apr-2013 Tim Murray <timmurray@google.com> Allow use of texture.

Change-Id: Ibc75616484d2833d9212c7c68027f83ad40b16cf
iltershow/filters/ImageFilterRS.java
e193e864a849f4f816c55cff83a9dc7b39e0018f 08-Apr-2013 Tim Murray <timmurray@google.com> Limit creation of greyscale converter RS script.

Change-Id: I2725ae6cb5ba829fec61dce114513762fce53067
iltershow/filters/ImageFilterRS.java
7ce32619d3f107125d219b80c4041681a0bd85cc 05-Apr-2013 John Hoford <hoford@google.com> support for simplified computed icons

Change-Id: Id886a0a2151037420d3672f34d2838c5d9c69cbd
iltershow/filters/IconUtilities.java
iltershow/filters/ImageFilter.java
214f786938fd0924ec89190b5f38d034f0be7291 05-Apr-2013 ztenghui <ztenghui@google.com> Merge "Remove redudant setName" into gb-ub-photos-bryce
319695a4c39ddbd4c59a7cb01cc10333ee37b246 04-Apr-2013 ztenghui <ztenghui@google.com> Remove redudant setName

Change-Id: Id9c5f2ee268b275ba4272f66a0f72c1aa4786f9c
iltershow/imageshow/GeometryMetadata.java
80bd74274be9ade36b2b4ac0d5c130ed7e5e3219 04-Apr-2013 John Hoford <hoford@google.com> fixed the value that quality was getting set to

Change-Id: I493c37c065e180ed3a7a785df4132812bd53add4
iltershow/cache/CachingPipeline.java
8ce4df0105e645aed8503c3f03c98c208621911d 03-Apr-2013 John Hoford <hoford@google.com> fix touch action in draw

Change-Id: I8c1e040a795186c47c8319441ed1c371497a5f6d
iltershow/imageshow/ImageDraw.java
2538c992dc70b3eda7487ef68dba0390b2f337d7 03-Apr-2013 nicolasroard <nicolasroard@google.com> Fix segfaults in RS filters

We did not recreate the filters in all
cases when the input size change.

bug:8530112
Change-Id: I4cb47498532618271b90e56c01ec63ad991db787
iltershow/filters/ImageFilterRS.java
205a0901d5b070e8740e865079bd868c976c67c3 03-Apr-2013 John Hoford <hoford@google.com> fix calling Allocation.copyFrom without context

bug:8526929
Change-Id: I407539fae153642ea9be46a2f4102ab827e24164
iltershow/cache/CachingPipeline.java
20eb41f87e35033a783adf76286c10bb1534a56d 02-Apr-2013 nicolasroard <nicolasroard@google.com> Fix stickiness issues with UI

The renderGeometryIcon() function shouldn't
be synchronized -- it's independent of the rest
of the pipeline and is only used to apply a given geometry.

Change-Id: I91a5d2ec3f28f15c489066ed2c5a5009e29fa7b3
iltershow/cache/CachingPipeline.java
5bd6e14f2c2b06943fa542921241b79566b3c6e2 02-Apr-2013 nicolasroard <nicolasroard@google.com> Don't try freeing resources on a different thread..

This call to freeResources happens on the main thread.
It's also not really useful. The geometry instance
shouldn't be shared either.

bug:8522497
Change-Id: I7b144713428ab803b3640b3d8226fd862db824f4
iltershow/cache/CachingPipeline.java
e7aa98e533531f5e82f5de37c24701bc44bc6cd1 02-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Changed editor back button behavior.

Bug: 8522150
Change-Id: I803054138df931c4c48ef03930afe79e272f0d4b
iltershow/FilterShowActivity.java
d88683e307eb058e71c083bb795bd31945ed1292 02-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Change panels organization. Also fixes border updates handling.

Change-Id: If96754e821b1e80238d2a04e65f1b57ee9683efe
iltershow/FilterShowActivity.java
iltershow/filters/BaseFiltersManager.java
iltershow/presets/ImagePreset.java
0b65c2c2fdf5f9ce4d0740697db4c74a9b6cbdc6 02-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce
8ab1d6661201d30063067f3b6c2fbd87e1ef9f67 01-Apr-2013 Ruben Brunk <rubenbrunk@google.com> Added apply UI callbacks for rotate/mirror operations.

Change-Id: I30bfb439d742248c3241742bd11f64a1b4a22640
iltershow/editors/EditorFlip.java
iltershow/editors/EditorRotate.java
iltershow/imageshow/ImageFlip.java
iltershow/imageshow/ImageRotate.java
6058af443b087ba50741cc3e61ec70e830e498fa 01-Apr-2013 Bobby Georgescu <georgescu@google.com> Enforce bmp type in pool, handle MTP image decode failure

- GalleryBitmapPool didn't reject bitmap types other than
ARGB_8888 which could lead to problems when a different type
is used for recycling.
- BitmapFactory throws an exception rather than returning null
when image decoding fails and an existing bitmap was supplied
for recycling, even if the failure was not caused by the use
of that bitmap. When decoding things from an MTP device, we
need to handle this since unsupported formats may be returned.

Change-Id: I8cc8aa46f5a741b360e806814991f74a131e9039
ngest/data/MtpBitmapFetch.java
5997a0138287fe08f414ffb097c8e088a47bf101 30-Mar-2013 nicolasroard <nicolasroard@google.com> Merge "Fix double-tap behaviour" into gb-ub-photos-bryce
f3bcc676e245727b20c7d6123cb39361e84b1dc9 30-Mar-2013 nicolasroard <nicolasroard@google.com> Fix double-tap behaviour

Change-Id: I17282bce5af9d65b704e3853181ef3cbfde4992e
iltershow/cache/RenderingRequest.java
iltershow/imageshow/MasterImage.java
1ad3cd574da4e998e55e4ff4861ff19e2ea982bd 30-Mar-2013 nicolasroard <nicolasroard@google.com> Fixes some state synchronization issues

Change-Id: Iea0f2b8d9c885795bddfb0d3001c8a351caed63c
iltershow/cache/FilteringPipeline.java
iltershow/filters/FilterRepresentation.java
ad42027590c52fcc522c06d311f28742e0441ec0 30-Mar-2013 nicolasroard <nicolasroard@google.com> Merge "Implements progressive rendering" into gb-ub-photos-bryce
4dad1a9e3f213e95a4f419c06ea885fee75d3297 29-Mar-2013 nicolasroard <nicolasroard@google.com> Implements progressive rendering

Change-Id: I32bd2072126a4fad4342f7d9ffa1cff3b5da84cf
iltershow/FilterShowActivity.java
iltershow/cache/CachingPipeline.java
iltershow/cache/FilteringPipeline.java
iltershow/cache/ImageLoader.java
iltershow/cache/RenderingRequest.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
e0e9fff3ff81faec02b243eabb1502a97a4e4adb 30-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce
fe2aa4ba06d045895d0d038627547e02adc6b945 30-Mar-2013 George Mount <mount@google.com> Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce
49508252ccb37a92bf06da468e4683c4b1909a33 18-Mar-2013 George Mount <mount@google.com> Add initial implementation of MediaCache.

Change-Id: I94d357bab0e57cc60b8be790d912ba036730298b
pp/GalleryAppImpl.java
a3dbbd7dcbd9aead7b10653b95685f5d2a71947a 29-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Added "discard unsaved changes" behavior for exiting.

Bug: 7534778
Change-Id: I3136fa04585a42912bad6235a776937a4cb4dcac
iltershow/FilterShowActivity.java
3f3128579b1215142ce71268bdb5be33426d6ccb 29-Mar-2013 John Hoford <hoford@google.com> Merge "add flexable ui for parameters" into gb-ub-photos-bryce
235d2179374bec14040f20af91dc753e38ea3639 13-Mar-2013 John Hoford <hoford@google.com> add flexable ui for parameters

Change-Id: Ifa9862ceb7f9a12b1b9b985fdc737dc1bb679921
iltershow/PanelController.java
iltershow/controller/ActionSlider.java
iltershow/controller/BasicSlider.java
iltershow/controller/Control.java
iltershow/controller/Parameter.java
iltershow/controller/ParameterActionAndInt.java
iltershow/controller/ParameterInteger.java
iltershow/controller/TitledSlider.java
iltershow/editors/Editor.java
iltershow/editors/EditorVignette.java
iltershow/editors/ParametricEditor.java
iltershow/filters/FilterBasicRepresentation.java
iltershow/imageshow/ImageVignette.java
0c90af2257105a289c19a355e33d4035bd1fc61f 29-Mar-2013 nicolasroard <nicolasroard@google.com> Re-enable caching step in RS filters

Bug: 8478659
Bug: 8459181
Bug: 8450339
Bug: 8457323

With the compatibility library, different Scripts instances
actually points to the same thing. We thus need to explicitely
rebind all the variables to the correct script instance before
running RS filters...

Change-Id: Id6cd4e44b5a67a3d2588e158c616b2b44e214a5b
iltershow/filters/ImageFilterRS.java
iltershow/filters/ImageFilterSharpen.java
iltershow/presets/FilterEnvironment.java
560f959b659bb510a6ac9a92831534c5dfcf16be 28-Mar-2013 nicolasroard <nicolasroard@google.com> Fix deadlock.

Move the RenderScript context and Resources to CachingPipeline.

bug:8491107
Change-Id: I912555c87b060e4515cc1a4c66c8a8c9c840532d
iltershow/FilterShowActivity.java
iltershow/cache/CachingPipeline.java
iltershow/filters/ImageFilterRS.java
bc94848ce73ba9a23be2f7f3a12c4a7404ae3eb2 27-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Fixed renderscript crashes.

Bug: 8478659
Bug: 8459181
Bug: 8450339
Bug: 8457323

createFilter() initializes a ton of parameters in the RenderScript
filters. Using stale parameters from a previous call to createFilter()
causes segfaults.

Change-Id: Id54b956b7fe83be5089b1d47c3bedcca66237ddf
iltershow/filters/ImageFilterRS.java
b75da4c91e16bbd83cd839207224c0645a6ecefd 23-Mar-2013 nicolasroard <nicolasroard@google.com> Moves ownership of the environment to the pipeline

Change-Id: I256e679a6f47831ebf00fe57d38b9c0372be38ec
iltershow/FilterShowActivity.java
iltershow/cache/CachingPipeline.java
iltershow/cache/ImageLoader.java
iltershow/cache/RenderingRequest.java
iltershow/filters/BaseFiltersManager.java
iltershow/imageshow/ImageZoom.java
iltershow/presets/ImagePreset.java
be31e587c1485fb8e3d7c8b079250ffbdc26e1b9 26-Mar-2013 nicolasroard <nicolasroard@google.com> Hides popup indicator on some editors

Change-Id: I88f17b9352c582f26f09a74db9d91e1fb81dbeae
iltershow/editors/Editor.java
iltershow/editors/EditorFlip.java
iltershow/editors/EditorRotate.java
iltershow/editors/EditorStraighten.java
91be98c35f6c5f19d7629bb29e7261970b2f4c67 26-Mar-2013 nicolasroard <nicolasroard@google.com> Hides seekbar in some editors

Change-Id: Ifce385f9a6bf9b741f0873f49d826fbcf453d97c
iltershow/editors/Editor.java
iltershow/editors/EditorCrop.java
iltershow/editors/EditorCurves.java
iltershow/editors/EditorDraw.java
iltershow/editors/EditorFlip.java
iltershow/editors/EditorRedEye.java
iltershow/editors/EditorRotate.java
iltershow/editors/EditorStraighten.java
f4486566491c2f6c51817f92ee1000d12db41c1b 23-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Refactoring: removed unnecessary apply calls.

Change-Id: Ic592a00a8487f6a2499c34929b0ec8afad2a73b6
iltershow/ImageStateAdapter.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterDownsample.java
iltershow/filters/ImageFilterGeometry.java
iltershow/filters/ImageFilterParametricBorder.java
iltershow/filters/SimpleImageFilter.java
iltershow/imageshow/MasterImage.java
iltershow/ui/FilterIconButton.java
180277924bebf6b600ee5ce5adf9ff807a038570 22-Mar-2013 nicolasroard <nicolasroard@google.com> Fix problem applying the Fx filter
Also adds some debug info

bug:8442036
Change-Id: Ife7fd4be664ae011e41969e74c7745da0a7a52f5
iltershow/cache/CachingPipeline.java
iltershow/cache/FilteringPipeline.java
iltershow/filters/ImageFilterFx.java
iltershow/filters/ImageFilterRS.java
iltershow/tools/SaveCopyTask.java
705dc819661cb8c8e839a04577b0641bd6caad53 21-Mar-2013 John Reck <jreck@google.com> Revert "New loading model"

Change-Id: I5d3d4c7a4ca0d11de01278529e1413fc62e6b4ed
pp/AlbumDataLoader.java
pp/AlbumSetDataLoader.java
pp/PhotoDataAdapter.java
pp/SlideshowPage.java
ata/ClusterAlbum.java
ata/ClusterAlbumSet.java
ata/ComboAlbum.java
ata/ComboAlbumSet.java
ata/FilterDeleteSet.java
ata/FilterEmptyPromptSet.java
ata/FilterTypeSet.java
ata/LocalAlbum.java
ata/LocalAlbumSet.java
ata/LocalMergeAlbum.java
ata/MediaSet.java
ata/MediaSetWrapper.java
ata/SecureAlbum.java
ata/SingleItemAlbum.java
ata/SnailAlbum.java
adget/MediaSetSource.java
3024aa22d372c0d6608b143a0c46b86c2104f9b1 21-Mar-2013 nicolasroard <nicolasroard@google.com> Don't show the original image in the Curves editor

Change-Id: I884f6113c5b39d02b8b1f217ce8bec5fd19aaf4e
iltershow/imageshow/ImageShow.java
iltershow/ui/ImageCurves.java
d37039a9222b740b7c3f10626af91d2a351c89f3 21-Mar-2013 nicolasroard <nicolasroard@google.com> Merge "Fix crashes with RS filters" into gb-ub-photos-bryce
fc8a6a38c699c0d75fa29664d9aaa369d361c335 20-Mar-2013 nicolasroard <nicolasroard@google.com> Fix crashes with RS filters

bug:8418537

Change-Id: I37f8ad8a77f04faed9f721122872f00f7aaaa365
iltershow/cache/CachingPipeline.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterRS.java
iltershow/filters/ImageFilterSharpen.java
iltershow/presets/FilterEnvironment.java
5455ac56cbde7505687cd885b62f7a9d03d826b2 21-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Added accessability description for filter buttons.

Change-Id: I20b780cf54a3fa4beed41845693c87e2369c33ae
iltershow/ui/FilterIconButton.java
2ddedb8630e6c2324c41d12509d893c4ec3744f2 20-Mar-2013 nicolasroard <nicolasroard@google.com> Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce
7097d5173dbbddae315d13251572feb910954a70 20-Mar-2013 nicolasroard <nicolasroard@google.com> Refactor the pipeline
- add a CachingPipeline class
- FilteringPipeline only deals with communication
- fix large critical sections performance issues
- improves stability

bug:8418537

Change-Id: Id18edf71b2e2aec19a8b25fcce711c4acbb1a724
iltershow/cache/CachingPipeline.java
iltershow/cache/FilteringPipeline.java
iltershow/imageshow/ImageVignette.java
0055102404c767af2cd5fabf70acbc8317e33fe3 20-Mar-2013 Victor Doba <dobavictor@google.com> Method added to load scaled resource (with only alpha channel).

Change-Id: I1b9a58e0fd4c33c9748ad03f53d635c426a5102c
iltershow/filters/ImageFilterRS.java
269d2c8602e8893b0bf399324b2072783ba0f37c 20-Mar-2013 nicolasroard <nicolasroard@google.com> Add accessor for filters to the source bitmap passed to apply()

Change-Id: I2900c5b799592c388daa9049093ef8c80fa4f5c6
iltershow/filters/ImageFilterRS.java
8898eaabfa0cdf70e00078d2dea810f9aab4dfd1 20-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Fixed onDestroy ordering for RS context.

Bug: 8420637
Change-Id: Iddceaa3aefd3d905bbc7435350b768d10215b1d8
iltershow/FilterShowActivity.java
33fca9ef7f89b60e3b1a361fdf5fc597b3994e74 19-Mar-2013 nicolasroard <nicolasroard@google.com> Fix some startup issues, performance issues on ICS

Change-Id: Iccbcc5a78bf4feb5614e1c420022ef8440606baf
iltershow/FilterShowActivity.java
iltershow/cache/FilteringPipeline.java
iltershow/imageshow/GeometryMetadata.java
94202ecf77d68ca7ed1b0adfe3b37daf6851e39d 16-Mar-2013 nicolasroard <nicolasroard@google.com> Improves double-tap and comparison mechanism

Change-Id: I1fda50d7d179703db9e0e525550018c259233e89
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
f79f954f4eb23bce55061c683a07fc7b3a965451 19-Mar-2013 Ruben Brunk <rubenbrunk@google.com> ImageFilterRS filters reset properly. FilterPipeline delay till after load.

Bug: 8293404
Bug: 8417804

Change-Id: I4e3fbbdb86bcb790d73455f21044e6dee9398a5d
iltershow/FilterShowActivity.java
iltershow/cache/FilteringPipeline.java
iltershow/cache/TripleBufferBitmap.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/ImageFilterFx.java
iltershow/filters/ImageFilterRS.java
iltershow/filters/ImageFilterSharpen.java
iltershow/ui/FilterIconButton.java
b8270a94e539fc1944ae350c73b00b9df45832d5 19-Mar-2013 nicolasroard <nicolasroard@google.com> Fix disappearing panels and animations on ICS

bug:8405402

Change-Id: I9c0da8fbf20c424cc64ae5cc1be42414cb2f0964
iltershow/FilterShowActivity.java
iltershow/PanelController.java
4ea01ce27d0aecd1b63d7e99b747c9858fa93b02 16-Mar-2013 nicolasroard <nicolasroard@google.com> Fix xmp crash

Change-Id: I256062b19e540fa77ff982552e62977789caf29b
iltershow/filters/ImageFilterTinyPlanet.java
1ce9b42534da231c85d40be442c455e5b7cbc59e 15-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Refactoring iconbutton.

Change-Id: Ie1538d978605ae28bb4fa6779eb2802794a35312
iltershow/cache/ImageLoader.java
iltershow/tools/IconFactory.java
iltershow/ui/FilterIconButton.java
iltershow/ui/IconButton.java
a2729a16717ec0e7bdaf8fa112d7a1d1760ba2e3 15-Mar-2013 nicolasroard <nicolasroard@google.com> Fix layout issue on rotation

Change-Id: I93956687c5c4332c3ceae6f1e3c7041fb322b041
iltershow/FilterShowActivity.java
0ca39072098a16da35fbe95f91892eca3d6aa077 15-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Fixed more threading bugs in the ImageFilterRS and the FiltersManager." into gb-ub-photos-bryce
ea5355e6aa782bb61fbf079f4811873a67a83808 15-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Fixed more threading bugs in the ImageFilterRS and the FiltersManager.

Bug: 8392832

Change-Id: I87b3af9ddb62524f02858a82eac2cc3bd2209418
iltershow/filters/ImageFilterRS.java
iltershow/filters/ImageFilterSharpen.java
253b0816b2e979a1e4fef1d99df3345483580655 15-Mar-2013 nicolasroard <nicolasroard@google.com> Enable touch panning by default

Change-Id: I7d0ced296fe84c2cfff820fbcb99f5731f9ade44
iltershow/imageshow/ImageShow.java
8d3031b3b2f7c74d9677f72a2979b43766a677de 15-Mar-2013 Bobby Georgescu <georgescu@google.com> Merge "Add many contextual actions to new gallery" into gb-ub-photos-bryce
1a719804ddd5c6fc9a6914ef5a2b6e914834d1f9 14-Mar-2013 Bobby Georgescu <georgescu@google.com> Add many contextual actions to new gallery

Change-Id: Ied57636c7bf0804ad015ddc664e177633c549e08
pp/MuteVideo.java
pp/PhotoPage.java
d7c61b63a1ea0d86cd10861834fd2783c54a4632 14-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Requested RS method rename.

Change-Id: I2f158cb6cfb6ab23907e49c89f93681692e56dfb
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterRS.java
fdb2fbc75750869dacb5e61779e00d93b25aed8e 14-Mar-2013 Tim Murray <timmurray@google.com> Merge "Change element type to A_8 to support sampling." into gb-ub-photos-bryce
c5c19110a65e35602c1c99090d713512130ceb1b 14-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Fix image icons on Razr M.

Change-Id: I9f47dd043055fb5dc25dda643a3e9c81356bd0d5
iltershow/ui/FilterIconButton.java
iltershow/ui/IconButton.java
7428a933c89e2d49036a1854143d5c28078fec75 14-Mar-2013 Tim Murray <timmurray@google.com> Change element type to A_8 to support sampling.

Change-Id: Ib91c924c9c2966bf431e24519af8ade7e360cf88
iltershow/filters/ImageFilterRS.java
8809afdff9cb717023652ce221e1eb2da3a646dd 14-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Fix photo editor RS allocation on orientation change.

Bug: 8383050
Change-Id: Ic549d1f3fae22238dda08260cd7410c6054ce7b1
iltershow/FilterShowActivity.java
6e6a524390d8ddebce5de0dcc8ae258e652ec80a 12-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Exif parser modifications.

Bug: 8018327
Change-Id: I66a2ec309f9807ac255bbf29d8f5f26de60e89b8
ata/Exif.java
ata/LocalImage.java
ata/MediaDetails.java
iltershow/cache/ImageLoader.java
iltershow/tools/SaveCopyTask.java
730685b2b4c286d32d97f92283d12254df284f0c 13-Mar-2013 Bobby Georgescu <georgescu@google.com> Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce
4563676bbf9d32a3dce180123bca7adc6940809e 13-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads." into gb-ub-photos-bryce
575ce6f72fd87a62af1686edb3f17c0041031b86 13-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads.

Bug: 8373600
Bug: 8363001
Bug: 8344345
Bug: 8264659

This CL fixes several things:
- FilteringPipeline no longer leaks a handler thread every time photoeditor is reopened.
- ImageFilterRS no longer leaks an RS context and thread every time photoeditor is reopened.
- ImageFilterRS now uses locking.
- ImageFilterRS no longer leaks Bitmap references or static renderscript allocations.

Change-Id: I79ebde1a8ba8ad689791c2af8db0c3c907e06399
iltershow/FilterShowActivity.java
iltershow/cache/FilteringPipeline.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/ImageFilterRS.java
9b4c3e9fa3f921e40f4abc549983fd35fb0a0a85 13-Mar-2013 Bobby Georgescu <georgescu@google.com> Add coarse grained events for camera mode, filmstrip stats

Change-Id: I9c48f1646e9dff44efd27180065a6435110c5d16
pp/PhotoPage.java
f37648b877bf6029d7afead31e965b473114c89c 13-Mar-2013 Bobby Georgescu <georgescu@google.com> Usage statistics collection for camera module, filmstrip

Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d
pp/PhotoPage.java
pp/StateManager.java
i/PhotoView.java
750798dbb099954b365beedffbc04ee573d11209 13-Mar-2013 nicolasroard <nicolasroard@google.com> Fix preview synchronization

Change-Id: Id6b5e5a140a3c366f2f5d4c29809e83ac1530d04
iltershow/ImageStateAdapter.java
iltershow/cache/FilteringPipeline.java
iltershow/imageshow/ImageShow.java
iltershow/presets/ImagePreset.java
96df19b2a4b7286a01aeb690a38d8c99bc43449c 12-Mar-2013 nicolasroard <nicolasroard@google.com> Add loading resources helper functions to ImageFilterRS

Change-Id: I79b4996b5da0fa05536f2f53f770d01e9735b96c
iltershow/filters/ImageFilterRS.java
b6b5b5a357710b19236d64fb4ee4438724d763a8 12-Mar-2013 nicolasroard <nicolasroard@google.com> Fix potential problem with default rsc number

Change-Id: I8205dbb2488232084f984a10963bb9286ff19e0e
iltershow/filters/ImageFilterFx.java
b2fcd4252cbcee124e68412bb53a8b875ce9ba36 12-Mar-2013 nicolasroard <nicolasroard@google.com> Fix layout on phones

Change-Id: I147b00f1abf032877c7461138ec78149bfd8b519
iltershow/FilterShowActivity.java
8d2c7ee02c8fde53effc787c172b10b14ae34d42 12-Mar-2013 nicolasroard <nicolasroard@google.com> Various bugfixes/improvements for Fx Filters:
- fix bug in history with Fx filters
- don't load Fx bitmaps at startup
- free bitmaps when unneeded
- fix history preview bitmaps

Change-Id: I5631a5bcec12c121871b3575066c201486896a14
iltershow/FilterShowActivity.java
iltershow/HistoryAdapter.java
iltershow/PanelController.java
iltershow/filters/FilterFxRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/ImageFilterFx.java
iltershow/presets/ImagePreset.java
001283a72d451999e3308f45dc365d4defc0af39 11-Mar-2013 John Hoford <hoford@google.com> fix menus for all editors

Change-Id: I93e7eef3176b38480d55df176166646709a875fe
iltershow/editors/Editor.java
iltershow/editors/EditorDraw.java
6f3ff5b486e30221361afd066510a7374962fd09 11-Mar-2013 John Hoford <hoford@google.com> split filter show into multiple files

Change-Id: I3d6b61ed893befa24a8c8306981d74096db91535
iltershow/FilterShowActivity.java
6a07dfbe03c8396cc43840a1630ea480a2cff663 11-Mar-2013 John Hoford <hoford@google.com> refactoring to make Editor classes do more

Change-Id: Id0885929cf3a9410bd0e5d3bf96eb99e8c7e1cf9
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/editors/BasicEditor.java
iltershow/editors/Editor.java
iltershow/editors/EditorCurves.java
iltershow/editors/EditorStraighten.java
iltershow/editors/EditorTinyPlanet.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageShow.java
iltershow/ui/ImageCurves.java
f07bb27436a65b233c1caf4aa06c6257a9cf4046 11-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Clear Gallery's bitmap pool before starting photoeditor.

Change-Id: Iaa1f559db12ba22e53673b2e9fe2c3fbabf33514
iltershow/FilterShowActivity.java
5a17cc93c3a34f0494eaa38353c0ac727086222d 11-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."" into gb-ub-photos-bryce
c01187e2ef31115518cd1eb900ebf4cfa14e1976 11-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."

This reverts commit 65948b17607d6fab9a2561749a90e16889fd1eea

Change-Id: Iea682767fced173fe56dd6e91244f0ef70d1f74b
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/tools/BitmapTask.java
9ecbf66d54204f78e9b51bee6f76d2bde1dc6882 11-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Clear Gallery's bitmap pool on photo editor start. Minor refactoring." into gb-ub-photos-bryce
65948b17607d6fab9a2561749a90e16889fd1eea 11-Mar-2013 Ruben Brunk <rubenbrunk@google.com> Clear Gallery's bitmap pool on photo editor start. Minor refactoring.

Change-Id: I02e29bf6cfd85a9cecd3850f8828cccae91badd2
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/tools/BitmapTask.java
6019ad95f1c85786488d2d4cae1cbb665d33bd30 09-Mar-2013 nicolasroard <nicolasroard@google.com> Add tiled background

Change-Id: I52292f6cae4f1121795829663dc4738cb38a953b
iltershow/FilterShowActivity.java
iltershow/HistoryAdapter.java
iltershow/imageshow/ImageShow.java
402dd963ad8fb1dfed81cca63cbaf82e93533a94 09-Mar-2013 nicolasroard <nicolasroard@google.com> Clear border resources to save memory

Change-Id: I1bd9668eb3c7b2815bdc0123445185c8f9d21ad2
iltershow/FilterShowActivity.java
iltershow/filters/FilterImageBorderRepresentation.java
iltershow/filters/ImageFilterBorder.java
7706e506dc74fa634a69b9ce8c7e5e2c457f01fc 08-Mar-2013 nicolasroard <nicolasroard@google.com> Memory usage improvements, speed improvement
- free filters resources agressively
- implements multiple rendering pipelines
- some cleanup

Change-Id: Ib9ed268b0b2662d0bf5c049adcf046b556954c37
iltershow/cache/BitmapCache.java
iltershow/cache/Cache.java
iltershow/cache/FilteringPipeline.java
iltershow/cache/ImageLoader.java
iltershow/cache/RenderingRequest.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterImageBorderRepresentation.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterRS.java
iltershow/filters/ImageFilterSharpen.java
iltershow/imageshow/MasterImage.java
iltershow/presets/FilterEnvironment.java
iltershow/presets/ImagePreset.java
iltershow/tools/SaveCopyTask.java
0f1d09c93b961369a0e6aef7b6ec708052099e21 09-Mar-2013 nicolasroard <nicolasroard@google.com> Merge "Implements double-tap to zoom" into gb-ub-photos-bryce
33a5a21f513209bd6261b88b060e63ed044b7755 08-Mar-2013 Bobby Georgescu <georgescu@google.com> Merge "Add possibility for UX improvement measurements" into gb-ub-photos-bryce
a7723fb08098c0c7682b02cf459cafa3792a4ce4 07-Mar-2013 Tim Murray <timmurray@google.com> Add convertRGBAtoA.

Change-Id: I358bc0517480883c470df51189f46fb238fde101
iltershow/filters/ImageFilterRS.java
iltershow/filters/grey.rs
4e330be1512162dd0ed4988352cd32017758f3d6 06-Mar-2013 John Hoford <hoford@google.com> Merge "fix undo bug" into gb-ub-photos-bryce
19d2d157146841442feaef6e0be002581b69335b 06-Mar-2013 John Hoford <hoford@google.com> fix undo bug

bug:8319433
Change-Id: If6bea005677b63267130d446e7b0298d21bbb3be
iltershow/FilterShowActivity.java
6f72c44e600a365ab4986ee78fdbfd01a8f4cdb6 06-Mar-2013 nicolasroard <nicolasroard@google.com> Implements double-tap to zoom

Change-Id: I716d847d6320504c963b197f11b0deea1fc338cb
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
63b33e8c7ebeeec2b520fb419d89ada712ad6604 05-Mar-2013 nicolasroard <nicolasroard@google.com> Improves visual history

Change-Id: Ie43e99777d590a504b068d81f327119cca03b9d9
iltershow/FilterShowActivity.java
6ee7feeefec9e99ea6b98408323a416214d0e817 05-Mar-2013 nicolasroard <nicolasroard@google.com> Visual History

Change-Id: I3397c44b8c47985c97de5b82456c03469b2fb8db
iltershow/HistoryAdapter.java
iltershow/cache/RenderingRequest.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
a0adf2113b8728d92f270953ca8cab50335fe68e 05-Mar-2013 nicolasroard <nicolasroard@google.com> Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce
4e1d35506bb72a2a6c16f08f8bd86bdfe8d1c902 05-Mar-2013 nicolasroard <nicolasroard@google.com> Simplify and speed up thumbnail creation

Change-Id: I1423573c600a807081f81d3cb3036b690e426f9e
iltershow/FilterShowActivity.java
iltershow/imageshow/MasterImage.java
iltershow/ui/FilterIconButton.java
fc7d46515db7a3a50f7416c2462030609391cf95 05-Mar-2013 John Hoford <hoford@google.com> fixed vignetnette refresh during pan/zoom

Change-Id: I6bcc13cdd5232a15f199d8f64258c450f045c1cf
iltershow/imageshow/ImageVignette.java
5300e0c54110d67f85fdb2ee9c90be58f50ca4ac 05-Mar-2013 John Hoford <hoford@google.com> fix tiny planet shown after rotation

Change-Id: Ia27f424c7936b8f3c7fb69d3b80966d4f364f116
iltershow/FilterShowActivity.java
cdea10749cbdb6bab8f49f1b5b562b6e89781981 05-Mar-2013 nicolasroard <nicolasroard@google.com> Improves state/history panel behaviour

Change-Id: Icfd071aa5de11f1fe8cbba34f2837d5a850f9a68
iltershow/FilterShowActivity.java
38fc044a6d45e7283f05e6fe800bc5faf9f2e573 05-Mar-2013 nicolasroard <nicolasroard@google.com> UI cleanup

Change-Id: Iaf138455651511e610b640a716820bd846284948
iltershow/FilterShowActivity.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/FilterRedEyeRepresentation.java
276a04dbeb9202239a6a6fec4109ad3c38ba4d5d 01-Mar-2013 nicolasroard <nicolasroard@google.com> Fix preview rendering speed...

Change-Id: I6a6ba3c14a91d60446f28f5dce52fd3c4bc49f79
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/MasterImage.java
36633e241115ff047fff3da5450bbd75adb343f1 01-Mar-2013 nicolasroard <nicolasroard@google.com> Fix disappearing border thumbnails

Change-Id: I9ed43646a353658a590354f13e51dc96fa760442
iltershow/FilterShowActivity.java
3a5556d3ce5dba33021867468ae0d5d222f256db 28-Feb-2013 nicolasroard <nicolasroard@google.com> Improves State panel and Refactor FilterShowActivity
- handles multiple xml layout
- add a portrait layout
- improves the state panel (delete, etc.)

Change-Id: I29762c99cdd467db8705174c660304c8ed673ce2
iltershow/FilterShowActivity.java
iltershow/ImageStateAdapter.java
iltershow/MovableLinearLayout.java
iltershow/PanelController.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
iltershow/ui/FilterIconButton.java
87835aa01412f9ba20eb57ac0cbbad3a19b48623 01-Mar-2013 John Hoford <hoford@google.com> fix imports

Change-Id: I07ac06ae4890bfcae48ea404cf7e67c2b0c084d7
iltershow/EditorPlaceHolder.java
iltershow/HistoryAdapter.java
iltershow/ImageStateAdapter.java
iltershow/cache/ImageLoader.java
iltershow/cache/TripleBufferBitmap.java
iltershow/colorpicker/ColorGridDialog.java
iltershow/editors/BasicEditor.java
iltershow/editors/EditorRedEye.java
iltershow/editors/EditorTinyPlanet.java
iltershow/editors/EditorVignette.java
iltershow/filters/FilterRedEyeRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterCurves.java
iltershow/filters/ImageFilterDraw.java
iltershow/filters/ImageFilterFx.java
iltershow/filters/ImageFilterHighlights.java
iltershow/filters/ImageFilterKMeans.java
iltershow/filters/ImageFilterParametricBorder.java
iltershow/filters/ImageFilterTinyPlanet.java
iltershow/filters/ImageFilterVignette.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageDraw.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImagePoint.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageStraighten.java
iltershow/imageshow/ImageTinyPlanet.java
iltershow/ui/FilterIconButton.java
iltershow/ui/IconButton.java
3a60b6bc3f972dcd3ff6b7812b7ebaf5ca2e4a58 01-Mar-2013 John Reck <jreck@google.com> Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce
d4653680279a85720f792f21e32578ccf5c6c34f 01-Mar-2013 John Hoford <hoford@google.com> fixed hiding of tiny planet

Change-Id: I0d23a640cf4aee5ae03e6552637ba3663db85bde
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/imageshow/EclipseControl.java
26353bc4c528057ae171d89ad3251586b832e69b 01-Mar-2013 John Reck <jreck@google.com> Fix crash if a tile ends up with a width or height of 0

Bug: 8242279

Change-Id: Id8f9d85b46f07fb5aea8063a081524b9a3d992ae
lrenderer/BasicTexture.java
839d529f800adcd1ef5fcd262322bc939c2c2089 28-Feb-2013 nicolasroard <nicolasroard@google.com> Fix for applied ratios

Change-Id: Idbb7366522751c4b330cc99b88129df5808048e9
iltershow/editors/EditorCrop.java
iltershow/editors/EditorFlip.java
iltershow/editors/EditorRotate.java
iltershow/editors/EditorStraighten.java
92720495a2cac79c373bbcc9ccdd0191d746c7c0 28-Feb-2013 nicolasroard <nicolasroard@google.com> Fix crop ratio

bug:8291961

Change-Id: Ia279c35115fbfc0774505bf3318b7fac7d84d2eb
iltershow/imageshow/ImageCrop.java
e8c2b314d8f3c5d79227fae97a0ec1ca68a1e611 28-Feb-2013 Nicolas Roard <nicolasroard@google.com> Revert "Cleanup ImagePreset"

This reverts commit 0f0765676e5be73c7187a44ee88e500ab691bf01

Change-Id: Id5a7eec61cdac3d57c8c4c790d24adf258410545
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
iltershow/ui/FilterIconButton.java
0f0765676e5be73c7187a44ee88e500ab691bf01 28-Feb-2013 nicolasroard <nicolasroard@google.com> Cleanup ImagePreset

Change-Id: I89e180293a290adb76d4fc8a9a8965fa1445440e
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
iltershow/ui/FilterIconButton.java
be61c1fcfae87f00d2b3111b15e90bbf4a88b6bc 28-Feb-2013 John Hoford <hoford@google.com> crop fix

Change-Id: Ie2e79992bf45fffb0ae00c4a4fd879546fa1450f
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/editors/EditorCrop.java
iltershow/imageshow/MasterImage.java
e1c3724ff23c91d8e6d783545fb0f2d3bba8ce2b 28-Feb-2013 nicolasroard <nicolasroard@google.com> Fix full res preview

Change-Id: Ia727d06b9ff9866dfbb883968a23c0ed105e57fa
iltershow/cache/FilteringPipeline.java
65e47f698043f95ed8067e8c41397c472e5e433a 28-Feb-2013 nicolasroard <nicolasroard@google.com> Fix scale and full res preview

Change-Id: Ie432c2d1d631c37f54bd144c22d62cd59d7a665d
iltershow/cache/ImageLoader.java
iltershow/presets/ImagePreset.java
d61a2f9fcaad0309132b6b9b666c3dc6df62fed7 27-Feb-2013 John Hoford <hoford@google.com> refactor the geometry code

Change-Id: I5b0381ec5e127aabf37924af64fbeb490755bc9a
iltershow/EditorPlaceHolder.java
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/cache/ImageLoader.java
iltershow/editors/EditorCrop.java
iltershow/editors/EditorFlip.java
iltershow/editors/EditorInfo.java
iltershow/editors/EditorRotate.java
iltershow/editors/EditorStraighten.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageFlip.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageRotate.java
iltershow/imageshow/ImageStraighten.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
iltershow/ui/FilterIconButton.java
e1d875757bbe6634d7224c4f759d904688de4013 27-Feb-2013 nicolasroard <nicolasroard@google.com> Fix vignette startup draw

Change-Id: Ifaab3167e44db05be6c788e10d234975b1f51b56
iltershow/imageshow/ImageVignette.java
10ece61a285633c1b06921ec7b8ce3c50bb37b73 26-Feb-2013 nicolasroard <nicolasroard@google.com> FilterShowActivity cleanup

Change-Id: Iac674c6ca981b7dafb76af3602c75b925d4cbbed
iltershow/FilterShowActivity.java
iltershow/PanelController.java
69cc3eba9a4405190d6429df52609fb0d7079c52 26-Feb-2013 John Hoford <hoford@google.com> Merge "add upoint" into gb-ub-photos-bryce
0a898008099c6747a1393f81c1b4de92e3bc04eb 26-Feb-2013 John Hoford <hoford@google.com> add upoint

Change-Id: I484d2c6658e4ea06e22fa037ef2262c17b9e8d79
iltershow/PanelController.java
iltershow/imageshow/EclipseControl.java
db4cedf1feb3899840963b2648dc3e2b4d0a1d6f 26-Feb-2013 nicolasroard <nicolasroard@google.com> Disable full res when dealing with jpeg orientation

Change-Id: Ie29f25addcb66a6c8a2effa2bfbf89155ce6465a
iltershow/presets/ImagePreset.java
a3a4c954c6917375a852d3f3c64d0c76693b5677 26-Feb-2013 nicolasroard <nicolasroard@google.com> Fix compare swipe

bug:8266511
iltershow/imageshow/ImageShow.java
8b4c7f99ddd23cfba032f1f2f878d644f0659972 26-Feb-2013 nicolasroard <nicolasroard@google.com> Merge "Fix crash on applying borders" into gb-ub-photos-bryce
f503fda639ee0d5dd765ac8d6372c3c3a74f8d20 26-Feb-2013 nicolasroard <nicolasroard@google.com> Fix crash on applying borders

bug:8265497

Change-Id: I7e6b22cb7666fd3876119051552e34e91df894a2
iltershow/cache/FilteringPipeline.java
iltershow/cache/ImageLoader.java
iltershow/presets/ImagePreset.java
21a01faab1125c5c347a3dfbf6a71de6aec233a1 26-Feb-2013 Ruben Brunk <rubenbrunk@google.com> Fixed more of filtershows large bitmap reference leaks.

Bug: 8253109
Change-Id: Iaff381e759d02baae701a01d6c081c49f4b3c772
iltershow/FilterShowActivity.java
iltershow/cache/FilteringPipeline.java
iltershow/filters/BaseFiltersManager.java
iltershow/presets/ImagePreset.java
iltershow/ui/ImageCurves.java
3847e4e8e26ed6c6f18ee4a6b2984d33051d155e 14-Nov-2012 Bobby Georgescu <georgescu@google.com> Add possibility for UX improvement measurements

Bug: 4293199
Change-Id: I45f8a63c676c8d7700c422a0a18f799fb6d02d2e
pp/AbstractGalleryActivity.java
pp/GalleryAppImpl.java
pp/StateManager.java
5f30b98d6ac98c6aa863d48f47e9b8e2b77a1820 15-Feb-2013 John Reck <jreck@google.com> Start of photos

Change-Id: Id53dd96d8873e0fe6c2685e07cd7bdc0cde7ea75
ata/DataManager.java
d5633ea950ab82be13189705004ce97bce6a5715 22-Feb-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce
b17b1b0758799914fbad5f4a3afae71ce58891fc 22-Feb-2013 Ruben Brunk <rubenbrunk@google.com> Stopgap fixes for more of the photo editor's memory issues.

Bug: 8253109
Bug: 8233895
Change-Id: Idd55618807ff0a0c5ac0cbb8c71db167fa32e70b
iltershow/FilterShowActivity.java
iltershow/cache/FilteringPipeline.java
iltershow/cache/ImageLoader.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterRS.java
ddec680a6d4604bc6fd44b29dfbf964422f40fcb 22-Feb-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Revert "Stopgap fixes for more of the photo editor's memory issues."" into gb-ub-photos-bryce
33ec1c79846ccc8b44014b16b555ad2323943b3c 22-Feb-2013 Ruben Brunk <rubenbrunk@google.com> Revert "Stopgap fixes for more of the photo editor's memory issues."

This reverts commit 4c91156f9a2e48ebaec86e3a46ea9b7855392cfd

Change-Id: If94d87fd4d84bd518b7cc113c3cd422b59fdd3ed
iltershow/FilterShowActivity.java
iltershow/cache/FilteringPipeline.java
iltershow/cache/ImageLoader.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterRS.java
fc673e131aa3482e5202fad1b54208442df35c2c 22-Feb-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce
4c91156f9a2e48ebaec86e3a46ea9b7855392cfd 22-Feb-2013 Ruben Brunk <rubenbrunk@google.com> Stopgap fixes for more of the photo editor's memory issues.

Bug: 8253109
Bug: 8233895
Change-Id: I676b6749f3b273a431323609add01e82b88db456
iltershow/FilterShowActivity.java
iltershow/cache/FilteringPipeline.java
iltershow/cache/ImageLoader.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterRS.java
fae7bf8557f7de818a768d7a8c30425a9a5641d8 22-Feb-2013 Bobby Georgescu <georgescu@google.com> Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce
f52ceba89962829aa12f5caba131580e8da85880 20-Feb-2013 Bobby Georgescu <georgescu@google.com> Replace various BitmapPools with a smarter unified pool

Make all of gallery use a single shared pool, and pave the
way for making the pool more adaptive based on the current
workload.

Change-Id: Ia32561ad50b1b9716ebe2fd32a7bf02737685dac
pp/AbstractGalleryActivity.java
pp/PhotoDataAdapter.java
ata/BitmapPool.java
ata/DecodeUtils.java
ata/ImageCacheRequest.java
ata/MediaItem.java
ngest/IngestService.java
ngest/data/MtpBitmapFetch.java
i/AlbumLabelMaker.java
i/AlbumSetSlidingWindow.java
i/AlbumSlidingWindow.java
i/BitmapLoader.java
i/BitmapTileProvider.java
i/TileImageView.java
i/TileImageViewAdapter.java
i/TiledScreenNail.java
ea332c69f084322ebdd13419424ee5fab2351760 22-Feb-2013 nicolasroard <nicolasroard@google.com> Don't apply the filters twice in partial rendering...

Change-Id: I5ddcb74e2a6cf09852eec0049bee47581b402f28
iltershow/cache/ImageLoader.java
2c87aafc0e4c5f67fe41c0cac301eabb6d5c716e 22-Feb-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce
a24145829118672e8b9b98e18de78eae71daaa08 22-Feb-2013 Ruben Brunk <rubenbrunk@google.com> Move setting wallpaper to a background thread.

Bug: 8088767
Change-Id: I168032418a15f766ac09e18cd12707c7270b07f3
iltershow/FilterShowActivity.java
e5498da0262fc836738aad63ea30286d8afa643c 22-Feb-2013 nicolasroard <nicolasroard@google.com> Pinch to zoom refine

Change-Id: I538defa55a4ed898dd7c936ec813f052ac1b9e0a
iltershow/PanelController.java
iltershow/cache/FilteringPipeline.java
iltershow/cache/ImageLoader.java
iltershow/cache/RenderingRequest.java
iltershow/filters/FilterCurvesRepresentation.java
iltershow/filters/FilterFxRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/ImageFilterBwFilter.java
iltershow/filters/ImageFilterContrast.java
iltershow/filters/ImageFilterEdge.java
iltershow/filters/ImageFilterExposure.java
iltershow/filters/ImageFilterHighlights.java
iltershow/filters/ImageFilterHue.java
iltershow/filters/ImageFilterKMeans.java
iltershow/filters/ImageFilterNegative.java
iltershow/filters/ImageFilterSaturated.java
iltershow/filters/ImageFilterShadows.java
iltershow/filters/ImageFilterSharpen.java
iltershow/filters/ImageFilterVibrance.java
iltershow/filters/ImageFilterWBalance.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageZoom.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
0f8047fe826a84829ab37bc7cd24c8a4dea0db64 22-Feb-2013 Ruben Brunk <rubenbrunk@google.com> Fix for null check with RS allocations.

Bug: 8243554
Change-Id: I49da16f530a7283a801b3739ee7ba06bc7e4dad7
iltershow/filters/ImageFilterRS.java
2fc7efdcd75279649091471dda3ee600db25a995 22-Feb-2013 John Hoford <hoford@google.com> fix draw and ellipse to handle pinch to zoom

Change-Id: I8af9b37dcd98425959742a4142756963363d1cec
iltershow/filters/FilterDrawRepresentation.java
iltershow/imageshow/ImageDraw.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageVignette.java
e406ec4ddcfe6336c4119de9044b27f38197fff7 21-Feb-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Temporary handling when running out of heap in filtershow." into gb-ub-photos-bryce
182659f7e3b04af88198cc3004af96e4944e32e5 21-Feb-2013 Ruben Brunk <rubenbrunk@google.com> Temporary handling when running out of heap in filtershow.

Bug: 8233895
Change-Id: Id078d2a4b387127c0d230bc5d9de4590f0e9f72b
iltershow/cache/ImageLoader.java
iltershow/tools/SaveCopyTask.java
8921c28c7333ad2b4d34f013904ad4737044f366 21-Feb-2013 John Hoford <hoford@google.com> add highlight filter

Change-Id: I2e59e09fbc80172b9dfe27b3ce8ff2f1e24c5872
iltershow/filters/BaseFiltersManager.java
iltershow/filters/ImageFilterHighlights.java
iltershow/filters/SplineMath.java
91b80b2560e663b15ee75ab1bca775028c7868c0 21-Feb-2013 nicolasroard <nicolasroard@google.com> Remove SliderController class

Change-Id: I59ed20a63a59e4c48c0a44ff52d82852ea159331
iltershow/imageshow/ImageShow.java
iltershow/ui/SliderController.java
iltershow/ui/SliderListener.java
4462eac40cd6023251431b60a556afeb0f27e79b 21-Feb-2013 nicolasroard <nicolasroard@google.com> Remove slider in ImageShow, cleanup code

Change-Id: I005d4ecd33a5b6fcd23af6a6ba46419e7c9fc683
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageZoom.java
969fc02063b47fc2151a6fc6ef9af9793da4c08a 21-Feb-2013 nicolasroard <nicolasroard@google.com> Fix typo

Change-Id: I6c41782a033d5ad1bb5780b22d99658223b23a0b
iltershow/imageshow/ImageShow.java
df0b0c4eaafcc9e4652fe6ec0791e4abe1c3b750 15-Feb-2013 nicolasroard <nicolasroard@google.com> Add pinch to zoom

Change-Id: I5d90a7ce5d890f613fa957244c6ac5291496cf1a
iltershow/imageshow/ImageDraw.java
iltershow/imageshow/ImageRedEye.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageZoom.java
iltershow/imageshow/MasterImage.java
iltershow/ui/ImageCurves.java
88158f577a2d80a7a3ab5ad92452b6e32b059271 20-Feb-2013 Ruben Brunk <rubenbrunk@google.com> Removed unsupported GL operations.

Bug: 8223749
Change-Id: I722220def36aa4a9e53666540471100df6609d74
iltershow/imageshow/ImageStraighten.java
c8e006639baf1512715e0d7f2c02f88204ab55c0 20-Feb-2013 Victor Doba <dobavictor@google.com> Merge "Show the Utility Panel by default." into gb-ub-photos-bryce
1863a3119a802517b1c2a53763f904f73fdc940b 20-Feb-2013 John Hoford <hoford@google.com> fix vignette startup issues

Change-Id: I3a8461edf3239044565611ed35b41cb87e5a529f
iltershow/imageshow/EclipseControl.java
iltershow/imageshow/ImageVignette.java
a93d5ee9c409e2328dcbe2326591436f8ac23146 16-Feb-2013 John Hoford <hoford@google.com> add movable vignette

Change-Id: I54f2fccd0d748ca4c908d5b0f3c3ef7349cd686d
iltershow/editors/EditorVignette.java
iltershow/filters/FilterVignetteRepresentation.java
iltershow/filters/ImageFilterVignette.java
iltershow/imageshow/EclipseControl.java
iltershow/imageshow/ImagePoint.java
iltershow/imageshow/ImageRedEye.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageTinyPlanet.java
iltershow/imageshow/ImageVignette.java
iltershow/imageshow/Oval.java
4a94787ffc692090ec83b3f3c402c5d65afde4d9 15-Feb-2013 Bobby Georgescu <georgescu@google.com> Merge "Don't use AsyncTasks to fetch images via MTP" into gb-ub-photos-bryce
824f9fa8bfb8c3c41de865dcff3898bcb73e74e9 15-Feb-2013 Victor Doba <dobavictor@google.com> Show the Utility Panel by default.
iltershow/imageshow/ImageShow.java
37faa3150feebccecd8872658af32bd88a0d2073 14-Feb-2013 Bobby Georgescu <georgescu@google.com> Don't use AsyncTasks to fetch images via MTP

Bug: 8192491

Avoids allocations when scrolling through the importer
grid by not using AsyncTasks anymore (which meant one
object creation per change of the source image). Also
fix an NPE if a device is unplugged during scrolling.

Change-Id: I4e7022ca5d4573402e60b16fbd82ea65bc6627e0
ngest/data/MtpBitmapFetch.java
ngest/ui/MtpImageView.java
aa4c34606a697172987e5ac379e82ce41b7cbaa5 15-Feb-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Fixed crop display for setting contacts/wallpapers." into gb-ub-photos-bryce
ab779def9c3aa45b100872f2369ec2f4a1d9a709 15-Feb-2013 Ruben Brunk <rubenbrunk@google.com> Fixed crop display for setting contacts/wallpapers.

Bug: 8187056
Bug: 8196779
Bug: 8140241

Change-Id: Iaf3d113d9e53d365b73985fdc3350b627f8bda4c
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
12017c1b3bc314b5fee96c3b2a033d7877ea84e4 15-Feb-2013 John Hoford <hoford@google.com> refactor to support many filter based on RedEye

Change-Id: I92ff19d8f750f5bf4c188129580e22990874501e
iltershow/filters/FilterPoint.java
iltershow/filters/FilterPointRepresentation.java
iltershow/filters/FilterRedEyeRepresentation.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterDraw.java
iltershow/filters/ImageFilterRedEye.java
iltershow/filters/RedEyeCandidate.java
iltershow/imageshow/ImagePoint.java
iltershow/imageshow/ImageRedEye.java
4e6c07b71b269ee3fe7f6fa455bc540238df9ded 14-Feb-2013 John Hoford <hoford@google.com> get redeye working again
iltershow/editors/EditorRedEye.java
iltershow/filters/FilterRedEyeRepresentation.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterGeometry.java
iltershow/filters/ImageFilterNegative.java
iltershow/filters/ImageFilterRS.java
iltershow/filters/ImageFilterRedEye.java
iltershow/filters/ImageFilterStraighten.java
iltershow/filters/ImageFilterWBalance.java
iltershow/imageshow/ImageRedEye.java
d4bec864946917e434bfb53846747d665bbe1d07 14-Feb-2013 nicolasroard <nicolasroard@google.com> Fix sync representations

Change-Id: I8b1b159a2350f7ee8bcdc7e71faf82ab5df2755b
iltershow/PanelController.java
iltershow/filters/FilterRepresentation.java
iltershow/presets/ImagePreset.java
ecdda817f112286ac6bab2ac4bf508e7dd8609ac 13-Feb-2013 John Hoford <hoford@google.com> fix draw to support rotation/crop

Change-Id: Iea1db9e42f1fa2b86a452bf1d40b1663b69d03e2
iltershow/cache/RenderingRequest.java
iltershow/filters/ImageFilterDraw.java
iltershow/presets/ImagePreset.java
add77dfcee665d309e5eb20e344e1d10e7c4070e 13-Feb-2013 Bobby Georgescu <georgescu@google.com> Merge "Importer: Full-screen viewing, UI refinement, refactoring" into gb-ub-photos-bryce
19b307f5ef03b63493bd29e8e838a22c323a370a 13-Feb-2013 nicolasroard <nicolasroard@google.com> Pass the ImagePreset to ImageFilter

Change-Id: I4c195a5eb6055c3bb43fed60e76751ed133ab725
iltershow/filters/FilterRepresentation.java
iltershow/filters/ImageFilter.java
iltershow/presets/ImagePreset.java
f7cfa85f7dc2bb29affefff9374f3a4029b8a057 13-Feb-2013 nicolasroard <nicolasroard@google.com> Fix curves slowness

Change-Id: If25f3ce1c3da02daa90405987075b87ce676c84e
iltershow/ui/ImageCurves.java
c8a9e86919dca8938948f97efc3dcbe143e806bf 01-Feb-2013 Bobby Georgescu <georgescu@google.com> Importer: Full-screen viewing, UI refinement, refactoring

Bug: 7990333
Bug: 8151814
Bug: 8037411

This CL adds or changes the following things:
- Full-screen image viewing and UI for switching modes
- Moved general functionality from MtpThumbnailTileView
to MtpImageView to allow for reuse in full-screen image
use-case
- MtpBitmapCache moved from ui to data package
- Orientation now respected when set in image metadata
- Miscellaneous UI consistency issues fixed
- Miscellaneous instability issues fixed

Change-Id: I5f188b763617b693e32fedc03273d711d604922a
ngest/IngestActivity.java
ngest/IngestService.java
ngest/MtpDeviceIndex.java
ngest/adapter/CheckBroker.java
ngest/adapter/MtpAdapter.java
ngest/adapter/MtpPagerAdapter.java
ngest/data/BitmapWithMetadata.java
ngest/data/MtpBitmapFetch.java
ngest/ui/IngestGridView.java
ngest/ui/MtpBitmapCache.java
ngest/ui/MtpFullscreenView.java
ngest/ui/MtpImageView.java
ngest/ui/MtpThumbnailTileView.java
c8aa8ac19118f1c1be1bda63d4d72589aed49da4 13-Feb-2013 nicolasroard <nicolasroard@google.com> Clean up red eye correction

Change-Id: I19a8006ed31767ae8e33388cc5b11b5c68d5ae2d
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/FilterRedEyeRepresentation.java
iltershow/filters/ImageFilterRedEye.java
4b1e6fbdf437b7a25fb3eb18a2ed43c9ab4eccc8 13-Feb-2013 John Hoford <hoford@google.com> fix ranges for various filters

Change-Id: I6790b06c5c4094c442ce19cb2ed7ddb6a4152f3a
iltershow/editors/BasicEditor.java
iltershow/filters/ImageFilterContrast.java
iltershow/filters/ImageFilterExposure.java
iltershow/filters/ImageFilterHue.java
iltershow/filters/ImageFilterNegative.java
iltershow/filters/ImageFilterRedEye.java
iltershow/filters/ImageFilterSaturated.java
iltershow/filters/ImageFilterShadows.java
iltershow/filters/ImageFilterVibrance.java
iltershow/filters/ImageFilterVignette.java
iltershow/filters/ImageFilterWBalance.java
4d25bee70415aabd3fa8439a75d02e14323e187d 13-Feb-2013 nicolasroard <nicolasroard@google.com> Merge "Turn back on the state panel" into gb-ub-photos-bryce
ac75eb409e097ab01622427eabcbb2a3fd2f2c9c 13-Feb-2013 John Hoford <hoford@google.com> Merge "fix the draw clear bug" into gb-ub-photos-bryce
2562a98c156a55b51239fea383838a11a0292c0e 13-Feb-2013 nicolasroard <nicolasroard@google.com> Turn back on the state panel

Change-Id: I22706078d4026ce4e24917c484a30a56de431983
iltershow/ImageStateAdapter.java
iltershow/filters/FilterBasicRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/presets/ImagePreset.java
882d3acccc98ec4a1bbe01d19a66d3e3a564a49b 12-Feb-2013 Tenghui Zhu <ztenghui@google.com> Merge "DO NOT MERGE: Don't call requestLayout from onLayout" into gb-ub-photos-bryce
192a16ce9690f6710c0af4c64d1a2617aff0cae1 07-Feb-2013 Marco Nelissen <marcone@google.com> DO NOT MERGE: Don't call requestLayout from onLayout

Doing a layout within a layout can lead to various problems, so it should
be avoided. There's some logging that warns of this, which got triggered
by CommonControllerOverlay.
I don't know what problem this code was originally trying to solve, but it
doesn't seem to be necessary anymore. The line in question was originally
introduced in change 209a9163d4e8cee0bfe162ae598ef40e6051479c, in Oct 2011.

Note: This has been checked into master, this is just cherry picking into
Bryce branch.

Change-Id: I7651304491a90e8d130f4a0a3b3de8e29c4d0116
pp/CommonControllerOverlay.java
573295249304781fdd5ff5e42c729455f5a1dc7c 12-Feb-2013 John Hoford <hoford@google.com> fix the draw clear bug

Change-Id: I1050c3e1ad1280480f35a03c9d29dc1cd44b515f
iltershow/editors/EditorDraw.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/ImageFilterDraw.java
a0d689f180db4c995d5be39a326b1fb5b21ff5c0 12-Feb-2013 nicolasroard <nicolasroard@google.com> Add null check on the source URI

bug:8181133
Change-Id: I1a7226db3ceb42a759f24c9b70f140a63a4294f0
iltershow/cache/ImageLoader.java
iltershow/tools/SaveCopyTask.java
17ce4d7a189d91ecb677205d1a02479ffea4fc2e 12-Feb-2013 nicolasroard <nicolasroard@google.com> Limit preview size

Change-Id: I4b9b43abcb509407f9244a776d31cc96876a26cd
iltershow/cache/ImageLoader.java
f60760478ec7c78446be0e0c6bc5502d1557974c 12-Feb-2013 nicolasroard <nicolasroard@google.com> Refactor FiltersManager

Change-Id: I4c42ddb90e65e90af873eb8dbe065f4fa3de69ef
iltershow/FilterShowActivity.java
iltershow/cache/FilteringPipeline.java
iltershow/filters/BaseFiltersManager.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/FilterFxRepresentation.java
iltershow/filters/FilterRedEyeRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/FilterTinyPlanetRepresentation.java
iltershow/filters/ImageFilterWBalance.java
iltershow/presets/ImagePreset.java
iltershow/ui/FilterIconButton.java
iltershow/ui/ImageCurves.java
99baf61387ab1ef15bb9db5fa3b2b55591e87059 12-Feb-2013 John Hoford <hoford@google.com> refactor quality to be int

Change-Id: I0470abdbe75cf48c5228e80b9dc060ae6f3d8bbd
iltershow/cache/FilteringPipeline.java
iltershow/cache/ImageLoader.java
iltershow/editors/EditorDraw.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterBwFilter.java
iltershow/filters/ImageFilterContrast.java
iltershow/filters/ImageFilterCurves.java
iltershow/filters/ImageFilterDownsample.java
iltershow/filters/ImageFilterDraw.java
iltershow/filters/ImageFilterEdge.java
iltershow/filters/ImageFilterExposure.java
iltershow/filters/ImageFilterFx.java
iltershow/filters/ImageFilterGeometry.java
iltershow/filters/ImageFilterHue.java
iltershow/filters/ImageFilterKMeans.java
iltershow/filters/ImageFilterNegative.java
iltershow/filters/ImageFilterParametricBorder.java
iltershow/filters/ImageFilterRS.java
iltershow/filters/ImageFilterRedEye.java
iltershow/filters/ImageFilterSaturated.java
iltershow/filters/ImageFilterShadows.java
iltershow/filters/ImageFilterSharpen.java
iltershow/filters/ImageFilterStraighten.java
iltershow/filters/ImageFilterTinyPlanet.java
iltershow/filters/ImageFilterVibrance.java
iltershow/filters/ImageFilterVignette.java
iltershow/filters/ImageFilterWBalance.java
iltershow/filters/SimpleImageFilter.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageDraw.java
iltershow/presets/ImagePreset.java
b01a32825018cfb79f2c965c1c3e3e25b5131229 12-Feb-2013 nicolasroard <nicolasroard@google.com> Add reset bitmap for RS filters

Change-Id: I34e28ca72d13f9b5f8054d8a2c07cfffca4e85c6
iltershow/cache/FilteringPipeline.java
iltershow/filters/ImageFilterRS.java
4a3c526cd15979fbbd46c51dbf508747914f683f 12-Feb-2013 nicolasroard <nicolasroard@google.com> Update thumbnails when the geometry changes

Change-Id: I44d70839efb7e00edfb1e6c1f73296beab09783c
iltershow/imageshow/GeometryListener.java
iltershow/imageshow/MasterImage.java
iltershow/ui/FilterIconButton.java
263eb84489462e5792406710ddb1a9772135b4e9 12-Feb-2013 nicolasroard <nicolasroard@google.com> Merge "Generate thumbnails asynchronously" into gb-ub-photos-bryce
098159c2e78f506fcb63385526e038088fc34759 12-Feb-2013 nicolasroard <nicolasroard@google.com> Generate thumbnails asynchronously

Change-Id: I6a2520fc869280a2a7be9c9b5673e17038964a02
iltershow/cache/FilteringPipeline.java
iltershow/cache/RenderingRequest.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/ui/FilterIconButton.java
iltershow/ui/IconButton.java
c364d9f2de28f79c636fcb145c355da52f52b7ad 12-Feb-2013 John Hoford <hoford@google.com> remove animations if before Jelly Bean

Change-Id: Ifb60390f513f60af2875cbc2218fdc185752e9b2
iltershow/FilterShowActivity.java
iltershow/PanelController.java
e2c4d033de164d886af9d242d8672570730580d6 12-Feb-2013 John Hoford <hoford@google.com> fixes the draw and clean up the UI

Change-Id: Ia52dfc3ec407c307612dcfc91fb61a1fb89e32ec
iltershow/editors/EditorDraw.java
iltershow/filters/ImageFilterDraw.java
iltershow/imageshow/ImageDraw.java
4b2933f87acaebc29556cbab244b56840a90425d 12-Feb-2013 nicolasroard <nicolasroard@google.com> Merge "Adding support for ICS" into gb-ub-photos-bryce
d31603218b1f5f58a3617a21425622790ffff472 12-Feb-2013 nicolasroard <nicolasroard@google.com> Adding support for ICS

Change-Id: I550d461b08a4cc5ceb3cdefd82301d5986325184
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilterBorder.java
12c7c8ed14ca9dff9de64e121282f1970cbe7ae4 09-Feb-2013 John Hoford <hoford@google.com> fix red eye to use the new system

Change-Id: If79106dc3144cce374afd410f5f859692e564b83
iltershow/FilterShowActivity.java
iltershow/editors/EditorRedEye.java
iltershow/editors/EditorTinyPlanet.java
iltershow/filters/FilterRedEyeRepresentation.java
iltershow/filters/ImageFilterRedEye.java
iltershow/imageshow/ImageRedEye.java
iltershow/imageshow/ImageRedEyes.java
32ee1acbd9f9ab0db382f0947a1ca1f3dfe52059 12-Feb-2013 Tim Murray <timmurray@google.com> Merge "Only create one RS context." into gb-ub-photos-bryce
31e52aae5eeefd8383cb238e7dd3047e883968ef 12-Feb-2013 nicolasroard <nicolasroard@google.com> Move useFilterRepresentation to PanelController

Change-Id: I8abd9b2bd1b808df6a84e334b6eaa36b1c16750d
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/ui/FilterIconButton.java
7921e124d57759d6f0887a42ddc360d923e60cdd 12-Feb-2013 Tim Murray <timmurray@google.com> Only create one RS context.

Change-Id: I527da839142cd2e48fb81e8cb02b43f6f87147d6
iltershow/filters/ImageFilterRS.java
6900cad45d240c9a54b92991538b6a33652e766c 11-Feb-2013 nicolasroard <nicolasroard@google.com> Cleaning filters

Change-Id: I413b935f90cebdab37d3db73d7fcb0fe77a64579
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/FilterColorBorderRepresentation.java
iltershow/filters/FilterCurvesRepresentation.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/FilterFxRepresentation.java
iltershow/filters/FilterImageBorderRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/FilterTinyPlanetRepresentation.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterBwFilter.java
iltershow/filters/ImageFilterContrast.java
iltershow/filters/ImageFilterCurves.java
iltershow/filters/ImageFilterDownsample.java
iltershow/filters/ImageFilterDraw.java
iltershow/filters/ImageFilterEdge.java
iltershow/filters/ImageFilterExposure.java
iltershow/filters/ImageFilterFx.java
iltershow/filters/ImageFilterGradient.java
iltershow/filters/ImageFilterHue.java
iltershow/filters/ImageFilterKMeans.java
iltershow/filters/ImageFilterNegative.java
iltershow/filters/ImageFilterParametricBorder.java
iltershow/filters/ImageFilterRedEye.java
iltershow/filters/ImageFilterSaturated.java
iltershow/filters/ImageFilterShadows.java
iltershow/filters/ImageFilterSharpen.java
iltershow/filters/ImageFilterTinyPlanet.java
iltershow/filters/ImageFilterVibrance.java
iltershow/filters/ImageFilterVignette.java
iltershow/filters/ImageFilterWBalance.java
iltershow/filters/SimpleImageFilter.java
iltershow/ui/FilterIconButton.java
cef6ad5d4a60a6e2960f7f72de624d5e60b3908a 09-Feb-2013 nicolasroard <nicolasroard@google.com> Move filter type to representations

Change-Id: I2d49447c57f4ff49001d27cdfa6482ca320c7a8b
iltershow/filters/FilterColorBorderRepresentation.java
iltershow/filters/FilterFxRepresentation.java
iltershow/filters/FilterImageBorderRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterDraw.java
iltershow/filters/ImageFilterFx.java
iltershow/filters/ImageFilterParametricBorder.java
iltershow/filters/ImageFilterTinyPlanet.java
iltershow/filters/ImageFilterVignette.java
iltershow/filters/ImageFilterWBalance.java
iltershow/presets/ImagePreset.java
50ffa17594ab620b62db0cbb98d0b3a0fb4ac4fc 09-Feb-2013 nicolasroard <nicolasroard@google.com> Fix crash when reset

Change-Id: Ibab01c4e218e30f3f4a67665d99dbc14bdc7d8ea
iltershow/PanelController.java
4aabe9d1793ba797324cd7507f8d239d06fb547d 09-Feb-2013 nicolasroard <nicolasroard@google.com> Merge "Fix loading screen" into gb-ub-photos-bryce
733a013ae1f2fe9979fb5a277b98af1544b8afb7 09-Feb-2013 nicolasroard <nicolasroard@google.com> Fix loading screen

Change-Id: Id41c4c93782bea7f11d75f0ddcdd4529f4fc9758
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
44a499a64158cd5a12f8e44655f82b68c33bf3b2 08-Feb-2013 John Hoford <hoford@google.com> Fix tiny planet to work with the new framework

Change-Id: I57e87ade6f2cfdfee1b237cdfdf5914244ee98aa
iltershow/FilterShowActivity.java
iltershow/editors/EditorTinyPlanet.java
iltershow/filters/FilterTinyPlanetRepresentation.java
iltershow/filters/ImageFilterDraw.java
iltershow/filters/ImageFilterTinyPlanet.java
iltershow/imageshow/ImageTinyPlanet.java
8029c8567a162eb66fe54255bdeae264d594278d 08-Feb-2013 John Hoford <hoford@google.com> remove slider from FX and Border UI

Change-Id: Ic1c38734c4351ab0150b90d5d4fc575cce9db9e9
iltershow/FilterShowActivity.java
iltershow/editors/ImageOnlyEditor.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterFx.java
6d088c527485fb098833f8868a93bacd7d372443 08-Feb-2013 nicolasroard <nicolasroard@google.com> Merge "Fix leaks / init" into gb-ub-photos-bryce
588c30c74178bc399b043a5401f0c1f93ae22378 08-Feb-2013 nicolasroard <nicolasroard@google.com> Fix leaks / init

Change-Id: I5befdc24cc89cdcfb73ee4d13f076b1c4a585cf6
iltershow/FilterShowActivity.java
iltershow/filters/FilterImageBorderRepresentation.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterRS.java
iltershow/imageshow/MasterImage.java
2db8b143cdcdecd81916c09e19e4c65e582dccf5 08-Feb-2013 Bobby Georgescu <georgescu@google.com> Change transition from Gallery to Filtershow

Bug: 8163894
Change-Id: Iaed600df39a88b176cb8ed3316d187c26c6b7961
pp/PhotoPage.java
8b9ea2fe62d9bcc342e0d69e94be1cb9b87ee0ba 08-Feb-2013 Bobby Georgescu <georgescu@google.com> Replace background getDrawable calls to avoid ANR

Bug: 8148243
Change-Id: I0b94c647bd39b2aabd9cd5316a82b3ef3573b710
iltershow/FilterShowActivity.java
856acb652fad51d650723a890cac08c536363fcd 08-Feb-2013 nicolasroard <nicolasroard@google.com> Cleanup

Change-Id: I30ccd935876a8cbf580d06c037b4bc7f86dafa42
iltershow/filters/FilterCurvesRepresentation.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/FilterFxRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterBwFilter.java
iltershow/filters/ImageFilterCurves.java
iltershow/filters/ImageFilterDraw.java
iltershow/filters/ImageFilterFx.java
iltershow/filters/ImageFilterGeometry.java
iltershow/filters/ImageFilterGradient.java
iltershow/filters/ImageFilterHue.java
iltershow/filters/ImageFilterParametricBorder.java
iltershow/filters/ImageFilterRedEye.java
iltershow/filters/ImageFilterShadows.java
iltershow/filters/ImageFilterStraighten.java
92e387187a872b3b0986b378954eb611aa83fdea 08-Feb-2013 nicolasroard <nicolasroard@google.com> Fix borders

Change-Id: Ia77660872f3baf10968e20b5656d97c4fbfc815e
iltershow/FilterShowActivity.java
iltershow/filters/FilterColorBorderRepresentation.java
iltershow/filters/FilterFxRepresentation.java
iltershow/filters/FilterImageBorderRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterParametricBorder.java
iltershow/presets/ImagePreset.java
41a03af3dec8915b5055570ad0631071346da40f 08-Feb-2013 nicolasroard <nicolasroard@google.com> Add todo

Change-Id: I54fd72da364337833f80a0f1913beadf2af74277
iltershow/filters/FilterFxRepresentation.java
933f357aeeeba53ed9d3267107ab52dcb4a0fe5f 08-Feb-2013 nicolasroard <nicolasroard@google.com> Merge "Fix Fx filters" into gb-ub-photos-bryce
d0bab8c396b0b10fdfd07a9d4fccf969d8d46747 08-Feb-2013 nicolasroard <nicolasroard@google.com> Fix Fx filters

Change-Id: Id501ec3a7b4880e697e2b90c056a57fb3ec456ea
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/FilterBasicRepresentation.java
iltershow/filters/FilterFxRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/ImageFilterFx.java
iltershow/ui/FilterIconButton.java
19161944e0efb1ffe23274d7cf5315ce047e9dac 05-Feb-2013 John Hoford <hoford@google.com> fix draw and curves to use FilterRepresentation

Change-Id: I500d9c04ea0e55cbc9b1927dee2f6a19a67d5349
iltershow/cache/ImageLoader.java
iltershow/editors/EditorCurves.java
iltershow/editors/EditorDraw.java
iltershow/filters/FilterCurvesRepresentation.java
iltershow/filters/FilterDrawRepresentation.java
iltershow/filters/ImageFilterCurves.java
iltershow/filters/ImageFilterDraw.java
iltershow/imageshow/ImageDraw.java
iltershow/imageshow/MasterImage.java
iltershow/ui/ImageCurves.java
iltershow/ui/Spline.java
a31f446dca49c0915f8a08456d7bb7abe6f3037d 07-Feb-2013 nicolasroard <nicolasroard@google.com> Fix flashing on geometry preview

Change-Id: I0f05d654c1c4373016d2d5766eb983a47fab2780
iltershow/PanelController.java
3df4f831396ffbc11e4bbee0b6150794e8e44e0b 07-Feb-2013 nicolasroard <nicolasroard@google.com> Fix filters only + geometry only rendering

Change-Id: Id8f0637ae53864488cb931def196ee50ae807f5c
iltershow/cache/FilteringPipeline.java
iltershow/cache/RenderingRequest.java
iltershow/cache/RenderingRequestCaller.java
iltershow/filters/ImageFilterRS.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/MasterImage.java
cf0b2aad3bc5d80c51316ae10e1cf2c3476259aa 06-Feb-2013 nicolasroard <nicolasroard@google.com> Refactor to use direct manipulations of FilterRepresentations.

Change-Id: If5f92f137283cb126835be004d315942ff95021c
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/cache/FilteringPipeline.java
iltershow/cache/ImageLoader.java
iltershow/cache/TripleBufferBitmap.java
iltershow/editors/BasicEditor.java
iltershow/editors/Editor.java
iltershow/filters/ImageFilterRS.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
5b85b092af404effd32aa513f9c45a0232d7ae81 05-Feb-2013 nicolasroard <nicolasroard@google.com> fix editor visibility

Change-Id: I0c9c5273b49974884b8bdf365211b33de54c5598
iltershow/EditorPlaceHolder.java
iltershow/FilterShowActivity.java
iltershow/PanelController.java
1c82642e74b9a8cec93f3fb0ecb2d06ec4593a76 05-Feb-2013 nicolasroard <nicolasroard@google.com> Merge "Refactor filters parameters - introduce FilterRepresentations - change filters lifecycle" into gb-ub-photos-bryce
d78be769b9bc48a78d3220b9016344e9d794c114 05-Feb-2013 John Reck <jreck@google.com> Cleanup

Move Canvas to com.android.photos.canvas
Remove workaround for b/8079561

Change-Id: I14b832d5935eb8704e96e5591c58f33a7cd4de31
pp/Gallery.java
rovider/CanvasProvider.java
rovider/CanvasProviderBase.java
71f04cbaedbb89e313e0b86b531640db2d3f6016 29-Jan-2013 nicolasroard <nicolasroard@google.com> Refactor filters parameters
- introduce FilterRepresentations
- change filters lifecycle

Change-Id: I9416fca47a334d532a347cd5577795738c870933
iltershow/FilterShowActivity.java
iltershow/ImageStateAdapter.java
iltershow/PanelController.java
iltershow/cache/FilteringPipeline.java
iltershow/editors/BasicEditor.java
iltershow/editors/EditorDraw.java
iltershow/filters/FilterBasicRepresentation.java
iltershow/filters/FilterDirectRepresentation.java
iltershow/filters/FilterRepresentation.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterBwFilter.java
iltershow/filters/ImageFilterContrast.java
iltershow/filters/ImageFilterCurves.java
iltershow/filters/ImageFilterDownsample.java
iltershow/filters/ImageFilterDraw.java
iltershow/filters/ImageFilterEdge.java
iltershow/filters/ImageFilterExposure.java
iltershow/filters/ImageFilterFx.java
iltershow/filters/ImageFilterHue.java
iltershow/filters/ImageFilterKMeans.java
iltershow/filters/ImageFilterNegative.java
iltershow/filters/ImageFilterParametricBorder.java
iltershow/filters/ImageFilterRedEye.java
iltershow/filters/ImageFilterSaturated.java
iltershow/filters/ImageFilterShadows.java
iltershow/filters/ImageFilterSharpen.java
iltershow/filters/ImageFilterTinyPlanet.java
iltershow/filters/ImageFilterVibrance.java
iltershow/filters/ImageFilterVignette.java
iltershow/filters/ImageFilterWBalance.java
iltershow/filters/SimpleImageFilter.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
iltershow/ui/FilterIconButton.java
iltershow/ui/ImageCurves.java
7d07201654ef965f3fe2e322a857fc911cc54ec9 05-Feb-2013 John Reck <jreck@google.com> Merge "Handle syncing better" into gb-ub-photos-bryce
4fd2a8aaa508cad4280a0de47294305cfa68fb3d 05-Feb-2013 John Reck <jreck@google.com> Handle syncing better

Bug: 8104531
Limit to every 15 minutes
Avoid requesting a sync on a MediaSet that's already syncing

Change-Id: Iac4522cd305c64696317cc7088b0e851a2b81893
rovider/CanvasProvider.java
rovider/CanvasProviderBase.java
a64051696e46fb5d5e1c76e53ac95a4feba18585 04-Feb-2013 Tim Murray <timmurray@google.com> Switch Gallery over to RS compatibility library.

Change-Id: If27809236534f3b196949bf455faed45c99f3da5
iltershow/cache/FilteringPipeline.java
iltershow/filters/ImageFilterRS.java
87e889b195de98334048bb70bb1263a2ab76c76a 02-Feb-2013 John Hoford <hoford@google.com> fix performance problem with large images in draw

Change-Id: I9fa5a90e58273c6dd6e80d7d0bf07c3371a6f10e
iltershow/colorpicker/ColorOpacityView.java
iltershow/filters/ImageFilterDraw.java
ff7743f592fa5499acdbbbb9a0d303ace6f6e08b 01-Feb-2013 John Hoford <hoford@google.com> Merge "fix sharpen to work under the new system" into gb-ub-photos-bryce
c0b84ec1fe2573fba76784cec4c1e663254b2bb5 01-Feb-2013 John Hoford <hoford@google.com> fix sharpen to work under the new system

Change-Id: I25518a05511c8b2279ba171bc3902e8cb3181c19
iltershow/editors/BasicEditor.java
iltershow/editors/EditorZoom.java
iltershow/filters/ImageFilterSharpen.java
9090141f56b4e2000704d0c4a778d3a819821726 01-Feb-2013 nicolasroard <nicolasroard@google.com> Fix async loading of borders

bug:8099597
Change-Id: I62584c87eff03539ec50aafafda4238850b4f743
iltershow/FilterShowActivity.java
1b1a79f1ccb6f847d017a72fa4c288b2195ffd99 01-Feb-2013 John Hoford <hoford@google.com> Fix curves refresh bug

Change-Id: I5c85dcfa118345d24a5fef120541741e7d1cbdd6
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterCurves.java
915d60a378b0ca7bbe3af6312ccd2f4b94eb2da1 25-Jan-2013 John Hoford <google.com> add color selection ui to draw

Change-Id: Ie2fa3522141e4f98e2b7f805c1ebe3385083bb02
iltershow/FilterShowActivity.java
iltershow/colorpicker/ColorGridDialog.java
iltershow/colorpicker/ColorListener.java
iltershow/colorpicker/ColorOpacityView.java
iltershow/colorpicker/ColorPickerDialog.java
iltershow/colorpicker/ColorRectView.java
iltershow/colorpicker/ColorValueView.java
iltershow/colorpicker/RGBListener.java
iltershow/editors/EditorDraw.java
iltershow/filters/ImageFilterDraw.java
iltershow/imageshow/ImageDraw.java
5540a0d130aa295d11e908719923faec3bce4029 31-Jan-2013 John Reck <jreck@google.com> Merge "show enable sync option for canvas" into gb-ub-photos-bryce
c869018975bdfb85b74991491e377d930c848f68 31-Jan-2013 John Reck <jreck@google.com> show enable sync option for canvas

Temporary change for testing

Change-Id: I46305cb3b182e0a48625bf4fcad3205334ade961
rovider/CanvasProvider.java
rovider/CanvasProviderBase.java
27f14ec6ff7565d96f6c838e7417a25c15beade3 31-Jan-2013 nicolasroard <nicolasroard@google.com> Merge "Clean up invalidate / redraw loop Move the recopy to the main thread" into gb-ub-photos-bryce
6205c8100d7c0ec2a2db0baf9f043ae472a8da29 29-Jan-2013 nicolasroard <nicolasroard@google.com> Clean up invalidate / redraw loop
Move the recopy to the main thread

Change-Id: I8c94179e292f5679b7c817b6bd5000ee384b83ce
iltershow/FilterShowActivity.java
iltershow/cache/FilteringPipeline.java
iltershow/editors/BasicEditor.java
iltershow/filters/ImageFilter.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
e606b862f26ba9e499db4f15940f8200841b9dc3 29-Jan-2013 John Reck <jreck@google.com> Extract constants/boilerplate

Change-Id: I52ba51bab6ec12f2925384c1eedbba96e02bfa97
rovider/CanvasProvider.java
rovider/CanvasProviderBase.java
4588a3cb75457f98b6b0fd1b7dc41e9db2079b16 29-Jan-2013 nicolasroard <nicolasroard@google.com> Merge "Fix thumbnail generation" into gb-ub-photos-bryce
2da455143a4cb59d289f24c23b8f93c29da14fd0 29-Jan-2013 Bobby Georgescu <georgescu@google.com> Merge "Importer: when view is reused for same image, don't reload" into gb-ub-photos-bryce
c03c4360a10ac519b00cc75dd02794536c72182b 29-Jan-2013 nicolasroard <nicolasroard@google.com> Fix thumbnail generation

Change-Id: I03a290bf8eb80bd1687bfd37640dec29ef213cdb
iltershow/FilterShowActivity.java
iltershow/ui/IconButton.java
c216dce5c35b6176147b42a041ca85fa2dcca2a4 29-Jan-2013 Bobby Georgescu <georgescu@google.com> Importer: when view is reused for same image, don't reload

Bug: 7968780
Change-Id: I6786d140e516ff60562c5c0b1222fca0ea153216
ngest/adapter/MtpAdapter.java
ngest/ui/MtpThumbnailTileView.java
7bbdf56b74ec0ba029b1fc5f0d96cf8e8c1e7618 29-Jan-2013 nicolasroard <nicolasroard@google.com> Merge "Fix scaling + quality parameters" into gb-ub-photos-bryce
2efd71f989845ba9fc686b4772cdc4c9bb5c9850 29-Jan-2013 nicolasroard <nicolasroard@google.com> Fix scaling + quality parameters

Change-Id: I92e7759282e0f3cc7be8ff95a19a4acb890d214d
iltershow/cache/FilteringPipeline.java
iltershow/cache/ImageLoader.java
b380f17426f419e3663da80985dc62f544d47048 29-Jan-2013 Bobby Georgescu <georgescu@google.com> Add comment about MenuExecutor assumptions in BatchService

Bug: 7998915
Change-Id: Ibb73585bf2f81b4a1daadfeb814828ec7b55441d
pp/BatchService.java
d0f8807ca66b006e4049e32ad187a808c42e1f00 29-Jan-2013 John Reck <jreck@google.com> Merge "Launching gallery shows browse ui on canvas" into gb-ub-photos-bryce
2251adcd841d597eb6673fc6d2810979753ceb73 29-Jan-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Fixed BasicEditor NPE." into gb-ub-photos-bryce
7805371bbe17bca129bfd1902f23227b27312854 29-Jan-2013 Bobby Georgescu <georgescu@google.com> Merge "Fix ANRs due to waiting for IO on UI thread" into gb-ub-photos-bryce
3a67b242889f81d3a124de7a9763a6ca72bc5194 29-Jan-2013 nicolasroard <nicolasroard@google.com> Fix apply geometry.

bug:8068166
Change-Id: I3cfa44dda1af1fbd5455db6027d793b5a44dd5d8
iltershow/presets/ImagePreset.java
iltershow/tools/SaveCopyTask.java
10dbc7c56452f19fc3f9e54d9d060feea1e6767a 29-Jan-2013 John Reck <jreck@google.com> Launching gallery shows browse ui on canvas

Change-Id: I3a5e63ce354ac8e3f3c60e4dc86cfa4432026622
pp/Gallery.java
rovider/CanvasProvider.java
e30ec70e8d4064b1c2da824aae5cf3d11c86cc5e 29-Jan-2013 Ruben Brunk <rubenbrunk@google.com> Fixed BasicEditor NPE.

Bug: 8068020
Change-Id: I81df163d9779ae3e246f4e337b64dfbc32ce7db5
iltershow/editors/BasicEditor.java
d00f521a3138a8f244c91748b0277290edbf61f6 29-Jan-2013 Bobby Georgescu <georgescu@google.com> Fix ANRs due to waiting for IO on UI thread

Bug: 7998915
Change-Id: I938145a7072170f713099a04578f98951b35cbab
pp/AbstractGalleryActivity.java
pp/PhotoPage.java
i/MenuExecutor.java
ca593b02ab6a3054f625878621ee5117953f7385 28-Jan-2013 John Reck <jreck@google.com> Code drop

Change-Id: Ibee7c3a1aed61dbe9d3d62ad7f3d3653994c8ef8
rovider/CanvasProvider.java
240634303ac2368ab0faa19a8f8f4687cac5fc1e 23-Jan-2013 Stephen Hines <srhines@google.com> Revert "Switch Gallery over to RS compatibility library."

This reverts commit 0746ce0977cde616d25ce35fee0d8d554235a21c

Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50
iltershow/cache/FilteringPipeline.java
iltershow/filters/ImageFilterRS.java
0746ce0977cde616d25ce35fee0d8d554235a21c 17-Jan-2013 Stephen Hines <srhines@google.com> Switch Gallery over to RS compatibility library.

Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad
iltershow/cache/FilteringPipeline.java
iltershow/filters/ImageFilterRS.java
57eedfd99676913f575b1f76e3a874026d1ddf7c 16-Jan-2013 nicolasroard <nicolasroard@google.com> Better caching for RS filters

Change-Id: I78eaa90e408059cf1c59fc06920f5aef82ae2c0d
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/cache/DelayedPresetCache.java
iltershow/cache/DirectPresetCache.java
iltershow/cache/FilteringPipeline.java
iltershow/cache/ImageLoader.java
iltershow/cache/TripleBufferBitmap.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterRS.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageZoom.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
191ed02506583bab787adb9baef60f50f7661b3a 19-Jan-2013 John Reck <jreck@google.com> Merge "Tweaks for canvas" into gb-ub-photos-bryce
4ea5c27007e38fa8583add4bacf268ba67b9f0ad 19-Jan-2013 John Reck <jreck@google.com> Tweaks for canvas

Change-Id: I9aecf757047f93159212441e5317ef2b3b304a70
pp/Gallery.java
pp/MovieActivity.java
pp/PhotoPage.java
ata/MediaSet.java
9c00ee2117b103e159d5f58f8d1e31b3db5a205d 19-Jan-2013 John Hoford <hoford@google.com> Merge "refactor the filter/editor relationship" into gb-ub-photos-bryce
5aa08941bda0cfbcfba522c53937dd66867f890d 18-Jan-2013 John Hoford <hoford@google.com> refactor the filter/editor relationship

Change-Id: I1f9a735166c28c65734fbb85201774fb6f664076
iltershow/EditorPlaceHolder.java
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/editors/BasicEditor.java
iltershow/editors/Editor.java
iltershow/editors/EditorCurves.java
iltershow/editors/EditorZoom.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterHue.java
iltershow/imageshow/ImageDraw.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/MasterImage.java
5a1adfcb2d9a6a7402989d152dd3443f48c321dd 18-Jan-2013 Bobby Georgescu <georgescu@google.com> Fix importer crashes on unplug during scrolling

Bug: 8035040
Change-Id: If822b15f2210e2af42c8a38f6ac2acb25d535aa9
ngest/ui/MtpBitmapCache.java
eebf9e81673150a6c4fec89b64e3cdb595377c83 17-Jan-2013 Bobby Georgescu <georgescu@google.com> Fix importer crashes when unplugging during indexing

Bug: 8027984
Slightly refactored the indexing step to encapsulate all
of the indexing work within the runnable that does it and
to correctly handle the cases where the device is unplugged
in the middle of the indexing.

Change-Id: I338657bbbedd6b82d012f65cd1ea28e0afd890c2
ngest/MtpDeviceIndex.java
6516d271e11f9ae9928be3bb70c99531a842c577 17-Jan-2013 Bobby Georgescu <georgescu@google.com> Show status in importer for empty or no device

Bug: 8000251
Change-Id: Iefbbe6df59f432ffeb10ac9fa846a8908584ab58
ngest/IngestActivity.java
ngest/MtpDeviceIndex.java
ngest/adapter/MtpAdapter.java
b1cabf78e719ef8c40dad44eee38b9884e8f9258 17-Jan-2013 John Reck <jreck@google.com> Merge "New loading model" into gb-ub-photos-bryce
f4f43e7dbc85ab8b7437e8f1d6ab0317470e70b6 16-Jan-2013 John Reck <jreck@google.com> New loading model

Rename reload() to loadIfDirty()
loadIfDirty is implemented by MediaSet and is final
loadIfDirty is now blocking instead of async
Subclasses must implement two protected methods, isDirtyLocked() and load()

The change from async reload() to sync loadIfDirty() should be fine since
all users of reload() were doing so from a background thread already, and the
longest load() is PicasaAlbumSet which is still a fairly brisk 40ms or so

Change-Id: If5cc596a1c13e52e5f4efff1a144bd086d37cfb7
pp/AlbumDataLoader.java
pp/AlbumSetDataLoader.java
pp/PhotoDataAdapter.java
pp/SlideshowPage.java
ata/ClusterAlbum.java
ata/ClusterAlbumSet.java
ata/ComboAlbum.java
ata/ComboAlbumSet.java
ata/FilterDeleteSet.java
ata/FilterEmptyPromptSet.java
ata/FilterTypeSet.java
ata/LocalAlbum.java
ata/LocalAlbumSet.java
ata/LocalMergeAlbum.java
ata/MediaSet.java
ata/MediaSetWrapper.java
ata/SecureAlbum.java
ata/SingleItemAlbum.java
ata/SnailAlbum.java
adget/MediaSetSource.java
e4130faa8418fef36fc022891e0b215ce714f5d1 16-Jan-2013 Bobby Georgescu <georgescu@google.com> Merge "Always have determinate progress in import notification" into gb-ub-photos-bryce
a7a73f3f8ea26835c376f38e75bcef12a25cac26 16-Jan-2013 Bobby Georgescu <georgescu@google.com> Always have determinate progress in import notification

Bug: 7967520
Change-Id: Iaeb5f2e3d508d964856faaea63475cbc25e13c0d
ngest/IngestService.java
48d4284a9ce804ba00b22e587a8b3d27ef9928c1 16-Jan-2013 John Reck <jreck@google.com> Merge "Add a blocking load to MediaSet" into gb-ub-photos-bryce
f63e1f7ab9a4f4a97909564cfc5975cbac66872f 16-Jan-2013 Bobby Georgescu <georgescu@google.com> Importer date tiles reflect language change

Bug: 8020035
Change-Id: I1ac2a27ca7be088e6ad6f9b8c624c36e04ff03b0
ngest/IngestActivity.java
ngest/ui/DateTileView.java
b0b369e84733d047419ca38c215e73ba7ea402f1 16-Jan-2013 John Reck <jreck@google.com> Add a blocking load to MediaSet

Change-Id: I367975fd33f884fb7e576b7064c495bdb7a3ce7b
ata/ComboAlbumSet.java
ata/MediaSet.java
aeb7d79d2a35f534276bc6bf8128349f9768ae6b 16-Jan-2013 Ruben Brunk <rubenbrunk@google.com> Fix exif data saving for picasa images.

Bug: 7910836
Change-Id: I8ec1a1ab379c35b0602689a8f7850f5c861e0189
iltershow/cache/ImageLoader.java
iltershow/tools/SaveCopyTask.java
63a7dac01d394523799939596b960cb03321798d 14-Jan-2013 John Hoford <hoford@google.com> refactoring imageshow

Change-Id: I6d0872250b31a427ea6a3e46bd1c9ca5f3ba92ee
iltershow/FilterShowActivity.java
iltershow/HistoryAdapter.java
iltershow/PanelController.java
iltershow/cache/DirectPresetCache.java
iltershow/filters/ImageFilterRS.java
iltershow/imageshow/ImageDraw.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageRedEyes.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSlave.java
iltershow/imageshow/ImageTinyPlanet.java
iltershow/imageshow/ImageZoom.java
iltershow/imageshow/MasterImage.java
iltershow/presets/ImagePreset.java
iltershow/ui/FilterIconButton.java
iltershow/ui/ImageCurves.java
9313869da345937c60363ff97ae8e8320c48082c 14-Jan-2013 Ruben Brunk <rubenbrunk@google.com> Fixed ClassCastException on open crop aspect menu.

Bug: 7999315
Change-Id: I78bd4c12f5241215629f6eb06fdc7b101ed6ddb6
iltershow/imageshow/ImageCrop.java
c5029eafeebd5fccd68b07a809ce6c66009f4ca6 13-Jan-2013 George Mount <mount@google.com> Merge "Fix LightCycle capture NullPointerException." into gb-ub-photos-bryce
44a1b22eb7098819ac0251764b9fa686d8339d66 13-Jan-2013 George Mount <mount@google.com> Fix LightCycle capture NullPointerException.

Bug 7987002
During capture animation, allow LightCycle to write the
current frame to a texture, then use that texture for drawing
the background image.

Change-Id: I7891e5cac18ee21ff17910790397459f9d57e408
lrenderer/BasicTexture.java
lrenderer/GLES20Canvas.java
lrenderer/RawTexture.java
2e1a644f97a81931bf9b53d8bdf089bb7d4b1048 19-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Refactoring button class. Minor bug fixes.

Bug: 7875246
Bug: 7459118

Change-Id: Ic1099a7ae0feeeb16c8be3035f9726805149666e
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterDownsample.java
iltershow/filters/ImageFilterFx.java
iltershow/filters/ImageFilterParametricBorder.java
iltershow/imageshow/ImageBorder.java
iltershow/imageshow/ImageSmallBorder.java
iltershow/imageshow/ImageSmallFilter.java
iltershow/ui/FilterIconButton.java
iltershow/ui/IconButton.java
iltershow/ui/ImageButtonTitle.java
91a2d2ff465a7a2347e5b72320216ea04aec2607 10-Jan-2013 George Mount <mount@google.com> Merge "Fix slide show animation so that cross fades work." into gb-ub-photos-bryce
bdb71cc6acbd78d5aa02d2e142b792247fb6e0bd 08-Jan-2013 George Mount <mount@google.com> Fix slide show animation so that cross fades work.

Bug 7961297
Removed the "Additive" blending, which didn't do anything, even in
OpenGL ES 1.1 implementation. Modified the texturing to
change the color of the pixels based on the supplied alpha
rather than modifying the alpha. This appears to match the
implementation in the OpenGL ES 1.1 pipeline.

Change-Id: I52491af1a8a2d727968e4e805bc4bc61647f5cf2
lrenderer/GLCanvas.java
lrenderer/GLES11Canvas.java
lrenderer/GLES20Canvas.java
i/SlideshowView.java
f93e60c1b334d510940406c736559895462aac31 09-Jan-2013 nicolasroard <nicolasroard@google.com> Refactor filters management

Change-Id: I0e75ad534cf8cc74a132f97836eedd35baeebeae
iltershow/FilterShowActivity.java
9b37253209fcbb9fe2278aec8d6b66b43808645f 29-Dec-2012 John Hoford <hoford@google.com> Add the Drama filter

Change-Id: I6f026f899b9d991bd6f9e74445f68114041fe781
iltershow/FilterShowActivity.java
7fc87e69cb1f8e687de6f17b41a9b6bb2acad3bb 08-Jan-2013 John Hoford <hoford@google.com> Merge "Add a Draw filter" into gb-ub-photos-bryce
db94725c415a9e16abfce05c0315bd7c1c3ecce2 08-Jan-2013 John Hoford <hoford@google.com> Add a Draw filter

Change-Id: I67aecc9241b4534491fb838b84d0da1a6edbbb54
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterDraw.java
iltershow/imageshow/ImageDraw.java
d385f6ddb35b0ed5797bf1d1c269dbcb56055b12 08-Jan-2013 nicolasroard <nicolasroard@google.com> Merge "Refactoring UI editors" into gb-ub-photos-bryce
9820e7e753b7e1977ef3d2163605431769ce9165 08-Jan-2013 nicolasroard <nicolasroard@google.com> Refactoring UI editors

bug:7688780
Change-Id: I30f8691788332a01d591435474a84cc352b71138
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageShow.java
iltershow/ui/FramedTextButton.java
iltershow/ui/ImageCurves.java
fa0678a153de28096e07522d9e4e98d345ff544a 08-Jan-2013 George Mount <mount@google.com> Merge "Instantiate GLCanvas rather than reinitialize current GLCanvas." into gb-ub-photos-bryce
50b33abe053ccab7be3d1bca2328e792507963d4 07-Jan-2013 George Mount <mount@google.com> Instantiate GLCanvas rather than reinitialize current GLCanvas.

GLCanvas was being used as a singleton when it really should
allow separate instances for correctness.

Change-Id: I650884e843a4a78997b70826f6012ae19b8df549
lrenderer/ExtTexture.java
lrenderer/GLCanvas.java
lrenderer/GLES11Canvas.java
lrenderer/GLES11IdImpl.java
lrenderer/GLES20Canvas.java
lrenderer/GLES20IdImpl.java
lrenderer/GLIdImpl.java
lrenderer/RawTexture.java
lrenderer/UploadedTexture.java
i/GLRootView.java
i/GalleryEGLConfigChooser.java
i/SurfaceTextureScreenNail.java
d3aac52ffb88ced53413d5eef29c641dd6982267 26-Dec-2012 Bobby Georgescu <georgescu@google.com> Replace camera importer

Change-Id: Icfeb23301bc6c9f8c8b12824bcbb0d8b41852d07
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/NotificationIds.java
pp/PhotoPage.java
pp/UsbDeviceActivity.java
ata/DataManager.java
ata/DataSourceType.java
ata/MediaObject.java
ata/MtpContext.java
ata/MtpDevice.java
ata/MtpDeviceSet.java
ata/MtpImage.java
ata/MtpSource.java
ngest/ImportTask.java
ngest/IngestActivity.java
ngest/IngestService.java
ngest/MtpDeviceIndex.java
ngest/SimpleDate.java
ngest/adapter/MtpAdapter.java
ngest/ui/DateTileView.java
ngest/ui/MtpBitmapCache.java
ngest/ui/MtpThumbnailTileView.java
rovider/GalleryProvider.java
i/ActionModeHandler.java
i/AlbumLabelMaker.java
i/ImportCompleteListener.java
i/MenuExecutor.java
3114fa3a8a99be3c819d102dd1d069face13c43f 07-Jan-2013 Bobby Georgescu <georgescu@google.com> Merge "Fix camera->gallery relaunch loop on empty camera album" into gb-ub-photos-bryce
617551e3e0016dc5ea9f3f1c4d1c9d8c0eab3f25 07-Jan-2013 Bobby Georgescu <georgescu@google.com> Fix camera->gallery relaunch loop on empty camera album

Bug: 7952132
Change-Id: I27325abe32177195d07fe310b8c49aca81af9056
pp/PhotoPage.java
18e71eb1589f839667207414e5f5cf95ba78a183 28-Dec-2012 nicolasroard <nicolasroard@google.com> Fix crash when using red eyes correction

bug:7680079
Change-Id: Icc6728321f18d09de5676564a3640c4b414c6741
iltershow/FilterShowActivity.java
ff6b23e655883f8f42bcf5c806f594512beaa322 19-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Made downsampling filter preview accurate.

Bug: 7892268

Change-Id: I9ab3a7f5077b718ed54206666ef9ef289db8facc
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterDownsample.java
2220b0e03ec1192b39d51c70cd70340b7269c3e0 06-Dec-2012 Earl Ou <shunhsingou@google.com> Use ExifOutputStream in SaveCopyTask

Change-Id: Ifa68d819249d3871c4a22f6e3dadc69542b9dc28
iltershow/tools/SaveCopyTask.java
9ac82ea62edc0320bab52dd37294d2b52c219961 19-Dec-2012 Angus Kong <shkong@google.com> Merge "Apply ExifModifier for rotation" into gb-ub-photos-bryce
dcb9deb9654ba141bfbf9788eab2bc3c83a8f24f 06-Dec-2012 Earl Ou <shunhsingou@google.com> Apply ExifModifier for rotation

Change-Id: Ifa3cee7816ffeacab2415f479234856916acfecf
ata/LocalImage.java
ata/MediaDetails.java
6455ba954daa6dd0a8e114c7db97a8361d064e5a 02-Nov-2012 Wu-cheng Li <wuchengli@google.com> Lock icon in secure album should redirect to gallery after unlock.

Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up
when launching gallery.

bug:7462572

Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0

The auto-merge of this CL from Arches to Bryce had a merge conflict,
so I canceled the auto-merge and then did this manual cherry-pick.
pp/Gallery.java
pp/PhotoPage.java
86ac467628c063e6955e83df4f44e0c7aa862181 18-Dec-2012 Bart Sears <bsears@google.com> resolved conflicts for merge of 5b188c94 to gb-ub-photos-bryce

Change-Id: I0b39e54323c8f2ce67816ec223acf72cfacbd191
d4715aa246786ee68b93d9eaef948fa4772b8fd8 18-Dec-2012 Ruben Brunk <rubenbrunk@google.com> am 5b188c94: Disabled further filters after Tiny Planet.

* commit '5b188c94f5895cd166fc29def1e5295498e298c9':
Disabled further filters after Tiny Planet.
5b188c94f5895cd166fc29def1e5295498e298c9 18-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Disabled further filters after Tiny Planet.

Bug: 7407176

Temporary fix. We need to handle filters changing the image
geometry properly.

Change-Id: I405b83acddec4e3b88a8a1d70dc534df15c37f1c
iltershow/FilterShowActivity.java
iltershow/PanelController.java
8b18f0379dcc9991c9596a32ce172b09d9a4aaad 17-Dec-2012 George Mount <mount@google.com> Merge "Move LightCycle to render directly to GLRootView." into gb-ub-photos-bryce
64072a071151b55fcbf97f6204d3c2258db386fa 11-Dec-2012 George Mount <mount@google.com> Move LightCycle to render directly to GLRootView.

Change-Id: I298ef7127d86ca37067ffa953640aad1747961f9
lrenderer/GLCanvas.java
lrenderer/GLES11Canvas.java
lrenderer/GLES20Canvas.java
f83b26c24ad2e3f6c9468afe18f43d1b53162fe3 17-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Improved performance for Kmeans filter.

Bug: 7739334
Change-Id: I5ab1eb429d65f84449a61deca962a47f2b6dbc8b
iltershow/filters/ImageFilterKMeans.java
fcf54601d45bfcef2fbeb911c46ff394e84d7011 13-Dec-2012 Doris Liu <tianliu@google.com> Add relativePath field into photo widget db

Bug: 7481248

The bug is caused by the change of external storage going from JB to JBMR1.
In light of this change, a new field has been added to the photo widget app
database to store the relative path for the local album. With the relative paths
stored, the widget app should be more resilient to future storage path changes.

Change-Id: Ia2497b882ae67178fa0632f23e07673b82d3a942
ata/LocalAlbum.java
adget/WidgetConfigure.java
adget/WidgetDatabaseHelper.java
netimeinitializer/GalleryWidgetMigrator.java
til/BucketNames.java
til/GalleryUtils.java
til/MediaSetUtils.java
b2b91aa64068c482961e52a5d74fcdf93b002f51 14-Dec-2012 Bobby Georgescu <georgescu@google.com> Merge "Gallery in separate task for up button in Camera filmstrip" into gb-ub-photos-bryce
a225ddd9a74b0354ee391cc52512163880754d8c 14-Dec-2012 Bobby Georgescu <georgescu@google.com> Gallery in separate task for up button in Camera filmstrip

Bug: 7738398
Change-Id: I297c15f0a3e537d96d79b05e1dd8d376ff59bfca
til/GalleryUtils.java
7f7357a2e11351d82e4de2c6dc5fb8aa4d22e448 14-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Removed filtershow geometry editor preview interpolating. It looks bad.

Change-Id: I790ce00e85c835f73c076f79cde5e65236131f49
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageFlip.java
iltershow/imageshow/ImageRotate.java
531e398d68b45d3be2e131e37236bcf08552ae70 14-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Remove preview dithering from Geometry editor in filtershow.

Bug: 7739904
Change-Id: I25c3cbe8907dd921aeb68f217fa9703e703d34a8
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageFlip.java
iltershow/imageshow/ImageRotate.java
af2ea50e6d635ac348fbfbf8cbafb048f04d8f67 14-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Refactoring: removed unused presets." into gb-ub-photos-bryce
b5abda28145e68e68a74a5aa2004361cf62edcc2 14-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Added downsampling filter.

Bug: 7690079
Change-Id: I235524127da848b1cbcca159cec43d1e0dcb5bf2
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterDownsample.java
8e55801c5a24cccde84df509b7c6b560dd744eca 14-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Refactoring: removed unused presets.

Change-Id: I1390bf65048a6cbd4dee5ee9cd472dc440352860
iltershow/presets/ImagePresetFX.java
iltershow/presets/ImagePresetOld.java
iltershow/presets/ImagePresetSaturated.java
iltershow/presets/ImagePresetXProcessing.java
b15e4ecb5a8b17b9d1c871fedea3c46de11d0725 14-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Refactoring: removed unused filters." into gb-ub-photos-bryce
4af6d6a77ad15d49605aaf9451d713eb70b6b619 14-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Refactoring: removed old filtershow slider." into gb-ub-photos-bryce
101789e44aa3effabc76da87c405ac9994678f0a 14-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Refactoring: removed unused filters.

Change-Id: If6344fde16607ab9dddb25922d295b1df205df6b
iltershow/filters/ImageFilterBW.java
iltershow/filters/ImageFilterBWBlue.java
iltershow/filters/ImageFilterBWGreen.java
iltershow/filters/ImageFilterBWRed.java
iltershow/presets/ImagePresetBW.java
iltershow/presets/ImagePresetBWBlue.java
iltershow/presets/ImagePresetBWGreen.java
iltershow/presets/ImagePresetBWRed.java
d2c8521454d8bebd752eacefa33adf28ed97d34f 14-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Refactoring: removed old filtershow slider.

Change-Id: Iebd2f18c0f4819e7ff32be638e96b519f3ce905c
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageZoom.java
49e31adb4d03ecd9a8972d61493853a96b62e7e4 14-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Fix Seekbar infinite recursion.

Bug: 7739384

Change-Id: Ie76d6741be4d08f3f9919662f1ad558c809aa5bd
iltershow/filters/ImageFilter.java
iltershow/imageshow/ImageShow.java
27fb72ee1413871b4958ab2f24a229574de6ffa2 13-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Added K-Means clustering filter.

Change-Id: If8961d4a21de953b754cf74aefc222b6bec902a3
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterEdge.java
iltershow/filters/ImageFilterKMeans.java
fc8d275313c934515b757389c1802da45b81a1a2 11-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Added sobel filter for edge function.

Change-Id: I4d59a96585f4902cd01d26ff68c777b542041132
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterEdge.java
ce178c1fa02362636e4992834592d6e019e4ee80 11-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Added photonegative filter.

Change-Id: I73594573b26873cb3fda49aca6d40761dec3707f
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterCurves.java
iltershow/filters/ImageFilterNegative.java
bf1baf80e1463dfacf4a3a486625523a76479a00 12-Dec-2012 John Reck <jreck@google.com> Merge "remove actionbar sherlock" into gb-ub-photos-bryce
2abaaf7caa9a83ba1ea759868aabde7f21387184 12-Dec-2012 John Reck <jreck@google.com> remove actionbar sherlock

Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
pp/AbstractGalleryActivity.java
pp/ActivityState.java
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/Gallery.java
pp/GalleryActionBar.java
pp/MovieActivity.java
pp/PhotoPage.java
pp/PickerActivity.java
pp/SinglePhotoDataAdapter.java
pp/StateManager.java
pp/TrimVideo.java
i/ActionModeHandler.java
i/MenuExecutor.java
i/PopupList.java
i/PositionController.java
d9b8887252a17464b4357e3699192d11c608233a 12-Dec-2012 Your Name <jreck@google.com> Merge "Remove LongSpareArray + some cleanups" into gb-ub-photos-bryce
7d5aeb075548256a8b11ccf06b225ac7b79770dd 12-Dec-2012 John Reck <jreck@google.com> Merge "GL packaging refactor" into gb-ub-photos-bryce
a4eae1abb4f2547dfbda84301ee764ce35464881 11-Dec-2012 John Reck <jreck@google.com> GL packaging refactor

Change-Id: I1d7a95c4f0b91a5ba59030d57cf6865c11b497aa
nim/AlphaAnimation.java
nim/CanvasAnimation.java
nim/StateTransitionAnimation.java
pp/ActivityState.java
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/ManageCachePage.java
pp/PhotoDataAdapter.java
pp/SlideshowPage.java
lrenderer/BasicTexture.java
lrenderer/BitmapTexture.java
lrenderer/CanvasTexture.java
lrenderer/ColorTexture.java
lrenderer/ExtTexture.java
lrenderer/FadeInTexture.java
lrenderer/FadeOutTexture.java
lrenderer/FadeTexture.java
lrenderer/GLCanvas.java
lrenderer/GLES11Canvas.java
lrenderer/GLES20Canvas.java
lrenderer/GLId.java
lrenderer/GLIdImpl.java
lrenderer/GLPaint.java
lrenderer/MultiLineTexture.java
lrenderer/NinePatchChunk.java
lrenderer/NinePatchTexture.java
lrenderer/RawTexture.java
lrenderer/ResourceTexture.java
lrenderer/StringTexture.java
lrenderer/Texture.java
lrenderer/TextureUploader.java
lrenderer/TiledTexture.java
lrenderer/UploadedTexture.java
i/AbstractSlotRenderer.java
i/AlbumSetSlidingWindow.java
i/AlbumSetSlotRenderer.java
i/AlbumSlidingWindow.java
i/AlbumSlotRenderer.java
i/BasicTexture.java
i/BitmapScreenNail.java
i/BitmapTexture.java
i/CanvasTexture.java
i/ColorTexture.java
i/EdgeEffect.java
i/EdgeView.java
i/ExtTexture.java
i/FadeInTexture.java
i/FadeOutTexture.java
i/FadeTexture.java
i/GLCanvas.java
i/GLCanvasImpl.java
i/GLES20Canvas.java
i/GLId.java
i/GLIdImpl.java
i/GLPaint.java
i/GLRoot.java
i/GLRootView.java
i/GLView.java
i/GalleryEGLConfigChooser.java
i/Log.java
i/ManageCacheDrawer.java
i/MultiLineTexture.java
i/NinePatchChunk.java
i/NinePatchTexture.java
i/PhotoFallbackEffect.java
i/PhotoView.java
i/PreparePageFadeoutTexture.java
i/ProgressSpinner.java
i/RawTexture.java
i/ResourceTexture.java
i/ScreenNail.java
i/ScrollBarView.java
i/SlideshowView.java
i/SlotView.java
i/StringTexture.java
i/SurfaceTextureScreenNail.java
i/Texture.java
i/TextureUploader.java
i/TileImageView.java
i/TiledScreenNail.java
i/TiledTexture.java
i/UndoBarView.java
i/UploadedTexture.java
65161214283cfb3e93b19061f9f7108462da71e4 11-Dec-2012 nicolasroard <nicolasroard@google.com> Cleanup filters creation in presets

bug:7688780

Change-Id: If330d02e3c0f43cffbce5327b26f0af44d2416c8
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilter.java
6dc3866ac10cc6bf38e73f098fe1988d1a6eecd4 04-Dec-2012 Your Name <jreck@google.com> Remove LongSpareArray + some cleanups

Change-Id: If5bb44ebca70bd735e426aeb3d9aac2d4bac646e
pp/PhotoDataAdapter.java
i/BitmapTileProvider.java
i/PhotoView.java
i/TileImageView.java
i/TileImageViewAdapter.java
til/GalleryUtils.java
f6bc102ca181ebe3064aa211b736de213a5d31e2 10-Dec-2012 John Reck <jreck@google.com> am 695e1aa0: Force a layout pass if the display rotation changes

* commit '695e1aa059cbc2cb2988f6beb0fee8ff7952b229':
Force a layout pass if the display rotation changes
5c7b259812a4cea11e14b901526faf5a33c4c07c 10-Dec-2012 John Reck <jreck@google.com> am 695e1aa0: Force a layout pass if the display rotation changes

* commit '695e1aa059cbc2cb2988f6beb0fee8ff7952b229':
Force a layout pass if the display rotation changes
695e1aa059cbc2cb2988f6beb0fee8ff7952b229 10-Dec-2012 John Reck <jreck@google.com> Force a layout pass if the display rotation changes

Bug: 7687209
DisplayRotation is used to map camera orientation to the display and is
updated in layoutContentPane(). However, in the case of a 180 rotate
framework doesn't send an onConfigurationChanged nor does the layout
dimensions change, thus layoutContentPane doesn't fire and we don't
update mDisplayRotation, resulting in an upside-down preview. To handle
this, check each draw whether or not the display rotation has changed
and if it has force a layout pass.

Change-Id: I610ea235d1bf7de2743f4cdb8e42ba1ddcb41404
i/GLRootView.java
c649360ce22f0138bfcb745eed585a32eb8570e7 08-Dec-2012 nicolasroard <nicolasroard@google.com> More refactoring...

Simplify management of filters in PanelController

bug:7688780
Change-Id: I0d07711cb2be127f064d476c6e98f4363b69b06c
iltershow/PanelController.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterCurves.java
iltershow/filters/ImageFilterRedEye.java
iltershow/filters/ImageFilterSharpen.java
iltershow/filters/ImageFilterWBalance.java
iltershow/imageshow/ImageSmallFilter.java
e9559a23576135fb899f30056187f6097929b8bc 07-Dec-2012 nicolasroard <nicolasroard@google.com> Merge "More refactoring. Makes it easy to specify how the button should look like (overlay img or not)." into gb-ub-photos-bryce
e879326d76734277469ca2f387f436fd0e922c87 07-Dec-2012 Doris Liu <tianliu@google.com> Decode screenshots when they show 0x0 dimensions

Bug: 7470758
Change-Id: If4012899e120ad68cdc8ca12bf6f8de8c5c96019
i/DetailsHelper.java
i/DialogDetailsView.java
116fc29a3f893813b95d7f55799d2947e09e512a 07-Dec-2012 nicolasroard <nicolasroard@google.com> More refactoring. Makes it easy to specify
how the button should look like (overlay img or not).

bug:7688780
Change-Id: If883c6886ade409dac7d72c87a514bd3fcd3ad7f
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterCurves.java
iltershow/filters/ImageFilterSharpen.java
iltershow/imageshow/ImageSmallFilter.java
iltershow/imageshow/ImageWithIcon.java
8cc3b55d615b349b4fcdff0eeeefe6907d4950ff 07-Dec-2012 nicolasroard <nicolasroard@google.com> Refactor filters to simplify their creation/addition

Bug:7688780
Change-Id: I9e1bb860dc9150bed4a255118654f2ca7f1ec3f0
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterBwFilter.java
iltershow/filters/ImageFilterContrast.java
iltershow/filters/ImageFilterExposure.java
iltershow/filters/ImageFilterHue.java
iltershow/filters/ImageFilterSaturated.java
iltershow/filters/ImageFilterShadows.java
iltershow/filters/ImageFilterSharpen.java
iltershow/filters/ImageFilterTinyPlanet.java
iltershow/filters/ImageFilterVibrance.java
iltershow/filters/ImageFilterVignette.java
iltershow/filters/ImageFilterWBalance.java
1d38fe15005069977d5df862102564e59c23f1b4 06-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Fixed Autocolor not getting saved.

Bug: 7541348
Change-Id: Ie62aa8abec78441ae0e42cb4069ddbd7d2f3e199
iltershow/filters/ImageFilterWBalance.java
795776f67fe5bca902b09c01edec630879263341 06-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Removed old crop.

Bug: 7441237
Change-Id: I29801f798a1d1ad3af81a82950edbb8a72ccae82
pp/AlbumPage.java
pp/CropImage.java
pp/Wallpaper.java
ata/CropExtras.java
iltershow/CropExtras.java
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageCrop.java
adget/WidgetConfigure.java
i/CropView.java
i/MenuExecutor.java
6416dd59687768d4152d5d954dd0e8c3617b9d97 28-Nov-2012 Ruben Brunk <rubenbrunk@google.com> Added support for Crop extras. Wallpaper & Widget use editor crop.

Bug: 7561976
Bug: 7441237
Change-Id: I0d6644171177650568ed911fc63c0c7e104f8d8c
pp/Wallpaper.java
ata/CropExtras.java
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/cache/ImageLoader.java
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageShow.java
iltershow/tools/BitmapTask.java
iltershow/tools/SaveCopyTask.java
adget/WidgetConfigure.java
cc93226fc364a50de3a1479c0912e9af1854b666 24-Oct-2012 nicolasroard <nicolasroard@google.com> Implements Redeye fix

bug:7223838
Change-Id: I21d8d2c8f858fca2e86d18b927cbf6878eb64263
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/cache/ImageLoader.java
iltershow/filters/ImageFilterRedEye.java
iltershow/filters/RedEyeCandidate.java
iltershow/imageshow/ImageRedEyes.java
iltershow/imageshow/ImageShow.java
395c9bba9dabb3a6208717dd40f42630becee5db 05-Dec-2012 George Mount <mount@google.com> Merge "Add GLES20 canvas implementation." into gb-ub-photos-bryce
6eb33768a15e2b4cc647bc55474568cf710876db 17-Nov-2012 George Mount <mount@google.com> Add GLES20 canvas implementation.

Change-Id: I5680909f31dc097599d0e063aa1f6daba834d3e2
i/GLCanvas.java
i/GLCanvasImpl.java
i/GLES20Canvas.java
i/GLRootView.java
i/GalleryEGLConfigChooser.java
i/NinePatchTexture.java
i/RawTexture.java
til/IntArray.java
90309e61fd14f4706b483e53066b47c0dccba26d 05-Dec-2012 Bobby Georgescu <georgescu@google.com> am db99a10b: Fix NPE in PhotoPage

* commit 'db99a10b6ac9296d612db8ba51e37f141fee4170':
Fix NPE in PhotoPage
30c71e7c7654f97c9662c7b315a6519e2a7ed1ec 05-Dec-2012 Bobby Georgescu <georgescu@google.com> am db99a10b: Fix NPE in PhotoPage

* commit 'db99a10b6ac9296d612db8ba51e37f141fee4170':
Fix NPE in PhotoPage
db99a10b6ac9296d612db8ba51e37f141fee4170 05-Dec-2012 Bobby Georgescu <georgescu@google.com> Fix NPE in PhotoPage

Bug: 7673141
Change-Id: I264f28d127f47e5f4f8c6a7c2df1c021401d03f2
pp/PhotoPage.java
fc64fe7ced14c5f61846d7e67ee8f9a69f0afc9c 05-Dec-2012 nicolasroard <nicolasroard@google.com> am 870e62ac: Handle the case where the orientation column is not here...

* commit '870e62ac801064f83bffc9095cbaee5fe46bdd80':
Handle the case where the orientation column is not here...
1d84ed072e731fa447ca9fb6ca1d50e7c1f3930c 05-Dec-2012 nicolasroard <nicolasroard@google.com> am 870e62ac: Handle the case where the orientation column is not here...

* commit '870e62ac801064f83bffc9095cbaee5fe46bdd80':
Handle the case where the orientation column is not here...
870e62ac801064f83bffc9095cbaee5fe46bdd80 05-Dec-2012 nicolasroard <nicolasroard@google.com> Handle the case where the orientation column is not here...

bug:7537610
Change-Id: I4f64891a789358c20206aea3033fd17514199d62
iltershow/cache/ImageLoader.java
f650ee134f5b7b61cd02bd61ae9349584c61deb4 05-Dec-2012 Michael Kolb <kolby@google.com> am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches

* commit '7a5377322dcebdaad98df9a31cadc7ff0f464d8a':
Prevent Camera UI in Gallery
527b201b52e9136989eb1eccb7e71a25cfe8027d 05-Dec-2012 Michael Kolb <kolby@google.com> am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches

* commit '7a5377322dcebdaad98df9a31cadc7ff0f464d8a':
Prevent Camera UI in Gallery
6bf226e45ec542eae4f766a2417bfdda625af4f0 04-Dec-2012 Michael Kolb <kolby@google.com> Prevent Camera UI in Gallery

Bug: 7668856

At startup, the PhotoView wouldn't execute the onFullScreenChanged
callback, so the Camera UI believed it was in Camera.

Change-Id: I6794c2a5a4eb06d39161a681b7a0afc27d5e4b3f
i/PhotoView.java
002b509e1ce049b001d2676781c8dc621bdc7982 04-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Fix call to Toast outside UI thread." into gb-ub-photos-bryce
a2d0d34a90543ee19ea295e72c112fde18fb3828 03-Dec-2012 Bobby Georgescu <georgescu@google.com> Move MenuExecutor operations into Service

Bug: 6680729
Change-Id: I538bb0a8783f7c1ff467ba8d8eb0deefdc0b6ea2
pp/AbstractGalleryActivity.java
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/BatchService.java
i/ActionModeHandler.java
i/MenuExecutor.java
8965d1f4c2d437e0a0ad4fd225ea2cad9d2471c4 03-Dec-2012 Ruben Brunk <rubenbrunk@google.com> Fix call to Toast outside UI thread.

Bug: 7412281
Change-Id: I976ccd28f696a65a1159b6a092b8aa2f2a2d0e08
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
eb3948f488b38bf5e6232c1aada16115589b0b9b 01-Dec-2012 George Mount <mount@google.com> Merge "Separate GL calls into GLCanvas in preparation for adding GLES2." into gb-ub-photos-bryce
137c6d060f9710f1a460326f27459e89b49820c2 30-Nov-2012 Bobby Georgescu <georgescu@google.com> Improve fling to delete gesture handling

Bug: 7419862
Bug: 7301456

Allows flings to start anywhere within the width bounds
of the image, even if outside the height bounds, making
deletion of panoramas more feasible, and gestures are
filtered by length to be able to make flinging easier
while still avoiding accidental input.

Change-Id: Iac933bfee85865a718ed47eadfed76683eb771d2
i/GestureRecognizer.java
i/PhotoView.java
6e2dd284681a716c55e0937ef2e15a1c7507a1b2 31-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Refactoring crop, made unconstrained.

Bug 7401363

Change-Id: I3ef10c43fd2a01216d6d6c8cc77b31ddef3fdd9b
iltershow/FilterShowActivity.java
iltershow/imageshow/BoundedRect.java
iltershow/imageshow/CropMath.java
iltershow/imageshow/GeometryMath.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageStraighten.java
cad5c1afc1dc467f67f0b0b764785b6ae17b5e23 29-Nov-2012 nicolasroard <nicolasroard@google.com> am 599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.

* commit '599393ecad6803161d5e901ef625e34cfe088009':
(re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
41d03cf756c3b46078e53927976d66e2898907e2 29-Nov-2012 nicolasroard <nicolasroard@google.com> am 599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.

* commit '599393ecad6803161d5e901ef625e34cfe088009':
(re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
599393ecad6803161d5e901ef625e34cfe088009 29-Nov-2012 nicolasroard <nicolasroard@google.com> (re-)add vertical/horizontal lines when moving Curves
Align histogram with Curves grid.

bug:7361722
Change-Id: I327f3fb0ba844cc09f8b899e59f74d368478d30a
iltershow/ui/ImageCurves.java
iltershow/ui/Spline.java
8c592dc805e1ed89811282d03929b6fd445b3177 29-Nov-2012 Nicolas Roard <nicolasroard@google.com> am 65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches

* commit '6502545991948769bc9ca725dafb9899c2635a01':
Added dashed diagonal for crop.
470258bfe8fd03c5b132ae49f8194e38366bb9ef 29-Nov-2012 Nicolas Roard <nicolasroard@google.com> am 65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches

* commit '6502545991948769bc9ca725dafb9899c2635a01':
Added dashed diagonal for crop.
6502545991948769bc9ca725dafb9899c2635a01 29-Nov-2012 Nicolas Roard <nicolasroard@google.com> Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
5d834ce0c65f89cf3f249f586b360c1a6d7ab99b 29-Nov-2012 Ruben Brunk <rubenbrunk@google.com> Added dashed diagonal for crop.

Bug: 7634466
Change-Id: I14c778766d4b00495b2f5f6fa5f87f4877f76381
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/imageshow/ImageCrop.java
466f3d9b854b8206e0e543f187952c39ae253ce8 29-Nov-2012 nicolasroard <nicolasroard@google.com> am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402)

* commit '0a624bb8db70f1e71ca511756b886c68f32fedbe':
Fix potential crash (regression introduced with fix for 7406402)
9c2ba29551101ab87cebca5f4beca87432e37cb5 29-Nov-2012 nicolasroard <nicolasroard@google.com> am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402)

* commit '0a624bb8db70f1e71ca511756b886c68f32fedbe':
Fix potential crash (regression introduced with fix for 7406402)
0a624bb8db70f1e71ca511756b886c68f32fedbe 29-Nov-2012 nicolasroard <nicolasroard@google.com> Fix potential crash
(regression introduced with fix for 7406402)

bug:7406402
Change-Id: I7ba92b4cb4fe2976583eba54a5bd25a29eae9d5c
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterParametricBorder.java
33a487f6698078a27e4a03c10f1201ee62a4dc7c 29-Nov-2012 nicolasroard <nicolasroard@google.com> am 6d867ce0: Set crop ratio to unconstrained by default.

* commit '6d867ce03ea96495d531d7e3f35a21b5aab257ef':
Set crop ratio to unconstrained by default.
1eb3c0af3d9542e68eb18d312dad87485f058378 29-Nov-2012 nicolasroard <nicolasroard@google.com> am 6d867ce0: Set crop ratio to unconstrained by default.

* commit '6d867ce03ea96495d531d7e3f35a21b5aab257ef':
Set crop ratio to unconstrained by default.
6d867ce03ea96495d531d7e3f35a21b5aab257ef 29-Nov-2012 nicolasroard <nicolasroard@google.com> Set crop ratio to unconstrained by default.

bug:7634466
Change-Id: I4b0e82ca77ab19527293334cc96e7b80f2d75535
iltershow/PanelController.java
iltershow/imageshow/ImageCrop.java
85135c1b580c922866965c5fb069ba69f2e76b28 29-Nov-2012 nicolasroard <nicolasroard@google.com> am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches

* commit '6e9123a658d4ed0dcb80dd376c676f043e2f4baa':
Fix flashing in geometry panel
09b1b679bc8773a89b6ce84d353f25eead7d3e3d 29-Nov-2012 nicolasroard <nicolasroard@google.com> am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches

* commit '6e9123a658d4ed0dcb80dd376c676f043e2f4baa':
Fix flashing in geometry panel
6e9123a658d4ed0dcb80dd376c676f043e2f4baa 29-Nov-2012 nicolasroard <nicolasroard@google.com> Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
69a77e9e8a34806615e4a04303a65b4782473dd6 29-Nov-2012 nicolasroard <nicolasroard@google.com> am 3507b925: Merge "Add new borders assets" into gb-ub-photos-arches

* commit '3507b925ce1edb2563c076d2d9f01bfadf9f61e5':
Add new borders assets
e3d06c85a047bc37c2ef3bb599da07ec036a2a5d 29-Nov-2012 nicolasroard <nicolasroard@google.com> am 3507b925: Merge "Add new borders assets" into gb-ub-photos-arches

* commit '3507b925ce1edb2563c076d2d9f01bfadf9f61e5':
Add new borders assets
3507b925ce1edb2563c076d2d9f01bfadf9f61e5 29-Nov-2012 nicolasroard <nicolasroard@google.com> Merge "Add new borders assets" into gb-ub-photos-arches
48b29c82472006102911f981be7025d21f5fc805 29-Nov-2012 nicolasroard <nicolasroard@google.com> Add new borders assets

bug:7386268
Change-Id: I026c36bdad32ae6a34ce1d5ec83abff319296d30
iltershow/FilterShowActivity.java
a12b35427a2b6e9d63d8c7eb8dcc04d91f47ba0b 29-Nov-2012 nicolasroard <nicolasroard@google.com> am cd84d676: Fix history panel overlap

* commit 'cd84d67629075795d4c5c28d980f77ff8d75c593':
Fix history panel overlap
6faf2bb61a436e9581a6f67d1141a603fb195a62 29-Nov-2012 nicolasroard <nicolasroard@google.com> am cd84d676: Fix history panel overlap

* commit 'cd84d67629075795d4c5c28d980f77ff8d75c593':
Fix history panel overlap
cd84d67629075795d4c5c28d980f77ff8d75c593 29-Nov-2012 nicolasroard <nicolasroard@google.com> Fix history panel overlap

bug:7545507
Change-Id: I06236f3025191896c851af1d84dc48a4dde18b1d
iltershow/FilterShowActivity.java
78cabea71ab108b1de80a0e63cc16aec6bd64fb2 29-Nov-2012 nicolasroard <nicolasroard@google.com> Fix flashing in geometry panel

bug:7406402
Change-Id: If2c6156349b90dfc57c56284ad6d821731e48e1a
iltershow/filters/ImageFilter.java
iltershow/presets/ImagePreset.java
1b1730d1f599b0b5fd52030965643a52261e0b89 29-Nov-2012 nicolasroard <nicolasroard@google.com> am 987bc8aa: Fix wrong colors in Curves

* commit '987bc8aaafa55c45451937b27d94c1d602de4d68':
Fix wrong colors in Curves
e4b3e7a8240ac284e33d04eac00800d3e6e96cc8 29-Nov-2012 nicolasroard <nicolasroard@google.com> am 987bc8aa: Fix wrong colors in Curves

* commit '987bc8aaafa55c45451937b27d94c1d602de4d68':
Fix wrong colors in Curves
e0a22a0b12741680000b0570e0940d6602ddf003 29-Nov-2012 nicolasroard <nicolasroard@google.com> am d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches

* commit 'd24fdf6ad148ffeb34a721d90e46d038f5a7b0da':
Fix moving points in the Curves editor
a3633df8d2334ecfd90d15f2f59c5a05cb3be1f5 29-Nov-2012 nicolasroard <nicolasroard@google.com> am d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches

* commit 'd24fdf6ad148ffeb34a721d90e46d038f5a7b0da':
Fix moving points in the Curves editor
987bc8aaafa55c45451937b27d94c1d602de4d68 29-Nov-2012 nicolasroard <nicolasroard@google.com> Fix wrong colors in Curves

bug:7633765
Change-Id: Ie6d0c175af6a1ade8f225107408ad03e73a289d3
iltershow/ui/Spline.java
d24fdf6ad148ffeb34a721d90e46d038f5a7b0da 29-Nov-2012 nicolasroard <nicolasroard@google.com> Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
17b8c5174410b09ddeb4cdd0b50468a4bbab450c 29-Nov-2012 Ruben Brunk <rubenbrunk@google.com> am 7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches

* commit '7a36d4275ea0375d4e6a940cc3307dbe716cf85c':
Added locking to ImageLoader.
bf9c431d8d863f7ffb54c984ed9801079be6d0f6 29-Nov-2012 Ruben Brunk <rubenbrunk@google.com> am 7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches

* commit '7a36d4275ea0375d4e6a940cc3307dbe716cf85c':
Added locking to ImageLoader.
7a36d4275ea0375d4e6a940cc3307dbe716cf85c 29-Nov-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Added locking to ImageLoader." into gb-ub-photos-arches
369e4caf10e7352123a4e73b36810f2b0f865ec0 29-Nov-2012 John Hoford <hoford@google.com> am e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches

* commit 'e5b979edb369877463e07680dddd9983bd2501cb':
reduce size of tiny planet if malloc fails
e5b979edb369877463e07680dddd9983bd2501cb 29-Nov-2012 John Hoford <hoford@google.com> Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
952144dd3146a195ea4bd0be3f88275df8b31c64 29-Nov-2012 nicolasroard <nicolasroard@google.com> Fix moving points in the Curves editor

bug:7632994
Change-Id: Ibd0b22594ad9be52e32ea860976861e4619fb513
iltershow/ui/ImageCurves.java
c22c429ddebbf7f4db71ff5c0b94c7bd5f8aa63c 29-Nov-2012 nicolasroard <nicolasroard@google.com> am 5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches

* commit '5d2227a793b51f44f664a739cc7e931c40ba4970':
Add a triangle to the popup button view
431651dfe26ea0d0cce2e3734feabcd12266a9a7 29-Nov-2012 nicolasroard <nicolasroard@google.com> am 5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches

* commit '5d2227a793b51f44f664a739cc7e931c40ba4970':
Add a triangle to the popup button view
5d2227a793b51f44f664a739cc7e931c40ba4970 29-Nov-2012 nicolasroard <nicolasroard@google.com> Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
2380d02e56f4239758d9a456c2f28566c37437d9 16-Nov-2012 Ruben Brunk <rubenbrunk@google.com> Added locking to ImageLoader.

Bug: 7471850
Change-Id: Ifbaf6e3547fad546a6faa94694bc7d3c7bb4711c
iltershow/cache/ImageLoader.java
9dd37b67274b9ea68a06abfd0678d2fdcd596dab 29-Nov-2012 Ruben Brunk <rubenbrunk@google.com> am 6a94446d: Minor fix for some FP rounding errors in crop.

* commit '6a94446de01e8b6b034cc537ee3e65d507d47a47':
Minor fix for some FP rounding errors in crop.
7681f68e37fef0a7cf20de99d99e628ca5653f36 29-Nov-2012 Ruben Brunk <rubenbrunk@google.com> am 6a94446d: Minor fix for some FP rounding errors in crop.

* commit '6a94446de01e8b6b034cc537ee3e65d507d47a47':
Minor fix for some FP rounding errors in crop.
a5fbd5f8007acd7ae757816d6774731576a05ea6 28-Nov-2012 Bobby Georgescu <georgescu@google.com> Merge "AlbumDataLoader.get returns correct value if not in cache" into gb-ub-photos-bryce
6a94446de01e8b6b034cc537ee3e65d507d47a47 28-Nov-2012 Ruben Brunk <rubenbrunk@google.com> Minor fix for some FP rounding errors in crop.

Bug 7566505

Change-Id: Ic3b849b26e0435e0e51a3ddd80c25d8e6e9949aa
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/GeometryMath.java
iltershow/imageshow/GeometryMetadata.java
f12a6b9ea3932fb997d0d36605a2ba27de97beb3 28-Nov-2012 Your Name <jreck@google.com> resolved conflicts for merge of 3c6a0610 to gb-ub-photos-bryce

Change-Id: Iac3fcc4a4b8c0295ec53edf5658169fb5fab021e
a938efc8bd7ea589f74f247480db6909f2bbb835 28-Nov-2012 Your Name <jreck@google.com> am 3c6a0610: Remove orientation compensation

* commit '3c6a0610d50a866e520485163011c79d9ee62457':
Remove orientation compensation
3c6a0610d50a866e520485163011c79d9ee62457 27-Nov-2012 Your Name <jreck@google.com> Remove orientation compensation

Bug: 7446056

Change-Id: I6f00617c890961e4d56545406bac9682356c0b15
pp/OrientationManager.java
pp/PhotoPage.java
4f956260982ec5088c63a3d3045b83c0eaf6ea5d 27-Nov-2012 Bobby Georgescu <georgescu@google.com> AlbumDataLoader.get returns correct value if not in cache

Bug: 7621656
Change-Id: I8b73837f41bf4ac8c753a5d84f251219fde8ae75
pp/AlbumDataLoader.java
7da54d7e41e04ea5122009b40de19be0724e1ca4 01-Nov-2012 George Mount <mount@google.com> Separate GL calls into GLCanvas in preparation for adding GLES2.

Change-Id: I2756c14294a36af7905766ee650fa08fb95e9477
i/BasicTexture.java
i/CropView.java
i/ExtTexture.java
i/GLCanvas.java
i/GLCanvasImpl.java
i/GLId.java
i/GLIdImpl.java
i/NinePatchTexture.java
i/RawTexture.java
i/SlideshowView.java
i/UploadedTexture.java
b5f374c30d06dc0409891f85a4bd5e1e3ddf8700 13-Nov-2012 Teng-Hui Zhu <ztenghui@google.com> Video: Fix crash in trimming/muting video in GB.

Basically switched to use sherlock actionbar and protect various new methods
with API level check.

bug:7546257

Change-Id: Ic16f75126c619578a9e9c2520fa264687d89a2e6
pp/MuteVideo.java
pp/TrimControllerOverlay.java
pp/TrimVideo.java
44dd798c3a814ffbdecc5adbc73dc47dc4dec646 16-Nov-2012 Teng-Hui Zhu <ztenghui@google.com> Merge "Video: Add the mute functionality." into gb-ub-photos-bryce
b4e11517f27ac77c001524e10a340971807f380d 16-Nov-2012 Angus Kong <shkong@google.com> am 18b38883: Guard tiles by synchronized block.

* commit '18b388839ed9858a3b35cec9a636e5cde58a528a':
Guard tiles by synchronized block.
5e88c7475c3e1eb30fe986793960d810a1748140 16-Nov-2012 Angus Kong <shkong@google.com> am 18b38883: Guard tiles by synchronized block.

* commit '18b388839ed9858a3b35cec9a636e5cde58a528a':
Guard tiles by synchronized block.
648b339c74da2b863304ffc61c8528cc74c2afb3 13-Nov-2012 Teng-Hui Zhu <ztenghui@google.com> Video: Add the mute functionality.

1. Enable the mute video functionality.
2. Consolidate the sharing code, especially for file handling.

bug:7543943

Change-Id: Ie7ec605996bc3242b1a50385f506e6a50ee2d2fc
pp/MuteVideo.java
pp/PhotoPage.java
pp/TrimVideo.java
pp/TrimVideoUtils.java
pp/VideoUtils.java
ata/LocalVideo.java
ata/MediaObject.java
i/MenuExecutor.java
til/SaveVideoFileInfo.java
til/SaveVideoFileUtils.java
1c1c561669710bc4222f775d8e6be629e3594ccb 14-Nov-2012 Earl Ou <shunhsingou@google.com> Remove import exiftags

Change-Id: Ifa9882a32ab788e02b1ce5f1751d8c976d67c013
ata/MediaDetails.java
18b388839ed9858a3b35cec9a636e5cde58a528a 14-Nov-2012 Angus Kong <shkong@google.com> Guard tiles by synchronized block.

Tiles might be touched in different threads.

bug:7490351
Change-Id: Ie30d43db90cf63f7a6ec6438faabfcae8bca151a
i/TiledTexture.java
ca56f8e30a4d91c7b7e6f75a39a1a69801e49cbb 14-Nov-2012 Earl Ou <shunhsingou@google.com> use ExifReader in MediaDetails

Change-Id: If8c7f32804ba55b4b0351c350e324dc1b6e508d7
ata/MediaDetails.java
90feaa549de22d45f790073bc2d351a93ccc76b6 14-Nov-2012 Earl Ou <shunhsingou@google.com> use ExifParser in ImageLoader

Change-Id: Ibcee97c15b2cc7df3aaa6c6c65535ca00cef2ed6
iltershow/cache/ImageLoader.java
8592397237a3f052ac39dd7f259898a7e04fae50 14-Nov-2012 Earl Ou <shunhsingou@google.com> Use getValueAt() to read different data in ExifTag

Change-Id: I4d8a72523a6ad4ae34e173c4b845a462644e83c7
ata/Exif.java
599bdd6d7de2adfc066b06e9899d860ae2697472 13-Nov-2012 Doris Liu <tianliu@google.com> Fix UnsupportedOperationException in MediaObject

Bug: 6495745
Change-Id: I770833f0c3fec6f187e961f511a7d9d2591f5f97
pp/PhotoPage.java
8253c35a5d9564afbc667f7a9f42fdc0a734bcf8 08-Nov-2012 John Hoford <hoford@google.com> reduce size of tiny planet if malloc fails - DO NOT MERGE

bug:7477815
Change-Id: I03fec9246e368fb7f929769dc5e5e6266761dc34
iltershow/filters/ImageFilterTinyPlanet.java
4cdb22512f322d2749aa57e07abeebf65b47c26f 08-Nov-2012 John Hoford <hoford@google.com> reduce size of tiny planet if malloc fails

bug:7477815
Change-Id: I03fec9246e368fb7f929769dc5e5e6266761dc34
iltershow/filters/ImageFilterTinyPlanet.java
1fac63b93ebdcd228b8fed62826ec8d64c6a5774 07-Nov-2012 Earl Ou <shunhsingou@google.com> use ExifParser to parse the orientaion

Change-Id: I47171c028cbc1f94b7de5d067de0636a9e241fbb
ata/Exif.java
885717944569c84527a0ac9bc8a17f7c5c1f4b76 07-Nov-2012 Bobby Georgescu <georgescu@google.com> am 9ec5de9d: Fix scenario where launching Gallery launches Camera

* commit '9ec5de9dbf46caecd2f0b38a72d31fa37ecb0466':
Fix scenario where launching Gallery launches Camera
5e3050e11420b0d18530442166103276be26fc9b 07-Nov-2012 Bobby Georgescu <georgescu@google.com> am 9ec5de9d: Fix scenario where launching Gallery launches Camera

* commit '9ec5de9dbf46caecd2f0b38a72d31fa37ecb0466':
Fix scenario where launching Gallery launches Camera
9ec5de9dbf46caecd2f0b38a72d31fa37ecb0466 06-Nov-2012 Bobby Georgescu <georgescu@google.com> Fix scenario where launching Gallery launches Camera

Bug: 7479102
Change-Id: Ib4676a7149c659897eee1dbbb92ab09861bd0ed4
pp/PhotoPage.java
cfa7fde1a336a3200b2ad9091b27ba7bfd8f5c9a 05-Nov-2012 Bobby Georgescu <georgescu@google.com> Split PhotoPage into FilmstripPage and SinglePhotoPage

Bug: 7479348
Change-Id: I98f668bd00e2e09bda9d5d9965fdbdaf1b832bfa
pp/ActivityState.java
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/FilmstripPage.java
pp/Gallery.java
pp/PhotoPage.java
pp/SinglePhotoPage.java
ef1e404cfa1227e309786675a6026dec842b5ab1 05-Nov-2012 Bobby Georgescu <georgescu@google.com> Load correct localized album names after language change

Bug: 7459805
Change-Id: I484ffea5b07488ffdda2e265c4efa32a3333ea03
ata/LocalAlbum.java
ata/LocalMergeAlbum.java
dac50ad01eee55ff85c0ca0854310a0b22b9d3b2 05-Nov-2012 Doris Liu <tianliu@google.com> Adding AccessibilityUtils class

Bug: 7434841

All the functions in this class should be backward compatible to
gingerbread.

Change-Id: I280a64d195b2df123607a5cdad5886e3048dbb92
til/AccessibilityUtils.java
70fb3773116bacdce3807a6ddfe386b43f4bbe80 02-Nov-2012 Bart Sears <bsears@google.com> am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches

* commit 'b41864f13b83a4f2d92f601b2e4381762ad1effa':
Lock icon in secure album should redirect to gallery after unlock.
19ded6d4283a887c579a29da3832dde286e97688 02-Nov-2012 Wu-cheng Li <wuchengli@google.com> Lock icon in secure album should redirect to gallery after unlock.

Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up
when launching gallery.

bug:7462572

Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0
pp/Gallery.java
pp/PhotoPage.java
644101695e23bf682de4ac9e62569ea79cfef0bc 01-Nov-2012 George Mount <mount@google.com> am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches

* commit '25fab8057e0db4b1ff33b8da13b270d9af8ae217':
Fix extra gray item in secure album.
bd52f5e7f8e381b8e7f7d49cd88e5ba6cb46e8b2 01-Nov-2012 George Mount <mount@google.com> am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches

* commit '25fab8057e0db4b1ff33b8da13b270d9af8ae217':
Fix extra gray item in secure album.
25fab8057e0db4b1ff33b8da13b270d9af8ae217 01-Nov-2012 George Mount <mount@google.com> Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
22151ee069f8f4a64cd51ddbe36aac294d19e234 01-Nov-2012 Bart Sears <bsears@google.com> am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches

* commit '40bb7158b8bda53433b36b94d6efed0e3937dcf2':
Jump to lockscreen in secure album if tap on video
77262bd58f4aba9bdb961c7a9be856502e120fb8 01-Nov-2012 Bart Sears <bsears@google.com> am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches

* commit '40bb7158b8bda53433b36b94d6efed0e3937dcf2':
Jump to lockscreen in secure album if tap on video
40bb7158b8bda53433b36b94d6efed0e3937dcf2 01-Nov-2012 Bart Sears <bsears@google.com> Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
74ecfe19c3b5f49b1305a496033be67bbf6d0293 01-Nov-2012 Sascha Haeberling <haeberling@google.com> am 769d38db: Fix tiny planet not using XMP metadata anymore

* commit '769d38db5736cd690ab7837c0824572739c39184':
Fix tiny planet not using XMP metadata anymore
452ce867e9d5837ede2e67d75fdaf07fb8ffcd57 01-Nov-2012 Sascha Haeberling <haeberling@google.com> am 769d38db: Fix tiny planet not using XMP metadata anymore

* commit '769d38db5736cd690ab7837c0824572739c39184':
Fix tiny planet not using XMP metadata anymore
78ea143fe02847b70d8669c79de5d54fd89fdd63 01-Nov-2012 George Mount <mount@google.com> Fix extra gray item in secure album.

Bug 7454444

Change-Id: I83f40e7e74f658a7b9ada148932a231ef8c31f73
ata/SecureAlbum.java
3935ca3762344c5f8a306596d70c0d4d4a2fda4b 01-Nov-2012 Angus Kong <shkong@google.com> Jump to lockscreen in secure album if tap on video

bug:7454356
Change-Id: I1e7e9ed886d414d5b41abdb1cc1d00c7736ae006
pp/PhotoPage.java
769d38db5736cd690ab7837c0824572739c39184 01-Nov-2012 Sascha Haeberling <haeberling@google.com> Fix tiny planet not using XMP metadata anymore

Bug: 7452777

Background: Semantics of isPanoramaSafe has changed and should not be
called from within the TinyPlanet filter at all.

Change-Id: I6bada525d30d9ff21fdff99f52c6697c3f828c7e
iltershow/filters/ImageFilterTinyPlanet.java
bcb427870043b12d4a1a454c08a088933d0eaf23 01-Nov-2012 Bobby Georgescu <georgescu@google.com> Use the system-standard long press vibration pattern

Bug: 7216819
Change-Id: I575868583777a7a953d767d0cdaa91a439d908ff
pp/ActivityState.java
pp/AlbumPage.java
pp/AlbumSetPage.java
2b85f0d788b9759dad3632561896e6c5dcbd4f99 01-Nov-2012 Doris Liu <tianliu@google.com> Disable operations when no item is selected

Bug: 7441208
Change-Id: I2f435ad8aa0b578ecfec426f7ad6287f0f210f48
i/ActionModeHandler.java
2a11af39cfc36e182778f9373971d086e782de7a 31-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Fix jank on videoplayer auto-exit" into gb-ub-photos-bryce
372152961edd8feada0ae6478c91ba6b2565191d 31-Oct-2012 John Reck <jreck@google.com> Gingerbread support-ish

This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca.

Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
pp/AbstractGalleryActivity.java
pp/ActivityState.java
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/CropImage.java
pp/Gallery.java
pp/GalleryActionBar.java
pp/MovieActivity.java
pp/PhotoPage.java
pp/PickerActivity.java
pp/SinglePhotoDataAdapter.java
pp/StateManager.java
i/ActionModeHandler.java
i/MenuExecutor.java
i/PopupList.java
i/PositionController.java
62e98689761a7900dd7e556d04bde8955b94ebdb 31-Oct-2012 Bobby Georgescu <georgescu@google.com> Fix jank on videoplayer auto-exit

Bug: 7344292
Change-Id: I3af95d3370769a6465644fa4aabe3f2ffa2980e7
pp/CommonControllerOverlay.java
f675cd16e8188a8d0b3a34dbc1a74c40ed36eb1e 31-Oct-2012 nicolasroard <nicolasroard@google.com> Add a triangle to the popup button view

bug:7442434
Change-Id: I7b784f2a5662ef694daef6cd926f60694b3eee4f
iltershow/FilterShowActivity.java
iltershow/ui/FramedTextButton.java
310db394adcdb8677b9a3d0f37a4abee63bdbb50 30-Oct-2012 Tenghui Zhu <ztenghui@google.com> Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches
1f57b48b220e38f3117b497e6b92ba155fee0e00 04-Oct-2012 Romain Guy <romainguy@google.com> DO NOT MERGE: Do not set the background to null for video.

Bug #7275145
Bug 7405595

Removing the window background when it's not visible is a good idea
to save on performance. Removing *all* the backgrounds is just a silly
idea that leads to weird looking results that drive graphics engineers
mad for a day until they figure out that everything is working properly
and that the app is simply asking the system to draw whatever garbage
is left in the GPU's graphics buffers.

Cherry pick the Romain's change from jb-mr1-dev:
https://googleplex-android-review.googlesource.com/#/c/234571/

Change-Id: Ief88821319989add5fda57ae7b69cdb01f6ccdf4
pp/MoviePlayer.java
3ac3cdd66f291e0e7400204f7410c02cffd24183 30-Oct-2012 Bart Sears <bsears@google.com> am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches

* commit 'c7536cfa819d10e0c556ecb30c53a58c048fa327':
Show sync error toast only when both loading and syncing are done.
40930163b90a2e73710e628c2b2c0c06aa0fd4fc 30-Oct-2012 Bart Sears <bsears@google.com> am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches

* commit 'c7536cfa819d10e0c556ecb30c53a58c048fa327':
Show sync error toast only when both loading and syncing are done.
c7536cfa819d10e0c556ecb30c53a58c048fa327 30-Oct-2012 Bart Sears <bsears@google.com> Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches
8cd80c97225bfaa15a0bd58b2cc3908a889ec11d 30-Oct-2012 George Mount <mount@google.com> am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches

* commit 'aa8228a42b25b60f0663770beea9acdce536f699':
Don't use an album for UriImages.
14a53420ee67fe971455d715af324266643ba0de 30-Oct-2012 George Mount <mount@google.com> am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches

* commit 'aa8228a42b25b60f0663770beea9acdce536f699':
Don't use an album for UriImages.
20a4327fc7e549fc7a9a0fe9d1dcdcc097787a41 30-Oct-2012 Teng-Hui Zhu <ztenghui@google.com> Merge "Gallery: Do not set the background to null for video." into gb-ub-photos-bryce
4f100e5f200d24a820ed59c7bc924e18e1b17a65 27-Oct-2012 Teng-Hui Zhu <ztenghui@google.com> Gallery: Do not set the background to null for video.

This will fix screen corruption when exit while video complete or rotate while
video playing.

bug:7405595

Change-Id: I8b559390a284e5c850bc02a76add86c4de600144
pp/MoviePlayer.java
05da3f520eacb9219964b6ed57ef37846d889fd7 30-Oct-2012 Hung-ying Tyan <tyanh@google.com> Show sync error toast only when both loading and syncing are done.

Bug: 7427597
Change-Id: Ie1fe8510e2a2225424b3c2892b2c0a8b4021324c
pp/AlbumDataLoader.java
pp/AlbumPage.java
pp/AlbumSetDataLoader.java
pp/AlbumSetPage.java
pp/LoadingListener.java
pp/PhotoDataAdapter.java
pp/PhotoPage.java
7db87e52758c2819785d71e36986080542f5ab3f 29-Oct-2012 George Mount <mount@google.com> Don't use an album for UriImages.

Bug 7422455

Change-Id: Ic9b0ae762b56f6734a1bd452c6c877431b90c0a6
ata/UriSource.java
bf1677a434760fcb7389a30c18e05cc3e7926d40 29-Oct-2012 Doris Liu <tianliu@google.com> Disable save button when there's no modification

Bug: 7353884
Change-Id: I1b88e8b8ab3a92aad1226c60062a17a2f4badfb9
pp/TrimVideo.java
iltershow/FilterShowActivity.java
iltershow/imageshow/ImageShow.java
b3e7d7d8abdb6ebb069cdc9a7206411ea53a8497 29-Oct-2012 nicolasroard <nicolasroard@google.com> am dc03ae14: Reset rotation flag

* commit 'dc03ae144d838714446b239f2b0c519d956af6ff':
Reset rotation flag
dc03ae144d838714446b239f2b0c519d956af6ff 29-Oct-2012 nicolasroard <nicolasroard@google.com> Reset rotation flag

bug:7386221
Change-Id: I45a615a880a96d54bbde0a5ce648e02ff86db1de
iltershow/cache/ImageLoader.java
ddc54044bfa994db4160442ff74b4ddf2e228681 29-Oct-2012 nicolasroard <nicolasroard@google.com> am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches

* commit '98990049451cda3540f6cff1ae8065c3675ed3d8':
Fix zooming position
98990049451cda3540f6cff1ae8065c3675ed3d8 29-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Fix zooming position" into gb-ub-photos-arches
031a07411e4ad53fe76c4ef6ed39d62dd429e406 29-Oct-2012 John Hoford <hoford@google.com> am 17540e58: Do not copy XMP data if it has TinyPlanet filter

* commit '17540e58b8454e820a6273365cee94742d9b9900':
Do not copy XMP data if it has TinyPlanet filter
17540e58b8454e820a6273365cee94742d9b9900 29-Oct-2012 John Hoford <hoford@google.com> Do not copy XMP data if it has TinyPlanet filter

bug:7429072
Change-Id: I791db8ae8157741eb4cd74e9b6f749275b6b6cc3
iltershow/presets/ImagePreset.java
2f8301760867dc269c90bbeb338495f80e841c08 26-Oct-2012 nicolasroard <nicolasroard@google.com> Fix zooming position

bug:7386221
Change-Id: I70215d3c3e12d08eee40a3cc848e3fc50f7dda75
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageZoom.java
33d33c7ee22b02dc87085014fc178e0a80b946bb 27-Oct-2012 nicolasroard <nicolasroard@google.com> am 2d2b69b0: Fix rounding issue affecting TinyPlanet

* commit '2d2b69b0d86ad3131faf83164253a5255ff941ed':
Fix rounding issue affecting TinyPlanet
2d2b69b0d86ad3131faf83164253a5255ff941ed 27-Oct-2012 nicolasroard <nicolasroard@google.com> Fix rounding issue affecting TinyPlanet

bug:7428061
Change-Id: Ieeb4c27d4c426d7052c49ca88ca61ff0785000a3
iltershow/imageshow/GeometryMetadata.java
90af32fb05b7c2be9807d6b53bd61b4093ed0e00 27-Oct-2012 Nicolas Roard <nicolasroard@google.com> am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches

* commit 'a0fe81ade88cb631d068094bb8ec37a91810f45e':
Changed rotated display parameter increments to 90.
d2a1f33fdcf77073f80c144eaaed24f4d28ab373 27-Oct-2012 Nicolas Roard <nicolasroard@google.com> am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches

* commit '26cfff70e559bcaf91c50def54f2a4e94d3dd50c':
change thumbnail and reset behaviour
a0fe81ade88cb631d068094bb8ec37a91810f45e 27-Oct-2012 Nicolas Roard <nicolasroard@google.com> Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches
26cfff70e559bcaf91c50def54f2a4e94d3dd50c 27-Oct-2012 Nicolas Roard <nicolasroard@google.com> Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches
f245d2b716fdc26b59f1251bf55707cdc06c331a 27-Oct-2012 Doris Liu <tianliu@google.com> am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches

* commit '591974bceb89bccf3376a7c424017e847eca61df':
Show panoViewer icon after "Back" from viewer
591974bceb89bccf3376a7c424017e847eca61df 27-Oct-2012 Doris Liu <tianliu@google.com> Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches
c4384338502ed85618095f0672b5926659acab20 27-Oct-2012 Doris Liu <tianliu@google.com> Show panoViewer icon after "Back" from viewer

Bug: 7407942
Change-Id: I00da3c73a558e412e106f089034e83f2e75616e4
pp/PhotoPageBottomControls.java
6027d7638a2a9445a2a4bbef364d9c02982ffd0b 27-Oct-2012 George Mount <mount@google.com> am b6d49492: Remove black borders in Manta LightCycle capture after orientation change.

* commit 'b6d494925ea14a02ef75f58d5d969d7586914ef7':
Remove black borders in Manta LightCycle capture after orientation change.
af0dc7f486553fd96b33b15e5380cb1928462d69 27-Oct-2012 John Hoford <hoford@google.com> change thumbnail and reset behaviour

bug:7386757
bug:7343047
Change-Id: I0b44309f047b790025fb806ce041e2265489f027
iltershow/FilterShowActivity.java
iltershow/imageshow/ImageSmallFilter.java
b6d494925ea14a02ef75f58d5d969d7586914ef7 25-Oct-2012 George Mount <mount@google.com> Remove black borders in Manta LightCycle capture after orientation change.

Bug 7344906

Change-Id: I70017e4479962d49aedb06ea7b050f638e00fc06
i/SurfaceTextureScreenNail.java
2c8a24680ad88ab0028451716bff215aa6e91576 27-Oct-2012 Bobby Georgescu <georgescu@google.com> am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches

* commit '88870365af146d05162742c5f613fc92483b0a93':
Fix the black lines near edge of thumbnails
88870365af146d05162742c5f613fc92483b0a93 27-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches
d9f4bd8f81f83c93005d55d42157dd7cec754ac3 26-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Changed rotated display parameter increments to 90.

Bug: 7393432
Change-Id: Id94a28c88cc06a7d99aab0d01dae4fc59cefbab2
iltershow/imageshow/ImageRotate.java
38e64b25801cbec5004cd67ce22ebb6ca822bef1 26-Oct-2012 John Reck <jreck@google.com> am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches

* commit '10f975a628badbb400a97872c6704740ef936e46':
Add proxy launcher
10f975a628badbb400a97872c6704740ef936e46 26-Oct-2012 John Reck <jreck@google.com> Merge "Add proxy launcher" into gb-ub-photos-arches
d58b942aaa15a8c1a3663329f8a4d2d275aed4a6 26-Oct-2012 Bobby Georgescu <georgescu@google.com> am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches

* commit '798f4a914d47e69496374051fab386a3536c9698':
Hold WakeLock for batch delete operation
798f4a914d47e69496374051fab386a3536c9698 26-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
04d324e313b8ee36ce878f5e8c92949b32de33c0 26-Oct-2012 Owen Lin <owenlin@google.com> Fix the black lines near edge of thumbnails

1. Correct the positions of right and bottom borders
2. Turn off blending by using PoterDuffMode.SRC

bug: 7414307

Change-Id: Icc6fd765c2b1e904308c53aa66b55600e0016471
i/TiledTexture.java
8fe5c7542d1de4e02c027318866ab2a2b020b94d 26-Oct-2012 nicolasroard <nicolasroard@google.com> am 8d8cdf7f: Fix colors in rotate and mirror

* commit '8d8cdf7f67db69309fd740ca301fbeaadac8a9f0':
Fix colors in rotate and mirror
8d8cdf7f67db69309fd740ca301fbeaadac8a9f0 26-Oct-2012 nicolasroard <nicolasroard@google.com> Fix colors in rotate and mirror

bug:7419025
Change-Id: Icf92de032f62f93a3ac57e042ea582c760d9f600
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageShow.java
7dcaeec6ef5841107f5b42990c5d9d56ddbb251f 26-Oct-2012 nicolasroard <nicolasroard@google.com> am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches

* commit '8b3ce9b01275151b653ea138324e47eb66a7b47e':
Fix crash when showing history
8b3ce9b01275151b653ea138324e47eb66a7b47e 26-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Fix crash when showing history" into gb-ub-photos-arches
f0eb72eab7be3183417deff6dadb4937b90b9e59 26-Oct-2012 nicolasroard <nicolasroard@google.com> Fix crash when showing history

bug:7418823
Change-Id: I0a84bb4d8fc8b42fc953f8301bb2b24cf64edce7
iltershow/FilterShowActivity.java
iltershow/imageshow/ImageShow.java
45dfd43eb36bad916cee573e8822008d12d2fdc6 26-Oct-2012 Hung-ying Tyan <tyanh@google.com> am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches

* commit '635aab5631e25488610ff5546c51ea2895dda2f0':
Fix tiling effect when open a photo.
635aab5631e25488610ff5546c51ea2895dda2f0 26-Oct-2012 Hung-ying Tyan <tyanh@google.com> Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches
7849722053ed8f154a83f41b7fec067b4e2a9864 26-Oct-2012 Nicolas Roard <nicolasroard@google.com> am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches

* commit '24f28850adcb14a1de87e538f60f3bb309bed284':
Do not add crop into preset if in inital setup
24f28850adcb14a1de87e538f60f3bb309bed284 26-Oct-2012 Nicolas Roard <nicolasroard@google.com> Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches
0385a1abb62a11fff5dddee17325d1cb00cee0ab 25-Oct-2012 Bobby Georgescu <georgescu@google.com> Hold WakeLock for batch delete operation

Bug: 6680729
Change-Id: I0bdd59edb60c746c8c9e3c3608be980247f0d91a
i/ActionModeHandler.java
i/ImportCompleteListener.java
i/WakeLockHoldingProgressListener.java
a2a4c9a985d789e853211f21cd265460f16d2de1 26-Oct-2012 John Hoford <hoford@google.com> Do not add crop into preset if in inital setup

bug:7417545
Change-Id: I355936645e555e3d6b950923af301b437570dd93
iltershow/imageshow/ImageGeometry.java
f85d974363a40b8ce588ba3fe902eec38de603d9 24-Oct-2012 John Reck <jreck@google.com> Add proxy launcher

Bug: 7394901

Change-Id: I667a6e6fbd11d4c02dc536067bb6f3813775db9c
pp/PhotoPage.java
c62b066a240a17f0b99a65bfb9eb8210f8407e6e 26-Oct-2012 John Reck <jreck@google.com> am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches

* commit '6106c833161cf8e64fc6a9580116f11f4a02d98b':
Add loading spinner
6106c833161cf8e64fc6a9580116f11f4a02d98b 26-Oct-2012 John Reck <jreck@google.com> Merge "Add loading spinner" into gb-ub-photos-arches
dd7139babe7b1ae3893d329652f3efcab77652f0 26-Oct-2012 Mangesh Ghiware <mghiware@google.com> am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches

* commit '5388677d3078f2c218d22465c955e3df6b2ffbed':
Handle 360 panorama specific MIME type.
5388677d3078f2c218d22465c955e3df6b2ffbed 26-Oct-2012 Mangesh Ghiware <mghiware@google.com> Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
00914f56c3390caa224b1c9fc07624665de40113 25-Oct-2012 John Reck <jreck@google.com> Add loading spinner

Bug: 7408575

Change-Id: Ia737b36abb88d75381f41c25474e3cc03448dbb9
iltershow/FilterShowActivity.java
07b70a524d4188120153eee5da31b079ecb135ed 11-Oct-2012 Mangesh Ghiware <mghiware@google.com> Handle 360 panorama specific MIME type.

Bug: 7407448

Change-Id: I939a061e2100c2cdc17279982de98f1d446d8aef
pp/Gallery.java
bdd21912a4365a703716b16a636832f71c4c0d0c 26-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches

* commit '4164fabf5f9324adde9954130aad13c2f72aa24a':
Fix issue where aspect bounds don't get applied.
812d65bd1d8c30bdb0f174d2503e0042ac59b13c 26-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches

* commit 'd72971e683069d463c78117037414e5286689549':
Fixed crop intent.
4164fabf5f9324adde9954130aad13c2f72aa24a 26-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Fix issue where aspect bounds don't get applied." into gb-ub-photos-arches
d72971e683069d463c78117037414e5286689549 26-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Fixed crop intent." into gb-ub-photos-arches
7f999551167ce313e36ba35e3682593f8cf80e52 25-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Fix issue where aspect bounds don't get applied.

Bug: 7407937
Change-Id: Ie6484d6458657d6284e04de755a8cc1a912dfb6c
iltershow/PanelController.java
iltershow/imageshow/ImageGeometry.java
5aa454b3bde8b2162eb2b91400973113e2c63070 26-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Fixed crop intent.

Bug: 7415140
Bug: 7403813
Change-Id: I545162544f845d210d21185cddaca09b219fb091
iltershow/FilterShowActivity.java
i/MenuExecutor.java
d43a8f94375e899a4b2a544552875c1b0d8b48f4 25-Oct-2012 Bobby Georgescu <georgescu@google.com> am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches

* commit '6cfd3b8d34cf627b3b41bf53e9ceb70f9d0ed17f':
Get rid of black lines near edge of thumbnails
6cfd3b8d34cf627b3b41bf53e9ceb70f9d0ed17f 25-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches
a36cc0eb13e14b02bb7df53c7343d73ba33e3c8e 25-Oct-2012 nicolasroard <nicolasroard@google.com> am 8bc296e2: Fix crash when starting filtereditor

* commit '8bc296e233298dbc76da22f01aaffec11e539d19':
Fix crash when starting filtereditor
8bc296e233298dbc76da22f01aaffec11e539d19 25-Oct-2012 nicolasroard <nicolasroard@google.com> Fix crash when starting filtereditor

bug:7415170
Change-Id: I9d54b1179f343aa089bfd9a065ecddaa8a4283b8
iltershow/cache/DirectPresetCache.java
iltershow/cache/ImageLoader.java
d5346b37cc2417e068ae64f3db081f51df2bd68b 25-Oct-2012 Bobby Georgescu <georgescu@google.com> Get rid of black lines near edge of thumbnails

Bug: 7414307
Change-Id: If77e04945ff6df65301a6802dd40fabc8c329bfa
i/TiledTexture.java
c6b77275bde572b8ecd47449e6b1b7c4d4c516ab 25-Oct-2012 Angus Kong <shkong@google.com> am 71c17775: Force renderring request for Camera Animation.

* commit '71c177759c7aa10082c8fdf909b701cf0047bead':
Force renderring request for Camera Animation.
71c177759c7aa10082c8fdf909b701cf0047bead 25-Oct-2012 Angus Kong <shkong@google.com> Force renderring request for Camera Animation.

bug:7410862
Change-Id: I439186f2fea5ee0939ddcfcb9d77a49d0047727b
i/GLRoot.java
i/GLRootView.java
dff8cf82d1156f38bf7338ac37b1571597ae3f68 25-Oct-2012 nicolasroard <nicolasroard@google.com> am dffe6a6f: Fix default for tiny planet

* commit 'dffe6a6f8bbf4565df211b07bcfc23d6864a48b6':
Fix default for tiny planet
73a2ad06d3ac5456f0ada8f913dabf505d26fb8d 25-Oct-2012 nicolasroard <nicolasroard@google.com> am e7a71372: Fix update view

* commit 'e7a71372747af0ef03f9d953c28ed62de58315d3':
Fix update view
dffe6a6f8bbf4565df211b07bcfc23d6864a48b6 25-Oct-2012 nicolasroard <nicolasroard@google.com> Fix default for tiny planet

bug:7410938
Change-Id: If43317c2ad1e22ca1a3d3de1eef91ea2556252dd
iltershow/filters/ImageFilterTinyPlanet.java
e7a71372747af0ef03f9d953c28ed62de58315d3 25-Oct-2012 nicolasroard <nicolasroard@google.com> Fix update view

bug:7410583
Change-Id: I8e773bc4ba550c2a362b46e5a6488ad7b3c29646
iltershow/cache/ImageLoader.java
d71a718afe02282153d86b78f6a44c4783203d54 24-Oct-2012 Owen Lin <owenlin@google.com> Fix tiling effect when open a photo.

1. Don't draw the tiles of full image before screen nail is ready.
2. Upload multiple tiles in each frame in order to show photo quickly.

bug: 7403409

Change-Id: Ic5a88a29fe302068e97ab81ab260d0cc572dd7ff
i/TiledScreenNail.java
i/TiledTexture.java
d4c93190e5aab69cfee9cfa8218bc4c126f7f48d 25-Oct-2012 nicolasroard <nicolasroard@google.com> am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches

* commit 'ea3c51ff451f2e5efc00912ff993e232e5f07cd7':
Remove the old photo editor
ea3c51ff451f2e5efc00912ff993e232e5f07cd7 25-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Remove the old photo editor" into gb-ub-photos-arches
2df8a18abd1b23728052527d765a57e03abf093d 25-Oct-2012 Sascha Haeberling <haeberling@google.com> am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches

* commit 'b13e1788ddf886fcdfd1ec837a59ec242bb33dae':
Fixes TinyPlanet crashed due to too excessive memory usage.
b13e1788ddf886fcdfd1ec837a59ec242bb33dae 25-Oct-2012 Sascha Haeberling <haeberling@google.com> Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches
e1de865ca29bd178024a952efb2e1b9b54185336 25-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches

* commit '4a601448dff06711df2d08e75d4b0c43aa57600e':
Fixed blackscreen when launching crop from menu.
4a601448dff06711df2d08e75d4b0c43aa57600e 25-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches
13b2fd3ab7ff65ac5c18b4c9de69062f3a549669 25-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Fixed blackscreen when launching crop from menu.

Bug: 7410287
Change-Id: I60ae95cff82c789df37ce1b45fbaaaffa1aa552b
iltershow/cache/ImageLoader.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageShow.java
044513931d31a4b86f622b1af36e9ce947672be7 25-Oct-2012 Sascha Haeberling <haeberling@google.com> Fixes TinyPlanet crashed due to too excessive memory usage.

Bug: 7409664

Change-Id: If82882ce7186500f5a3af769d490275233a6191c
iltershow/filters/ImageFilterTinyPlanet.java
dd12e5b57cef40711cb2c5201589a2a48e521080 25-Oct-2012 nicolasroard <nicolasroard@google.com> am 2c6ea941: Add rotation to tinyplanet view

* commit '2c6ea941a80ea22317d664e329aed51f5f7417b9':
Add rotation to tinyplanet view
50116ffb044f6566ef5e36aaa8e41dcb7522076e 25-Oct-2012 nicolasroard <nicolasroard@google.com> Remove the old photo editor

bug:7407573
Change-Id: Ifac6d3d7cec02c9cb8ef8bbd390f0512e6cdb66c
(cherry picked from commit a96c8e9c9aac509ba074b340c66e31e20ec05823)
pp/GalleryAppImpl.java
hotoeditor/ActionBar.java
hotoeditor/BitmapUtils.java
hotoeditor/EffectsBar.java
hotoeditor/EffectsMenu.java
hotoeditor/FilterStack.java
hotoeditor/ImageActionButton.java
hotoeditor/LoadScreennailTask.java
hotoeditor/OnDoneBitmapCallback.java
hotoeditor/OnDoneCallback.java
hotoeditor/Photo.java
hotoeditor/PhotoEditor.java
hotoeditor/PhotoView.java
hotoeditor/RendererUtils.java
hotoeditor/RestorableView.java
hotoeditor/SaveCopyTask.java
hotoeditor/SpinnerProgressDialog.java
hotoeditor/Toolbar.java
hotoeditor/YesCancelDialogBuilder.java
hotoeditor/actions/AbstractSeekBar.java
hotoeditor/actions/AutoFixAction.java
hotoeditor/actions/ColorSeekBar.java
hotoeditor/actions/ColorTemperatureAction.java
hotoeditor/actions/CropAction.java
hotoeditor/actions/CropView.java
hotoeditor/actions/CrossProcessAction.java
hotoeditor/actions/DocumentaryAction.java
hotoeditor/actions/Doodle.java
hotoeditor/actions/DoodleAction.java
hotoeditor/actions/DoodleView.java
hotoeditor/actions/DuotoneAction.java
hotoeditor/actions/EffectAction.java
hotoeditor/actions/EffectToolKit.java
hotoeditor/actions/FaceTanAction.java
hotoeditor/actions/FaceliftAction.java
hotoeditor/actions/FillLightAction.java
hotoeditor/actions/FisheyeAction.java
hotoeditor/actions/FlipAction.java
hotoeditor/actions/FlipView.java
hotoeditor/actions/FullscreenToolView.java
hotoeditor/actions/GrainAction.java
hotoeditor/actions/GrayscaleAction.java
hotoeditor/actions/HighlightAction.java
hotoeditor/actions/LomoishAction.java
hotoeditor/actions/NegativeAction.java
hotoeditor/actions/PosterizeAction.java
hotoeditor/actions/RedEyeAction.java
hotoeditor/actions/RotateAction.java
hotoeditor/actions/RotateView.java
hotoeditor/actions/SaturationAction.java
hotoeditor/actions/ScaleSeekBar.java
hotoeditor/actions/SepiaAction.java
hotoeditor/actions/ShadowAction.java
hotoeditor/actions/SharpenAction.java
hotoeditor/actions/StraightenAction.java
hotoeditor/actions/TintAction.java
hotoeditor/actions/TouchView.java
hotoeditor/actions/VignetteAction.java
hotoeditor/filters/AbstractScaleFilter.java
hotoeditor/filters/AutoFixFilter.java
hotoeditor/filters/ColorTemperatureFilter.java
hotoeditor/filters/CropFilter.java
hotoeditor/filters/CrossProcessFilter.java
hotoeditor/filters/DocumentaryFilter.java
hotoeditor/filters/DoodleFilter.java
hotoeditor/filters/DuotoneFilter.java
hotoeditor/filters/FaceTanFilter.java
hotoeditor/filters/FaceliftFilter.java
hotoeditor/filters/FillLightFilter.java
hotoeditor/filters/Filter.java
hotoeditor/filters/FilterCreator.java
hotoeditor/filters/FisheyeFilter.java
hotoeditor/filters/FlipFilter.java
hotoeditor/filters/GrainFilter.java
hotoeditor/filters/GrayscaleFilter.java
hotoeditor/filters/HighlightFilter.java
hotoeditor/filters/LomoishFilter.java
hotoeditor/filters/NegativeFilter.java
hotoeditor/filters/PosterizeFilter.java
hotoeditor/filters/RedEyeFilter.java
hotoeditor/filters/RotateFilter.java
hotoeditor/filters/SaturationFilter.java
hotoeditor/filters/SepiaFilter.java
hotoeditor/filters/ShadowFilter.java
hotoeditor/filters/SharpenFilter.java
hotoeditor/filters/StraightenFilter.java
hotoeditor/filters/TintFilter.java
hotoeditor/filters/VignetteFilter.java
2c6ea941a80ea22317d664e329aed51f5f7417b9 25-Oct-2012 nicolasroard <nicolasroard@google.com> Add rotation to tinyplanet view

bug:7389189
Change-Id: Ib072879190bcd96c552581bf9240876b10ca362d
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilterTinyPlanet.java
iltershow/imageshow/ImageTinyPlanet.java
6bedee874b8be3a3d121c8cd555d0fda9d6eea98 25-Oct-2012 nicolasroard <nicolasroard@google.com> am 7592704e: Fixes UI stuff

* commit '7592704e662e49e4bbf3ba86a43d790774829bb0':
Fixes UI stuff
7592704e662e49e4bbf3ba86a43d790774829bb0 25-Oct-2012 nicolasroard <nicolasroard@google.com> Fixes UI stuff

bug:7393871
bug:7387596
Change-Id: I833c6f713ab71c4dce896f66e191a2a1a42b3e2f
iltershow/FilterShowActivity.java
iltershow/ui/FramedTextButton.java
5122c99a4af38167c58e0059c4dbe947a64536bf 25-Oct-2012 Teng-Hui Zhu <ztenghui@google.com> am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches

* commit 'ecbdca3de8ada82d3d6f723d9ba509a3b1b1b290':
Initialize the modified date correctly.
ecbdca3de8ada82d3d6f723d9ba509a3b1b1b290 25-Oct-2012 Teng-Hui Zhu <ztenghui@google.com> Merge "Initialize the modified date correctly." into gb-ub-photos-arches
6cea6759d2919b8491aeb9105e6d1484b1b0006b 25-Oct-2012 nicolasroard <nicolasroard@google.com> am 0a23b42e: Change background and panel colors

* commit '0a23b42e4a3e3a93ce7389bfb7352944f644add6':
Change background and panel colors
0a23b42e4a3e3a93ce7389bfb7352944f644add6 25-Oct-2012 nicolasroard <nicolasroard@google.com> Change background and panel colors

bug:7385980
Change-Id: I67edeeda0df311203e4cedc140d42a3d9d41a7b4
iltershow/FilterShowActivity.java
iltershow/imageshow/ImageSmallFilter.java
89c755cbe16f5fe6f57be429a850331cc67a46d5 25-Oct-2012 Teng-Hui Zhu <ztenghui@google.com> Initialize the modified date correctly.

On top of that, the date_taken is in units of seconds, while others are in
units of milliseconds.

bug:7307090

Change-Id: I3f14a6354fa72a20d228d49a92d5c2007ca29df1
pp/TrimVideo.java
ata/LocalVideo.java
baffd018fcd262c2cda1fa275c0d0236826be681 24-Oct-2012 Bobby Georgescu <georgescu@google.com> am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches

* commit '86282c8860edfec0df5c28d22d52aa4b59112d55':
Fix attempted uploading of recycled tiles
86282c8860edfec0df5c28d22d52aa4b59112d55 24-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches
1376c4dc718548d724bc0dafdae8c9d1524118d6 24-Oct-2012 John Reck <jreck@google.com> am d49d5320: Move loadBitmap to async task

* commit 'd49d53206a197b08ec4754d8751b6860e33d9f48':
Move loadBitmap to async task
d54825d1cad2ab586b6d32853acc09dc6df5945f 24-Oct-2012 Bobby Georgescu <georgescu@google.com> Fix attempted uploading of recycled tiles

Bug: 7405398
Change-Id: I17711f9c724af216aa22cee6a86d9feba84c1548
i/TiledTexture.java
d49d53206a197b08ec4754d8751b6860e33d9f48 24-Oct-2012 John Reck <jreck@google.com> Move loadBitmap to async task

Bug: 7406705

Change-Id: I4e540e08d239d2e57f0ae6be5d70c8777cdbab2a
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/filters/ImageFilterTinyPlanet.java
f77721afef7b839df36f151604e014130c1971f8 24-Oct-2012 Bobby Georgescu <georgescu@google.com> am 5bd00332: Launch built-in camera app via filmstrip

* commit '5bd00332556b20c141b5c7f16433d55b1bc7fe0f':
Launch built-in camera app via filmstrip
5bd00332556b20c141b5c7f16433d55b1bc7fe0f 24-Oct-2012 Bobby Georgescu <georgescu@google.com> Launch built-in camera app via filmstrip

Bug: 7407182
Change-Id: I25e0028dd5f3889f7837494e0bf25c54edbb4405
pp/PhotoPage.java
cc33fd6dac2e58707f13ff66ee04cf3489bd50a9 24-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am eb6a24e1: Took out aspect ratio switching.

* commit 'eb6a24e13ab8bc6f2a70bf5e8cc70f469809acb9':
Took out aspect ratio switching.
eb6a24e13ab8bc6f2a70bf5e8cc70f469809acb9 24-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Took out aspect ratio switching.

Bug: 7406414
Change-Id: Iba6e59d728d6f1ce81ea62b01a86dfaa355383b9
iltershow/PanelController.java
iltershow/imageshow/ImageCrop.java
2281b682c459a978391a8cbf54e8944ea4937f40 24-Oct-2012 nicolasroard <nicolasroard@google.com> am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches

* commit 'ca05711f0e6f788f0e2937fef04599d612911ca6':
Save the image when applying tiny planet
ca05711f0e6f788f0e2937fef04599d612911ca6 24-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
98ba1a5eb757bb358d75b2f2e5d6fc4c11d805d9 24-Oct-2012 nicolasroard <nicolasroard@google.com> Save the image when applying tiny planet

bug:7403622
Change-Id: Ic199b163d6418b6d45c2da10b915f2088dd52e16
iltershow/FilterShowActivity.java
iltershow/PanelController.java
0b8c14595e65bfbd62be49af2ea631308a10d2d7 24-Oct-2012 John Hoford <hoford@google.com> am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches

* commit 'de00ad0d02f4e328b93a1f5aa393dadf6e685033':
limited the size of textures to 2048
de00ad0d02f4e328b93a1f5aa393dadf6e685033 24-Oct-2012 John Hoford <hoford@google.com> Merge "limited the size of textures to 2048" into gb-ub-photos-arches
20ae55ef793f8a307fd0fc03a6010c36e7cbc56b 24-Oct-2012 John Hoford <hoford@google.com> limited the size of textures to 2048

bug:7404007
Change-Id: I77fac900e213ca16c2accfa8f59d0cd300559836
iltershow/cache/ImageLoader.java
a0d8436738e4d13b4fdbbe245c126ff33e410857 24-Oct-2012 Bobby Georgescu <georgescu@google.com> am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches

* commit 'a1d04a4aef8117fa0c98b34a931a18a7b46073e3':
Do not show bottom controls when undo bar is visible
949584340c9f5f41a6133ba06058af280490f0c8 24-Oct-2012 Bobby Georgescu <georgescu@google.com> Do not show bottom controls when undo bar is visible

Bug: 7403458
Change-Id: I1e789ebd7f08256a1ccbdb2ac9f2f9f97d0859c6
pp/PhotoPage.java
i/PhotoView.java
51881e022f428a061188ecb33cc853d31dfb48d1 24-Oct-2012 Bobby Georgescu <georgescu@google.com> am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches

* commit 'f4a732646e9a4bf6f1f02b4eac0147adca4287c9':
Do not show Camera placeholder when not appropriate
f4a732646e9a4bf6f1f02b4eac0147adca4287c9 24-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
f3958f87ddd1bd040ab50dea72280df95a4811f1 24-Oct-2012 Owen Lin <owenlin@google.com> am adee31f0: Use TiledTexture for thumbnails.

* commit 'adee31f028d839e7baa8f9e052dc4e4d60b137da':
Use TiledTexture for thumbnails.
adee31f028d839e7baa8f9e052dc4e4d60b137da 22-Oct-2012 Owen Lin <owenlin@google.com> Use TiledTexture for thumbnails.

1. Use TiledTexture for thumbnails to prevent jank in uploading big
thumbnails. (e.g., 512 * 512)
2. Use larger thumbnails (DISPLAY_LONG_SIDE / 5).

bug: 7381302

Change-Id: I7661d648373e893b40b2a0304037171760091e00
ata/ImageCacheService.java
i/AlbumSetSlidingWindow.java
i/AlbumSetSlotRenderer.java
i/AlbumSlidingWindow.java
i/AlbumSlotRenderer.java
i/FadeInTexture.java
i/FadeOutTexture.java
i/FadeTexture.java
i/TiledTexture.java
til/GalleryUtils.java
b682706f542e7f43e189a1e608446d5440dea860 24-Oct-2012 Sascha Haeberling <haeberling@google.com> am c60752b2: Use XMP meta-data for correct tiny planets.

* commit 'c60752b28bcdc859b24040f77883568e0838ed74':
Use XMP meta-data for correct tiny planets.
c60752b28bcdc859b24040f77883568e0838ed74 24-Oct-2012 Sascha Haeberling <haeberling@google.com> Use XMP meta-data for correct tiny planets.

Bug: 7403766

Change-Id: Ie03d40d0396d352d6fe48c91b995a2f872c98a06
iltershow/cache/ImageLoader.java
iltershow/filters/ImageFilterTinyPlanet.java
1d86603133491fcc0e96eaa38b14da18161857dc 24-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am eb75699b: Fixed scaling factor for ImageShow and rotations.

* commit 'eb75699bcd5762a9ffd7ee0d4d14a4e5eb2e2389':
Fixed scaling factor for ImageShow and rotations.
eb75699bcd5762a9ffd7ee0d4d14a4e5eb2e2389 24-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Fixed scaling factor for ImageShow and rotations.

Bug: 7392240
Bug: 7386048
Change-Id: I156c52acbd041604df2f7ccacca3a80f1b9fdb3b
iltershow/imageshow/GeometryMath.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageShow.java
3ad7bbc55d7aaa0f36a7242fdd0f612d877adc19 24-Oct-2012 Bobby Georgescu <georgescu@google.com> Do not show Camera placeholder when not appropriate

Bug: 7403454
Change-Id: I5cc0227f068da0ca596e6259314b9d2ade62de07
pp/PhotoPage.java
5a093c66b71b00a2a70da104d94667a8080e9464 24-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches

* commit '3fb2007892a436f704dc168c0549a6c8ee201e4a':
Fix so mirror gets applied.
842257ca6aa393a1674d6a88674a28336c6ac63c 24-Oct-2012 Nicolas Roard <nicolasroard@google.com> am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches

* commit 'd3aebee7b35ff969fce3607a5c051d607ca42ec7':
Support XMP data, fixed read file on another thread
3fb2007892a436f704dc168c0549a6c8ee201e4a 24-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Fix so mirror gets applied." into gb-ub-photos-arches
d3aebee7b35ff969fce3607a5c051d607ca42ec7 24-Oct-2012 Nicolas Roard <nicolasroard@google.com> Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches
75bfc6824f213d9fe65abb74bd17b31c9b63cc9d 24-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Fix so mirror gets applied.

Bug: 7402773
Change-Id: I531b795c2f43379e9eaf1ad3b9292e62c867ec3c
iltershow/imageshow/GeometryMetadata.java
413c7109c24b7db173032872c5b2e4cd2347d387 24-Oct-2012 Doris Liu <tianliu@google.com> am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches

* commit '5d3e665359272f8b7b379461ede24918d6b4537e':
Stay in AlbumPage when dismissing a popup from AP
5d3e665359272f8b7b379461ede24918d6b4537e 24-Oct-2012 Doris Liu <tianliu@google.com> Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
3d4f2c7443f6f6015efab769bfaad19263137c67 24-Oct-2012 John Hoford <hoford@google.com> Support XMP data, fixed read file on another thread

bug:7293391
Change-Id: I634857dea3c4d0d204c3fb40f0eec9dc1a9af263
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
c3a485975fbcf3e1dd81016830a7fa209acb1d7d 24-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am f46da69a: Increased touch tolerance in cropping.

* commit 'f46da69aefd9afe0b4326a2fcea8e33c294136bb':
Increased touch tolerance in cropping.
f46da69aefd9afe0b4326a2fcea8e33c294136bb 23-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Increased touch tolerance in cropping.

Bug: 7342281

Change-Id: Ice2ba5f07074b1518e4064bbda489aae7ba17b22
iltershow/FilterShowActivity.java
iltershow/imageshow/ImageCrop.java
5b1e444b4b6544b04c58be3b9b9a9a64ca4b572d 24-Oct-2012 Doris Liu <tianliu@google.com> Stay in AlbumPage when dismissing a popup from AP

Bug: 7384972

Change-Id: Ie2434ecc203a98610f1954b73a3d6916940eb812
pp/AlbumPage.java
pp/StateManager.java
bdfccda88176023597fc1867e77411b28ffff63f 24-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am a4122499: Reworked crop/transform UI.

* commit 'a41224997ef9be9c0d04534f7b6b9c6b933bfe05':
Reworked crop/transform UI.
a41224997ef9be9c0d04534f7b6b9c6b933bfe05 22-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Reworked crop/transform UI.

Bug: 7385644
Bug: 7378335
Bug: 7366075

Change-Id: Iee7e0a0741b69269b08726bad45e29d86834054e
iltershow/PanelController.java
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/GeometryMath.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageFlip.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageRotate.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageStraighten.java
4b2c4ecbadda7d2f15f4eb933bfe917dfc63fbc8 24-Oct-2012 John Hoford <hoford@google.com> am 67fefdb9: add support for black and white filters, add rotation API to tiny planet

* commit '67fefdb9b77644c955e1c0c5b1fcd51e2374f212':
add support for black and white filters, add rotation API to tiny planet
c67bc34b5466298ce972b9c1b8949d47f0e2cea0 24-Oct-2012 Bobby Georgescu <georgescu@google.com> am a850a543: Fix jank when launching editor from Camera filmstrip

* commit 'a850a543225e9f7a72c5a49bb6099573c7efda13':
Fix jank when launching editor from Camera filmstrip
67fefdb9b77644c955e1c0c5b1fcd51e2374f212 24-Oct-2012 John Hoford <hoford@google.com> add support for black and white filters, add rotation API to tiny planet

bug:7386370
bug:7389189
Change-Id: I1720893000c39edf28a356fb7b56634f004ef120
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilterBwFilter.java
iltershow/filters/ImageFilterTinyPlanet.java
a850a543225e9f7a72c5a49bb6099573c7efda13 24-Oct-2012 Bobby Georgescu <georgescu@google.com> Fix jank when launching editor from Camera filmstrip

Bug: 7301182
Status bar visibility in FilterShow will now match
the one in Camera/Gallery so that there isn't weird
jank when launching.

Change-Id: I3e942633b351264d2cd38cc5b587de32e38521ed
pp/AbstractGalleryActivity.java
pp/PhotoPage.java
iltershow/FilterShowActivity.java
a482d85068e39eb28cb854bc142d882b95b3b10c 24-Oct-2012 nicolasroard <nicolasroard@google.com> am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches

* commit 'cb993ff18944a7ba1981406c3c8adf3fe36755c0':
Express the borders size in percentages
94fa0565844a6095d52d45cfe366425110666b42 24-Oct-2012 John Reck <jreck@google.com> am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches

* commit 'd6453edcdbdad2706d8ce4a4fddd8f7df347b78c':
Fix NPE
cb993ff18944a7ba1981406c3c8adf3fe36755c0 24-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Express the borders size in percentages" into gb-ub-photos-arches
d6453edcdbdad2706d8ce4a4fddd8f7df347b78c 24-Oct-2012 John Reck <jreck@google.com> Merge "Fix NPE" into gb-ub-photos-arches
71647c7af135e397035398aee3d7be7a0ebad670 24-Oct-2012 George Mount <mount@google.com> am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches

* commit '7d7f91e1771e67af1fca5f2b3f221968df3de077':
Fix NPE in detecting panoramas.
7d7f91e1771e67af1fca5f2b3f221968df3de077 24-Oct-2012 George Mount <mount@google.com> Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
e6c566e7e25b7f961f501c878e98d3ca640e63d8 23-Oct-2012 John Reck <jreck@google.com> Fix NPE

Bug: 7399438

Change-Id: Ida0bcc0689d5a797e3c60c3ee51542512fbadf1e
i/PhotoView.java
bd4ea013d97d896b7865993dc9917313a7040259 23-Oct-2012 nicolasroard <nicolasroard@google.com> am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches

* commit 'ea6360298ca823634c9f2ee8990546f753288da9':
Hide the history panel on rotation
f129cb70f4d2b43a147b399d91650414defa6dd9 23-Oct-2012 nicolasroard <nicolasroard@google.com> Express the borders size in percentages

bug:7379459
Change-Id: I14c91dbee0480a3880a11b166fcce3673c2ff3eb
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterParametricBorder.java
231fe15ddb1cb4788b1b02ce5512587e45e3b249 23-Oct-2012 George Mount <mount@google.com> Fix NPE in detecting panoramas.

Bug 7398022

Change-Id: Iae646c424ffbe552d014f563c8f4e5e4385b4724
pp/PanoramaMetadataSupport.java
a9bc8ef5774557a66bcb9bb6d38cb16f7ef56e2e 23-Oct-2012 nicolasroard <nicolasroard@google.com> Hide the history panel on rotation

bug:7386882
Change-Id: Id68fa1680318b85b4b5b5e54221377d504687d93
iltershow/FilterShowActivity.java
bc9d4ccc65df9acd1d3a152bd78bb4c041f1281c 23-Oct-2012 nicolasroard <nicolasroard@google.com> am 5d7e98f7: Fix another potential crash in Curves

* commit '5d7e98f781fbd450295850d00adfb50540d53b3f':
Fix another potential crash in Curves
5d7e98f781fbd450295850d00adfb50540d53b3f 23-Oct-2012 nicolasroard <nicolasroard@google.com> Fix another potential crash in Curves

bug:7379140
Change-Id: I5f2f21b56595799c0e46e13bf5278b44803f4080
iltershow/ui/ImageCurves.java
iltershow/ui/Spline.java
0b44017c53fabaa7a9434bf21708a94b48a5db52 23-Oct-2012 nicolasroard <nicolasroard@google.com> am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches

* commit '361f6234c02207b2d812db0b2aeed267013c9a1f':
Fix flickering in geometry panel
361f6234c02207b2d812db0b2aeed267013c9a1f 23-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
fb90fd60f155f6fef0334a0739be55a2717c17f5 23-Oct-2012 nicolasroard <nicolasroard@google.com> Fix flickering in geometry panel

bug:7344214
Change-Id: I34c980061c2d51e7b97ec95fc77e3331cffdf8d5
iltershow/imageshow/ImageShow.java
iltershow/presets/ImagePreset.java
f30096b4f1f3de6fd4c95e706c10cdfd72a5db3b 23-Oct-2012 Bobby Georgescu <georgescu@google.com> am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches

* commit 'c162c8b70b795e95ebe53154ddb86ecf188eade0':
Show Panorama viewer button in filmstrip mode
c162c8b70b795e95ebe53154ddb86ecf188eade0 23-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
e5a3ff7692de92739645d97d72b5bdc599fd6fbf 23-Oct-2012 nicolasroard <nicolasroard@google.com> am a9f280f9: Add copyright notices

* commit 'a9f280f938b5fd5891c5cfe0999f8f1d4945d7a1':
Add copyright notices
c02be7d6224c0b4e81c86e19c3d101ea070c7e1d 23-Oct-2012 Bobby Georgescu <georgescu@google.com> Show Panorama viewer button in filmstrip mode

Bug: 7393346
Change-Id: I555ef6cfee0ac3992f0a84c69a1eafc19718ce4c
pp/PhotoPage.java
a9f280f938b5fd5891c5cfe0999f8f1d4945d7a1 23-Oct-2012 nicolasroard <nicolasroard@google.com> Add copyright notices

bug:7387634
Change-Id: Iaac0b55c9857f609312b78a613d074d323174ea1
iltershow/CenteredLinearLayout.java
iltershow/FilterShowActivity.java
iltershow/HistoryAdapter.java
iltershow/ImageStateAdapter.java
iltershow/PanelController.java
iltershow/cache/BitmapCache.java
iltershow/cache/Cache.java
iltershow/cache/DelayedPresetCache.java
iltershow/cache/DirectPresetCache.java
iltershow/cache/ZoomCache.java
iltershow/filters/ColorSpaceMatrix.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterBW.java
iltershow/filters/ImageFilterBWBlue.java
iltershow/filters/ImageFilterBWGreen.java
iltershow/filters/ImageFilterBWRed.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterContrast.java
iltershow/filters/ImageFilterCurves.java
iltershow/filters/ImageFilterExposure.java
iltershow/filters/ImageFilterFx.java
iltershow/filters/ImageFilterGradient.java
iltershow/filters/ImageFilterHue.java
iltershow/filters/ImageFilterParametricBorder.java
iltershow/filters/ImageFilterRS.java
iltershow/filters/ImageFilterRedEye.java
iltershow/filters/ImageFilterSaturated.java
iltershow/filters/ImageFilterShadows.java
iltershow/filters/ImageFilterSharpen.java
iltershow/filters/ImageFilterStraighten.java
iltershow/filters/ImageFilterTinyPlanet.java
iltershow/filters/ImageFilterVibrance.java
iltershow/filters/ImageFilterVignette.java
iltershow/filters/ImageFilterWBalance.java
iltershow/imageshow/GeometryMath.java
iltershow/imageshow/ImageBorder.java
iltershow/imageshow/ImageSmallBorder.java
iltershow/imageshow/ImageSmallFilter.java
iltershow/imageshow/ImageWithIcon.java
iltershow/imageshow/ImageZoom.java
iltershow/presets/ImagePreset.java
iltershow/presets/ImagePresetBW.java
iltershow/presets/ImagePresetBWBlue.java
iltershow/presets/ImagePresetBWGreen.java
iltershow/presets/ImagePresetBWRed.java
iltershow/presets/ImagePresetFX.java
iltershow/presets/ImagePresetOld.java
iltershow/presets/ImagePresetSaturated.java
iltershow/presets/ImagePresetXProcessing.java
iltershow/provider/SharedImageProvider.java
iltershow/ui/ControlPoint.java
iltershow/ui/FramedTextButton.java
iltershow/ui/ImageButtonTitle.java
iltershow/ui/ImageCurves.java
iltershow/ui/SliderController.java
iltershow/ui/SliderListener.java
iltershow/ui/Spline.java
cdaa77d200c27a7fa2ba5be03bfcd24487cdcb58 23-Oct-2012 nicolasroard <nicolasroard@google.com> am ec995b6b: Fix slow / jerky tracking in Curves

* commit 'ec995b6bf6e2476e820b1e02d0d3a567b1ecb2fc':
Fix slow / jerky tracking in Curves
ec995b6bf6e2476e820b1e02d0d3a567b1ecb2fc 23-Oct-2012 nicolasroard <nicolasroard@google.com> Fix slow / jerky tracking in Curves

bug:7394837
Change-Id: I70758b463601faa19d05da58d0163b31df7b4b91
iltershow/ui/ImageCurves.java
iltershow/ui/Spline.java
488547b08f909a2f35433764fc97a5f8c7c990df 23-Oct-2012 nicolasroard <nicolasroard@google.com> am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

* commit '2569df233987d1f43400a813ceb2ce72c738a4c3':
Shows filtered images in geometry modules and comparison.
2569df233987d1f43400a813ceb2ce72c738a4c3 23-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches
3bfbae1d63fc755b8fef3b200912b03a1f3ec3a9 23-Oct-2012 George Mount <mount@google.com> am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches

* commit '24af89b96e824e4a5f9053c2024f507087117c22':
Ensure photo sphere icon shows for panoramas.
24af89b96e824e4a5f9053c2024f507087117c22 23-Oct-2012 George Mount <mount@google.com> Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches
31529940021b9a18611b1a3fb4a0317ab8c89618 20-Oct-2012 nicolasroard <nicolasroard@google.com> Shows filtered images in geometry modules and comparison.

bug:7279469
bug:7379286
bug:7344214
bug:7379140

Also:
- cache multiple version (with/without geometry or filters applied)
- doesn't show the original image anymore when waiting for a filtered version (shows nothing instead for now)
- fix potential crash in Curves

Change-Id: I4eabd42c30f6d370571f177d5efe92550798aed8
iltershow/cache/DirectPresetCache.java
iltershow/cache/ImageLoader.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSlave.java
iltershow/imageshow/ImageSmallBorder.java
iltershow/imageshow/ImageSmallFilter.java
iltershow/imageshow/ImageZoom.java
iltershow/presets/ImagePreset.java
iltershow/ui/ImageCurves.java
a11d5c16384cbe2445966af5d7cb0f9d1d66cf17 23-Oct-2012 George Mount <mount@google.com> Ensure photo sphere icon shows for panoramas.

Bug 7393844

Change-Id: Id3b0d15606ec6e5d41558cbfc5089c4b1b229c63
pp/PhotoPageBottomControls.java
ea7366a517c9142a8e35d19a64e9964bb96ad2a8 23-Oct-2012 John Hoford <hoford@google.com> am 5fbfe6f1: on entry check if Tiny Planet if not remove UI

* commit '5fbfe6f1d1f407e68b7334c6a5988f20bcf16d79':
on entry check if Tiny Planet if not remove UI
5fbfe6f1d1f407e68b7334c6a5988f20bcf16d79 23-Oct-2012 John Hoford <hoford@google.com> on entry check if Tiny Planet if not remove UI

bug:7391885
Change-Id: Ic2bffa9f9fbaa2d437ce231a1478a1b63a0eed83
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
0df51da9b67e1c66f0a85a475ce567c11b8d4aa1 23-Oct-2012 Bobby Georgescu <georgescu@google.com> am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches

* commit 'afa5ac4c6f81f0fe8faf072ba84bfa8fd9083a6c':
Minor transition tweaks
afa5ac4c6f81f0fe8faf072ba84bfa8fd9083a6c 23-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Minor transition tweaks" into gb-ub-photos-arches
7ad3eb28f0ab85669841c1b5589982834b465c1b 23-Oct-2012 Doris Liu <tianliu@google.com> am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches

* commit '3a64ad361b9d48407abd902b26949d3c6b34af66':
Show panorama thumbs in Gallery grid view
3a64ad361b9d48407abd902b26949d3c6b34af66 23-Oct-2012 Doris Liu <tianliu@google.com> Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
b1b0ab99bebae3629a55c634cdf842d0d2f212d9 23-Oct-2012 Bobby Georgescu <georgescu@google.com> Minor transition tweaks

Bug: 7376109
Change-Id: Id4a761c3d601e453ac1ad2edbbea986af14bb21c
nim/StateTransitionAnimation.java
2f060cc74ab6be5e5dd39e53dc99941b368ffb60 20-Oct-2012 Doris Liu <tianliu@google.com> Show panorama thumbs in Gallery grid view

Bug: 7362229
Bug: 7378208

In addition to showing pano thumbs, this CL also removes the video play
icon on the top-level album view thumbnails.

Change-Id: I950bc66c38575036d5ad7464a2fd9a5dea9fae4b
i/AbstractSlotRenderer.java
i/AlbumSetSlidingWindow.java
i/AlbumSetSlotRenderer.java
i/AlbumSlidingWindow.java
i/AlbumSlotRenderer.java
23cfddb44a19683b1f5a61200875048d7b916dd4 23-Oct-2012 Hung-ying Tyan <tyanh@google.com> am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches

* commit 'bdc0f6f2784b46ebe5d33d5e7e85bc347f07c468':
Move new exif lib to gallerycommon.
bdc0f6f2784b46ebe5d33d5e7e85bc347f07c468 23-Oct-2012 Hung-ying Tyan <tyanh@google.com> Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
fdfced2d4eb28e510926aa704921cfe2d6e170b5 23-Oct-2012 John Reck <jreck@google.com> am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches

* commit 'ff4e0460b4cdeb329e37cb5f41eedc45717a17c4':
Drive GLRootView with Choreographer
ff4e0460b4cdeb329e37cb5f41eedc45717a17c4 23-Oct-2012 John Reck <jreck@google.com> Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
b75f5defe8ace12b8b563e713f7175863ab5713d 23-Oct-2012 John Reck <jreck@google.com> Drive GLRootView with Choreographer

Bug: 7332724
By routing requestRender through postOnAnimation we can drive
the GLRootView's rendering with the UI thread's coreographer, which
ensures that touch events are processed before drawing

Change-Id: Iac2b3229e9a09ee0319c64c5fc7cb906512a379c
i/GLRootView.java
b21c127cf83ccc1bd86deb3fb35fea974e69957c 23-Oct-2012 Bobby Georgescu <georgescu@google.com> am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches

* commit 'e96e907a01c0d633828dade014f07a5b93b07356':
Scroll to placeholder in gallery filmstrip launches camera
e96e907a01c0d633828dade014f07a5b93b07356 23-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches
91814c2e343b9a0b602e38816047bfd7cb58007c 23-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches

* commit '168db2f10069c3a15a9c3b9d0325cac0ae779b99':
Fix geometry xforms & minor bug.
168db2f10069c3a15a9c3b9d0325cac0ae779b99 23-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
cc6ad8217cb09b778d400c9c5e5928170ca53737 22-Oct-2012 Bobby Georgescu <georgescu@google.com> Scroll to placeholder in gallery filmstrip launches camera

Bug: 7368079
Change-Id: I50323b6b4d64672486cdca785b9f1e1ae2f02a97
pp/PhotoPage.java
f2272574dcefc4e1f369fbf0de55559d1548c741 22-Oct-2012 George Mount <mount@google.com> am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches

* commit '58d326ea368ae275f03ec158a9ec5f9d2965593a':
Add null-check for StitchingServiceProvider.
58d326ea368ae275f03ec158a9ec5f9d2965593a 22-Oct-2012 George Mount <mount@google.com> Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
4ed09a1d07d7a0cb8bb966b9c68e3ac5cc5fa889 19-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Fix geometry xforms & minor bug.

Bug: 7376048

Fixed geometry transform. Fixed minor bug where the foldername
for saved edited images was incorrect.

Change-Id: I901df11cf71cd987b354dd7821fef7a484b0cbd3
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/GeometryMetadata.java
cb3a3da9a11dbebbdc77ff91ea5b18358295a43e 22-Oct-2012 George Mount <mount@google.com> Add null-check for StitchingServiceProvider.

Bug 7386827

Change-Id: Id1ec7399202c6e67bb215f1309697b2f718a3c03
pp/GalleryAppImpl.java
3434759816cea392a78df62a1ad3d0151163510a 22-Oct-2012 Bobby Georgescu <georgescu@google.com> am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches

* commit '1dace572562075e755823bbb7b02d09bb6ca1259':
Better transition between Gallery and editor
85930f99d020b9b8bac7bd29cf77434c034d152a 22-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am 0a32b7af: Fix to ensure visible history adapter strings are from xml.

* commit '0a32b7afc5286a5c7aa334b9338591d61a49731f':
Fix to ensure visible history adapter strings are from xml.
1dace572562075e755823bbb7b02d09bb6ca1259 22-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Better transition between Gallery and editor" into gb-ub-photos-arches
0a32b7afc5286a5c7aa334b9338591d61a49731f 20-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Fix to ensure visible history adapter strings are from xml.

Bug: 7379327
Change-Id: I5fcb6fec1e9abe05689dd3b9f4e70e518a9e09d1
iltershow/FilterShowActivity.java
iltershow/HistoryAdapter.java
iltershow/PanelController.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageFlip.java
iltershow/imageshow/ImageRotate.java
iltershow/imageshow/ImageStraighten.java
iltershow/presets/ImagePreset.java
48129f36b96928b34e657cdc976c1ac19f7b5ad2 22-Oct-2012 Bobby Georgescu <georgescu@google.com> Better transition between Gallery and editor

Bug: 7346155
Change-Id: I5f6b0901df4aa37d1657c13917aeae7ad77ac9bf
pp/PhotoPage.java
cd8014124cb3b9354155d84cfc45811280e7d24b 22-Oct-2012 nicolasroard <nicolasroard@google.com> am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches

* commit '51e5b7198dbf31bdfaefc7d01517050359571eb8':
Fix the undo/redo/reset menu item state
51e5b7198dbf31bdfaefc7d01517050359571eb8 22-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
b96be14eb71884e086df66d20c2a02768958565f 22-Oct-2012 Bobby Georgescu <georgescu@google.com> am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches

* commit 'e42eca39c726bce2452ee9d9a1c4d4cb042031ba':
Tweak transition animations
e42eca39c726bce2452ee9d9a1c4d4cb042031ba 22-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Tweak transition animations" into gb-ub-photos-arches
a41c877619656e2a8f07efc1efcf9dcecffd5f9d 22-Oct-2012 Bobby Georgescu <georgescu@google.com> Tweak transition animations

Bug: 7376109
Change-Id: I28cc8413bda31ff945e8e48dd75b86b2e9d071a8
nim/StateTransitionAnimation.java
e686a42b89aaa6e4286833a361066e7d372522ce 19-Oct-2012 Hung-ying Tyan <tyanh@google.com> Move new exif lib to gallerycommon.

https://googleplex-android-review.googlesource.com/#/c/242047 depends on this.

Bug: 6667860
Change-Id: Iac937e2eea94f0f5ffde876235b1c2ee748e7570
xif/CountedDataInputStream.java
xif/ExifData.java
xif/ExifInvalidFormatException.java
xif/ExifOutputStream.java
xif/ExifParser.java
xif/ExifReader.java
xif/ExifTag.java
xif/IfdData.java
xif/IfdId.java
xif/JpegHeader.java
xif/OrderedDataOutputStream.java
xif/Rational.java
xif/Util.java
23e58b3595de28bc8f899f3fba1ca9734533213c 22-Oct-2012 nicolasroard <nicolasroard@google.com> Fix the undo/redo/reset menu item state

bug:7357734

- enable/disable the undo/redo/reset menu item
depending on the history.

Change-Id: I633008bc9a99eef2e7289b290fc96120f09b3825
iltershow/FilterShowActivity.java
iltershow/HistoryAdapter.java
e4614408716f933d5d99247f57d61949e6201fae 22-Oct-2012 nicolasroard <nicolasroard@google.com> am c778aab1: Prevent unveil direction to change as long as no touch up

* commit 'c778aab129fb001fdff1ccf167867fc40fbf7523':
Prevent unveil direction to change as long as no touch up
c778aab129fb001fdff1ccf167867fc40fbf7523 22-Oct-2012 nicolasroard <nicolasroard@google.com> Prevent unveil direction to change as long as no touch up

bug:7385925
Change-Id: I16f17e6de1624f7a40b16641122103edc0f5bb64
iltershow/imageshow/ImageShow.java
e54e5002ed50aa66de70d6ccc7ba33c283b92434 22-Oct-2012 nicolasroard <nicolasroard@google.com> am 15a056e3: Fix crash in Curves module

* commit '15a056e3cc1970bc0b99dba71df8222ba0345859':
Fix crash in Curves module
15a056e3cc1970bc0b99dba71df8222ba0345859 22-Oct-2012 nicolasroard <nicolasroard@google.com> Fix crash in Curves module

bug:7379140
Change-Id: I26f30d24eb8cf2db9248f29549d8b435d941a325
iltershow/ui/ImageCurves.java
2f4ec4f1e283a5ba92d9986db2e39d6b7e235aa9 22-Oct-2012 nicolasroard <nicolasroard@google.com> am 104165f1: Fix several issues with crop/straighten

* commit '104165f1f9858bdebb2d219b077f5227203f7c02':
Fix several issues with crop/straighten
104165f1f9858bdebb2d219b077f5227203f7c02 22-Oct-2012 nicolasroard <nicolasroard@google.com> Fix several issues with crop/straighten

bug:7386266
bug:7386270
bug:7385727

- use a transparent white for the bounds instead of green
- add "rule of third" lines to the crop tool
- improves preview image quality for geometric operations

Change-Id: I94c233e7ea89d67451e7808fb71537d03a1c183d
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/ImageCrop.java
afc8c49fb1d0a806f4a07d2d62729388326ee8bf 22-Oct-2012 nicolasroard <nicolasroard@google.com> am 4d276f33: Only translate the main panel if we have to.

* commit '4d276f338bbdc53f8a3b4806265bc26c7fe0ea7c':
Only translate the main panel if we have to.
4d276f338bbdc53f8a3b4806265bc26c7fe0ea7c 21-Oct-2012 nicolasroard <nicolasroard@google.com> Only translate the main panel if we have to.

bug:7386882
Change-Id: Ib670eb4e513f0bbebd3ecca052fe27180dcf5fdc
iltershow/FilterShowActivity.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSlave.java
b1b1b8f029f460439ad98c16fece08c85af6e5da 21-Oct-2012 nicolasroard <nicolasroard@google.com> am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/

* commit '267c4c6a513671441031a9c21839995aecc4fc52':
Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
267c4c6a513671441031a9c21839995aecc4fc52 21-Oct-2012 nicolasroard <nicolasroard@google.com> Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/

bug:7384984
Change-Id: Id10c7ac08cc7aab4d2f4b19c88b20d0f3369807a
iltershow/filters/ImageFilterGeometry.java
5d4ba12701ebb090168437fcf39c286a006362a0 20-Oct-2012 Doris Liu <tianliu@google.com> am 2daced6b: Fix for active action bar in camera

* commit '2daced6baacd59850e7c64ea02f2479530654ed8':
Fix for active action bar in camera
2daced6baacd59850e7c64ea02f2479530654ed8 20-Oct-2012 Doris Liu <tianliu@google.com> Fix for active action bar in camera

Bug: 7377404
Bug: 7384972
Change-Id: Ic54a7501ed3e2a61fab272461dee474b693c8f3a
pp/AlbumPage.java
a4c85fc1f2b35bacb5ef1269fdc999fe98bbf7f4 20-Oct-2012 Sascha Haeberling <haeberling@google.com> am 2f879102: Adds a tiny planet (stereographic projection) image filter.

* commit '2f879102d630815df64636b8d37e3a7eea8e8b65':
Adds a tiny planet (stereographic projection) image filter.
2f879102d630815df64636b8d37e3a7eea8e8b65 20-Oct-2012 Sascha Haeberling <haeberling@google.com> Adds a tiny planet (stereographic projection) image filter.

Bug: 7293391

Also fixes an issue where the preview value was statically set to 100.
This adds a preview parameter value that can be set for this purpose.

Change-Id: I68c4ec04e86ab8a29ef7f561e5f21a298003677e
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterTinyPlanet.java
e6f7fe76f5d4af7384da81301323b1c92891b804 20-Oct-2012 John Hoford <hoford@google.com> am e9c55b28: Add the infrastructure to support Tiny Planet

* commit 'e9c55b28a4a155c2e1c1f5aec615a0c56e38ade4':
Add the infrastructure to support Tiny Planet
0def633fe16795629930ae9fbe58b91a46603634 20-Oct-2012 Bobby Georgescu <georgescu@google.com> am 41b3cff6: Fix delete and undo behavior on filmstrip

* commit '41b3cff60905a96ab5b6f8e5f42bcc3bab1eb605':
Fix delete and undo behavior on filmstrip
e9c55b28a4a155c2e1c1f5aec615a0c56e38ade4 20-Oct-2012 John Hoford <hoford@google.com> Add the infrastructure to support Tiny Planet

bug:7293391
Change-Id: I25d95b78a832fa5f20b661e13c4028041517da19
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterTinyPlanet.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSmallFilter.java
iltershow/presets/ImagePreset.java
41b3cff60905a96ab5b6f8e5f42bcc3bab1eb605 20-Oct-2012 Bobby Georgescu <georgescu@google.com> Fix delete and undo behavior on filmstrip

Bug: 7353749
Change-Id: Ib0abd3f71783c01b1df418dd76e674bf05e65ce7
pp/PhotoDataAdapter.java
pp/PhotoPage.java
i/PhotoView.java
be532361141af610e5fbc1270fb3bc467e5f7533 20-Oct-2012 nicolasroard <nicolasroard@google.com> am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches

* commit '3926a685eb08ee2bb5e6cf9dc03d070462f19f64':
Improves swipe gesture
3926a685eb08ee2bb5e6cf9dc03d070462f19f64 20-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Improves swipe gesture" into gb-ub-photos-arches
f7403a58d17e56de6e3bebd9ac08bc77f3cd43e4 19-Oct-2012 nicolasroard <nicolasroard@google.com> Improves swipe gesture

bug:7379463

- better timings
- add original label
- remove the gesture detector from ImageZoom (use the parent's one)

Change-Id: Ib6879e471dfc21cb3a112aa36a61cd304516cf7f
iltershow/FilterShowActivity.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageZoom.java
6e806709dbfec21b7cdfc2d8186e53568de073b8 20-Oct-2012 George Mount <mount@google.com> am 4dd4d80a: Remove progress bar when switching to grid mode.

* commit '4dd4d80af4cd3ba7555c12d1c1ba775e048b6c57':
Remove progress bar when switching to grid mode.
4dd4d80af4cd3ba7555c12d1c1ba775e048b6c57 19-Oct-2012 George Mount <mount@google.com> Remove progress bar when switching to grid mode.

Bug 7377975

Change-Id: I388fdf6c6c9a5ffa64e10f864806a8131e53a009
pp/PhotoPage.java
921b0a70ee6af2553361b66d10439f6a72316b4f 19-Oct-2012 Mangesh Ghiware <mghiware@google.com> am ea78390e: Re-enable crop for new panorama

* commit 'ea78390e87642b4bc3860ba6cbdfa655db3c9e46':
Re-enable crop for new panorama
ea78390e87642b4bc3860ba6cbdfa655db3c9e46 19-Oct-2012 Mangesh Ghiware <mghiware@google.com> Re-enable crop for new panorama

Bug: 7326215
Change-Id: Ic7a87baceb8aff6247d40b91d4c60cd47c86c377
i/MenuExecutor.java
91491889df7410dbd177c4cb708a6d10100c39a2 19-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches

* commit 'b48d73db3381718bcf86d1d919f6de9125f4f8a2':
Fix geometry xforms & minor bug.
b48d73db3381718bcf86d1d919f6de9125f4f8a2 19-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
5ae82e1e0ce26b7a7a2652df15f9c22dbdd3ff21 19-Oct-2012 Bobby Georgescu <georgescu@google.com> am 08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches

* commit '084413718180f286edc94320c593bbb75dbec40b':
Saner behavior when deleting in filmstrip mode
084413718180f286edc94320c593bbb75dbec40b 19-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches
f795b403ccaf9e1a012ee48f3de14afe4459d9d7 19-Oct-2012 Mangesh Ghiware <mghiware@google.com> am b037754e: Fix sharing state in Gallery ActionBar

* commit 'b037754eac0a4f99747edd3135776dc471d566f8':
Fix sharing state in Gallery ActionBar
e3ac74402443fb94d86054052dcaad99713bed10 19-Oct-2012 Bobby Georgescu <georgescu@google.com> Saner behavior when deleting in filmstrip mode

Bug: 7353749
Change-Id: Ic9854d205fe5ab76dd1cfe78fee314e93e1ace55
i/PhotoView.java
b037754eac0a4f99747edd3135776dc471d566f8 19-Oct-2012 Mangesh Ghiware <mghiware@google.com> Fix sharing state in Gallery ActionBar

Bug: 7340067
Change-Id: I4ff9577315fc743f6b9fef0d325b0743546f108e
pp/GalleryActionBar.java
00d64dd584c6d08310a32a28e75aebc6eb8238ea 19-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Fix geometry xforms & minor bug.

Bug: 7376048

Fixed geometry transform. Fixed minor bug where the foldername
for saved edited images was incorrect.

Change-Id: Icb3156f02b7db7b50a455aaa31ee70832e3fdca8
pp/PhotoPage.java
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageFlip.java
0f327c3297253c2ea67ec7ae32c0e6ba4917e648 19-Oct-2012 nicolasroard <nicolasroard@google.com> am c5590eb1: Improves Curves & Crop UI

* commit 'c5590eb1a20b112e67e4c43684790587f844fc6b':
Improves Curves & Crop UI
c5590eb1a20b112e67e4c43684790587f844fc6b 19-Oct-2012 nicolasroard <nicolasroard@google.com> Improves Curves & Crop UI

bug:7361722

- Use new assets
- Add a margin
- Add a popup menu
- Add a new button showing the current channel
- Add popup menu, new assets, new button for Crop as well

Change-Id: I0e09098e3135d2213f7f4cd64cd75a3a518a07da
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageShow.java
iltershow/ui/FramedTextButton.java
iltershow/ui/ImageCurves.java
iltershow/ui/Spline.java
c0ecc7076a32b184fb4f730996990e0345be804b 19-Oct-2012 Doris Liu <tianliu@google.com> am 4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches

* commit '4b6c20de6fef0aacb464398f2a6bf4b7959f4726':
Adding support for tiny planet in gallery
4b6c20de6fef0aacb464398f2a6bf4b7959f4726 19-Oct-2012 Doris Liu <tianliu@google.com> Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
51283054901d747c8e2db4609aa28590913b4ee7 19-Oct-2012 Bobby Georgescu <georgescu@google.com> am b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches

* commit 'b42ea0266c3b10e0b40119ec5c0adf6e9bb8973b':
Fix Gallery crash
b42ea0266c3b10e0b40119ec5c0adf6e9bb8973b 19-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Fix Gallery crash" into gb-ub-photos-arches
a680a0c32ae3321c632288b36083f2782af2c55b 19-Oct-2012 Doris Liu <tianliu@google.com> Adding support for tiny planet in gallery

Bug: 7344427
Change-Id: I6fad734b28022f45cc551d81212ee4d3a0c867b2
pp/PhotoPage.java
pp/PhotoPageBottomControls.java
iltershow/FilterShowActivity.java
35e7b4ae727394aace466ebcf33d89adf01b690c 19-Oct-2012 Bobby Georgescu <georgescu@google.com> Fix Gallery crash

Bug: 7268985
Change-Id: I88c823d3270cb74d6e2bd7df5b6b6ed9e28f16a6
pp/AlbumPage.java
9baf2fd55613ce3f545da2d341c8e8a36b82ee78 18-Oct-2012 Scott Main <smain@google.com> DO NOT MERGE
cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8
remove old fashioned Dream, no longer supported

Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8

Conflicts:

AndroidManifest.xml
pp/SlideshowDream.java
856ec7e57f8e02617dab5fdeb43604fd86f9d95c 19-Oct-2012 Bobby Georgescu <georgescu@google.com> am 79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches

* commit '79704855fb9b83acf9dc505f9ab1989ec1c770bc':
Do not show "Filmstrip view" text when photo is fullscreen
79704855fb9b83acf9dc505f9ab1989ec1c770bc 19-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
5415b4cbeb106f090f25a9913fea5d56d6e07d4f 19-Oct-2012 John Reck <jreck@google.com> am 014a111f: Save XMP & Exif data on edited photos

* commit '014a111f10a7523415ca210bc6fe1e4f00183d31':
Save XMP & Exif data on edited photos
8f6e1dc361d57e8cabb6dcce3d06edaa1c25f21c 19-Oct-2012 nicolasroard <nicolasroard@google.com> am d7899c56: Fix undo/redo/back button behaviour with effects and enable history

* commit 'd7899c56b8df278dfd6720ae11eadc2f89fe8094':
Fix undo/redo/back button behaviour with effects and enable history
014a111f10a7523415ca210bc6fe1e4f00183d31 18-Oct-2012 John Reck <jreck@google.com> Save XMP & Exif data on edited photos

Bug: 7293391
Bug: 7329199
Bug: 7376660

Change-Id: I23b1637a9a494c1dc43b1fc1359cdaf3e75bc23f
iltershow/cache/ImageLoader.java
iltershow/presets/ImagePreset.java
iltershow/tools/ProcessedBitmap.java
iltershow/tools/SaveCopyTask.java
d7899c56b8df278dfd6720ae11eadc2f89fe8094 18-Oct-2012 nicolasroard <nicolasroard@google.com> Fix undo/redo/back button behaviour with effects and enable history

bug:7332980
bug:7357734
bug:7325872
Change-Id: Ie952a410c218c91ac927095ddcf542209fe7b90c
iltershow/FilterShowActivity.java
iltershow/HistoryAdapter.java
iltershow/PanelController.java
iltershow/filters/ImageFilterCurves.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageFlip.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageRotate.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSlave.java
iltershow/imageshow/ImageStraighten.java
iltershow/ui/ImageCurves.java
iltershow/ui/Spline.java
c29588d7cc9fc3d2eef61af433fc0a8859e16ef4 19-Oct-2012 Bobby Georgescu <georgescu@google.com> Do not show "Filmstrip view" text when photo is fullscreen

Bug: 243374
Change-Id: I2d0a1d56e6c2d833d9d75041b30afcb988635c49
pp/PhotoPage.java
b69af65f5c1e957f4b5b39c7c381c7a28eb409ce 19-Oct-2012 George Mount <mount@google.com> am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches

* commit '0745eba4898419aad2b6e79be137a2a1edf4d0fc':
Remove panorama checks from supported operations.
f52d90a1610469dfa195ee89cee7a72ac2333400 19-Oct-2012 nicolasroard <nicolasroard@google.com> am 60d25279: Handle screen rotation

* commit '60d252795f41d0cfe4d0e11b4d1e32d4547368c9':
Handle screen rotation
0745eba4898419aad2b6e79be137a2a1edf4d0fc 19-Oct-2012 George Mount <mount@google.com> Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
4b4dbd225685502f4249c2bf25bf74f7ce526645 18-Oct-2012 George Mount <mount@google.com> Remove panorama checks from supported operations.

Bug 7351383
Bug 7349438
Move panorama support checks from getSupportedOperations so
that calls to getSupportedOperations are consistent. Panorama
checks are moved to only based on callbacks.

Change-Id: Id9ff138204df84c6fb0a4c971dcea59f1220aee2
pp/GalleryAppImpl.java
pp/PanoramaMetadataSupport.java
pp/PhotoPage.java
pp/PhotoPageBottomControls.java
ata/DataManager.java
ata/LocalImage.java
ata/MediaObject.java
ata/PanoramaMetadataJob.java
ata/UriImage.java
i/ActionModeHandler.java
i/MenuExecutor.java
60d252795f41d0cfe4d0e11b4d1e32d4547368c9 19-Oct-2012 nicolasroard <nicolasroard@google.com> Handle screen rotation

bug:7328773
Change-Id: I3c03c233a5b5a883963c8fd124c760655fd12bc7
iltershow/imageshow/ImageShow.java
99679734ef9b1665ae306fbecaa7e3ebf16d1b8e 19-Oct-2012 nicolasroard <nicolasroard@google.com> am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches

* commit 'c6ea040010a0794bc78a43c4522cfb03d9e488e2':
Fix broken build
c6ea040010a0794bc78a43c4522cfb03d9e488e2 19-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Fix broken build" into gb-ub-photos-arches
d2594385ace41da27d50f38eadf72831acd48175 19-Oct-2012 nicolasroard <nicolasroard@google.com> Fix broken build

Change-Id: I088926bd7fad32017861027d7786a4c178aca122
iltershow/PanelController.java
ff5061c84f6dd9914387fdd226ce44780f83407c 19-Oct-2012 nicolasroard <nicolasroard@google.com> am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches

* commit '4aad8963b583d812d61cbaa920b914876c5fa7d2':
Hide curve channel picker
255dad6d5265b5cae74c34e3af68d86aeb313370 19-Oct-2012 Bobby Georgescu <georgescu@google.com> am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches

* commit '0136dc75dc4069ca36c077a8a078db64f0fc35c6':
Various transition tweaks/fixes in Gallery
4aad8963b583d812d61cbaa920b914876c5fa7d2 19-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Hide curve channel picker" into gb-ub-photos-arches
0136dc75dc4069ca36c077a8a078db64f0fc35c6 19-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
33e58a68ee1d4866169d41b7d88c6eff0c70dae0 19-Oct-2012 nicolasroard <nicolasroard@google.com> Hide curve channel picker

bug:7375053
Change-Id: I7aa5f9db44dc657b0f4282a1bb2ea41bde322d36
iltershow/FilterShowActivity.java
iltershow/PanelController.java
26e119cebe732582df086ff56ec564d2989042fd 18-Oct-2012 Bobby Georgescu <georgescu@google.com> Various transition tweaks/fixes in Gallery

Bug: 7376109
-Add new animation preset for photos based on UX feedback
-Fix showing of highlight when tapping album grid photo
-Move StateTransition enum to StateTransitionAnimation.State

Change-Id: I2ce57580fa6c5f34d9545561515031899eb41eb2
nim/StateTransitionAnimation.java
pp/ActivityState.java
pp/AlbumPage.java
pp/StateManager.java
e3106a8c7fa64faaa0446a5ca94255ae0183b660 18-Oct-2012 Sascha Haeberling <haeberling@google.com> am 2576a29c: First cut at a skeleton for the TinyPlanets filter.

* commit '2576a29cccf1d96edeef071914e8b775c230e8e8':
First cut at a skeleton for the TinyPlanets filter.
aae561e748ec9d87c7724f4acd390736eedb782c 18-Oct-2012 Scott Main <smain@google.com> Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev
2576a29cccf1d96edeef071914e8b775c230e8e8 18-Oct-2012 Sascha Haeberling <haeberling@google.com> First cut at a skeleton for the TinyPlanets filter.

Bug: 7344426

This is not hooking up the real algorithm yet, but unblocks Doris so she
can add the button while we rewrite the algorithm.

Change-Id: I685b6c189e8ac124670db53c37565c4f1ff1f606
pp/PhotoPage.java
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterTinyPlanet.java
7b474a2ab38789e1f80ce60a62b4752c2a3cfe0b 18-Oct-2012 Doris Liu <tianliu@google.com> am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches

* commit '08e6b8650dfb11e282cca22da71750bcb2e5e478':
Fix for initial edited picture is gray
08e6b8650dfb11e282cca22da71750bcb2e5e478 18-Oct-2012 Doris Liu <tianliu@google.com> Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
41a99ab167b83fc41d604c82ceda33a875883e98 18-Oct-2012 Doris Liu <tianliu@google.com> Fix for initial edited picture is gray

Bug: 7373880
Change-Id: I0aa18ba850608437ae6327b3f3d676b218bcc75e
iltershow/tools/SaveCopyTask.java
bc1091bffc812117d360746fae240032bcbad531 18-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am eb4a9359: Fixed initial aspect button text.

* commit 'eb4a9359eaf8a717d6bda5df3d1831cf8f547423':
Fixed initial aspect button text.
eb4a9359eaf8a717d6bda5df3d1831cf8f547423 18-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Fixed initial aspect button text.

Bug: 7374910
Change-Id: I2c86b7c5b242f930692e2e6feda8a85533c509d8
iltershow/PanelController.java
453ec002e652c0125ec09e31348d6b73f89607ee 18-Oct-2012 Scott Main <smain@google.com> remove old fashioned Dream, no longer supported

Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8
pp/SlideshowDream.java
cc70347d279eb55bb941fa5669ee2eae1b220702 18-Oct-2012 Bobby Georgescu <georgescu@google.com> am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches

* commit '737552d7925366c58067d622e1b8df06786c51cc':
Big refactor, additions to state transition animations
737552d7925366c58067d622e1b8df06786c51cc 18-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches
637a7f1bba2c1096eab7f178c8b29c399b318f91 18-Oct-2012 Doris Liu <tianliu@google.com> am 0addfc7f: Save edited picasa to "Edited Online Photos" album

* commit '0addfc7f6342184a67cdd8b5cc3872c6a5c87e55':
Save edited picasa to "Edited Online Photos" album
0addfc7f6342184a67cdd8b5cc3872c6a5c87e55 18-Oct-2012 Doris Liu <tianliu@google.com> Save edited picasa to "Edited Online Photos" album

Bug: 7346157

This CL includes the following changes:
1) Save the new image to a new folder named "Edited Online Photos"
2) After the picture is saved, the user will be in the "Edited Online Photos" folder
3) Change the toast during saving to "Saving to" + new folder name

Change-Id: Ic505925425419ba9e3c7dac31fd403bf73d6887d
pp/PhotoPage.java
ata/LocalAlbum.java
ata/Path.java
iltershow/FilterShowActivity.java
iltershow/tools/SaveCopyTask.java
til/BucketNames.java
til/MediaSetUtils.java
5d596558ce319f5207991b25d38ca3470005f933 18-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am ef8597fe: Fixed disappearing aspect ratio button.

* commit 'ef8597fe38f9808096cc2f68921a54a6fc01e3f0':
Fixed disappearing aspect ratio button.
ef8597fe38f9808096cc2f68921a54a6fc01e3f0 18-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Fixed disappearing aspect ratio button.

Bug: 7369518
Change-Id: I5342339fa5a6e42d38b1ec7a8e6398bbb6901526
iltershow/PanelController.java
4831c7494373c360062a7becac820eba3bc39287 17-Oct-2012 Bobby Georgescu <georgescu@google.com> Big refactor, additions to state transition animations

Bug: 7362944
Refactored a lot of the state transitions code, adding
support for definable transition animations and defining
distinct outgoing and incoming animations.
Change-Id: I31a69057ea1b72dd3185cec656e59b11fdb528c1
nim/StateTransitionAnimation.java
pp/ActivityState.java
pp/StateManager.java
i/GLView.java
i/PositionController.java
i/PreparePageFadeoutTexture.java
193c3f0cbac09b69926217ac8c227860eeccd737 18-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am 3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches

* commit '3518ff575247a5ce923a0cd65fc82e046f8eaeae':
Added support for crop actions. Changed overflow menu to use new editor.
3518ff575247a5ce923a0cd65fc82e046f8eaeae 18-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches
e12e6962fb1151799f0737238212fd5856d1b7ea 18-Oct-2012 John Hoford <hoford@google.com> am da974d84: fix crash from configurable slider ranges

* commit 'da974d84c8aa0758afe2dc7382657ff5efc80157':
fix crash from configurable slider ranges
63926d2ed2ca2921de8dca9b3a52c1d64d8afc46 17-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Added support for crop actions. Changed overflow menu to use new editor.

Bug: 7281479
Bug: 7337191
Change-Id: I91055c972666e4c2d605903646b55d8c67ae87f3
pp/PhotoPage.java
iltershow/FilterShowActivity.java
da974d84c8aa0758afe2dc7382657ff5efc80157 18-Oct-2012 John Hoford <hoford@google.com> fix crash from configurable slider ranges

bug:7293391
Change-Id: I17498a2066acdb5c53763610980fe2f6532f2f34
iltershow/imageshow/ImageShow.java
1056ce1a7df84defcbff470a40d68d5e3e7759eb 18-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things.

* commit '43b906d81caa4379eae1a1643194c8b3d34b1ad5':
Moved many strings to xml. Changed UI filter order. Renamed things.
43b906d81caa4379eae1a1643194c8b3d34b1ad5 17-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Moved many strings to xml. Changed UI filter order. Renamed things.

Bug: 7344749
Bug: 7322949
Change-Id: Ia9ebc45fb2c743a458af270be429f07198ea3c1b
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilterFx.java
iltershow/imageshow/ImageSmallFilter.java
iltershow/ui/ImageButtonTitle.java
abe96287075b529d4c557b22c208ca5c7e6d318f 18-Oct-2012 John Hoford <hoford@google.com> am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches

* commit 'de8dbdff27e4b5c1626024e20fae9fb535238453':
fix rotating normal images
de8dbdff27e4b5c1626024e20fae9fb535238453 18-Oct-2012 John Hoford <hoford@google.com> Merge "fix rotating normal images" into gb-ub-photos-arches
21c91bfbb1bce4c1b2a0da85cb42d489f11b1e07 18-Oct-2012 nicolasroard <nicolasroard@google.com> am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches

* commit 'ef8770944c5701f8c07ca87f939d7759622eaaa7':
Fix back button behaviour
ef8770944c5701f8c07ca87f939d7759622eaaa7 18-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Fix back button behaviour" into gb-ub-photos-arches
55550694a3f40fbf5dfc95c35a8e253aedab931e 18-Oct-2012 nicolasroard <nicolasroard@google.com> Fix back button behaviour

bug:7290000
bug:7256201
Change-Id: Ia6f5726b0602c45e98566bcb5e027686e7f2fe57
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterCurves.java
iltershow/filters/ImageFilterFx.java
iltershow/filters/ImageFilterParametricBorder.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSmallBorder.java
iltershow/presets/ImagePreset.java
d07026bf48a457bc082516b0e93625a57b90da89 18-Oct-2012 John Reck <jreck@google.com> am 57731ee2: Only fade out if texture creation succeeded

* commit '57731ee210c22382d33f6f562f9e7e66fce651de':
Only fade out if texture creation succeeded
57731ee210c22382d33f6f562f9e7e66fce651de 18-Oct-2012 John Reck <jreck@google.com> Only fade out if texture creation succeeded

Bug: 7366597

Change-Id: Id28970fe263d975dcd48e45fd716199bc40f64d3
pp/ActivityState.java
i/PreparePageFadeoutTexture.java
07c2c448bd5b043e6aeebfd9ed3a347851bb14fe 17-Oct-2012 Mangesh Ghiware <mghiware@google.com> am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches

* commit '4104415e00090cdcac4a2f7408cc7ddc7d11c711':
Add read URI permission to intent returned for GET_CONTENT
e5da585e6cb73cff8775b21a69a01f8bf513d2ab 17-Oct-2012 John Hoford <hoford@google.com> fix rotating normal images

bug:7353416
Change-Id: I86875286ea81982bdb55e9df22e44827b521d257
iltershow/cache/ImageLoader.java
4104415e00090cdcac4a2f7408cc7ddc7d11c711 17-Oct-2012 Mangesh Ghiware <mghiware@google.com> Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches
3ad462d015baee9ca7b436ec7b688ebff1f92d04 17-Oct-2012 John Reck <jreck@google.com> am 24958c5d: Change double tap scale from 1.5 to 1.0

* commit '24958c5d4a63e1d7c49d9e7007ee10958ad23e8f':
Change double tap scale from 1.5 to 1.0
24958c5d4a63e1d7c49d9e7007ee10958ad23e8f 17-Oct-2012 John Reck <jreck@google.com> Change double tap scale from 1.5 to 1.0

Bug: 7287834

Change-Id: I43312825c1494e385a36a3783765de33d2b691e2
i/PhotoView.java
f38a686f7eb25a6338184d9882fdf0f95b917c69 17-Oct-2012 nicolasroard <nicolasroard@google.com> am 95404c66: Fix UI stuff

* commit '95404c666640177abf72ca2278585a16f30cf390':
Fix UI stuff
95404c666640177abf72ca2278585a16f30cf390 17-Oct-2012 nicolasroard <nicolasroard@google.com> Fix UI stuff

bug:7354368
bug:7362027
bug:7344915
Change-Id: I2efd5de0971e5dfbc989d60860348280c03b3db4
iltershow/FilterShowActivity.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSmallBorder.java
iltershow/imageshow/ImageSmallFilter.java
47c98b30363d52d563df9f494291d9a1ab1edc7c 17-Oct-2012 John Hoford <hoford@google.com> am eb321f77: Merge "rotate images before saving" into gb-ub-photos-arches

* commit 'eb321f77e97b22acab15d60eeacf8a65dc8cceb1':
rotate images before saving
eb321f77e97b22acab15d60eeacf8a65dc8cceb1 17-Oct-2012 John Hoford <hoford@google.com> Merge "rotate images before saving" into gb-ub-photos-arches
1c38d440b454698093f3f5c867b4bad5bf74716f 17-Oct-2012 Mangesh Ghiware <mghiware@google.com> Add read URI permission to intent returned for GET_CONTENT

Bug: 7366308
Bug: 7202384

GalleryProvider now requires a permission to access content.
See CL ca181a6 for more details.

Change-Id: I4bdf61e19c9e2b6e2da0837a8f633a27c49441d7
pp/AlbumPage.java
72e6392ca2eafc53739934f1a4d8e6cd869cce8c 17-Oct-2012 Sascha Haeberling <haeberling@google.com> am e3b50f1b: Adds GMS Core PanoramaClient to Gallery

* commit 'e3b50f1bfcfa5c8729f31788eac1a6109a88988b':
Adds GMS Core PanoramaClient to Gallery
d53bfbff620c1e9878effa13f083ff0e6c4ee96c 17-Oct-2012 John Hoford <hoford@google.com> rotate images before saving

bug:7353416
Change-Id: I113de1fa16725c9483a447a64ab1a41a3bbe679f
iltershow/cache/ImageLoader.java
e3b50f1bfcfa5c8729f31788eac1a6109a88988b 16-Oct-2012 Sascha Haeberling <haeberling@google.com> Adds GMS Core PanoramaClient to Gallery

Bug: 7319099

Also updates the API call to LightCycleHelper.
This depends on http://go/ag/#/c/239523/

Change-Id: Ie951e44e3a474599d1da6fea52609fbb9f8dc9bc
pp/AbstractGalleryActivity.java
pp/PhotoPage.java
7bc0a525eb2f7049a265bbf861090bd55fc7de95 17-Oct-2012 John Hoford <hoford@google.com> am 3038d014: add support for configurable slider ranges

* commit '3038d014b7ade998d1820c997242b9d9d8bc7ccf':
add support for configurable slider ranges
3038d014b7ade998d1820c997242b9d9d8bc7ccf 17-Oct-2012 John Hoford <hoford@google.com> add support for configurable slider ranges

bug:7293391
Change-Id: Ie4984ce85387bf4d7a0a38e318eb20f6802ffc96
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterFx.java
iltershow/filters/ImageFilterHue.java
iltershow/imageshow/ImageShow.java
ad3f626c5e58a5555efa78f15f820d7fc598b893 17-Oct-2012 Nicolas Roard <nicolasroard@google.com> am 34c807c8: Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches

* commit '34c807c8d89f9bfa9565ab52746d845acfb714fd':
Added fixed aspect ratio support for cropping.
2f54ad4cc5c7cf04c708aa249a3147ea154132fa 17-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am 178a1c11: Fixed flip (mirror) orientation.

* commit '178a1c115552a22526fb3a263a01c3cc66300328':
Fixed flip (mirror) orientation.
34c807c8d89f9bfa9565ab52746d845acfb714fd 17-Oct-2012 Nicolas Roard <nicolasroard@google.com> Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches
178a1c115552a22526fb3a263a01c3cc66300328 17-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Fixed flip (mirror) orientation.

Bug: 7342859
Change-Id: Ic9508927738f64e82e1bd078461b6ee1e1892300
iltershow/imageshow/ImageFlip.java
8a3a0003b76ded1f0e9430a9c9029b82bca39528 17-Oct-2012 Hung-ying Tyan <tyanh@google.com> am a69a86d5: Merge "Add permission to GalleryProvider." into gb-ub-photos-arches

* commit 'a69a86d5541a9e10e23f0a034cdf6e4416495221':
Add permission to GalleryProvider.
a69a86d5541a9e10e23f0a034cdf6e4416495221 17-Oct-2012 Hung-ying Tyan <tyanh@google.com> Merge "Add permission to GalleryProvider." into gb-ub-photos-arches
ac351f4797d4c64cb8a06bb148cde328543d328c 17-Oct-2012 Bobby Georgescu <georgescu@google.com> am a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos-arches

* commit 'a88bd1ca15dd7eafe4b018ef385097eabca18872':
Update empty placeholder asset
a88bd1ca15dd7eafe4b018ef385097eabca18872 17-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Update empty placeholder asset" into gb-ub-photos-arches
856ab5b77b39e4acf454a957f08eba7cc86ae0fc 17-Oct-2012 Bobby Georgescu <georgescu@google.com> Update empty placeholder asset

Bug: 7362100
Change-Id: I521c1c481a00959bb50d17fee3be6981be84a269
ata/EmptyAlbumImage.java
c57afc77217dda77c6024ae7892a8e736219b2e5 17-Oct-2012 Bobby Georgescu <georgescu@google.com> am a05bf471: Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches

* commit 'a05bf4719abc1b16c997b2012b14fc3d4d4d0c20':
Update Camera album overlay icon asset
1f7c5d1e683b369225ec812ed0c45c7fa3d42b96 17-Oct-2012 Bobby Georgescu <georgescu@google.com> Update Camera album overlay icon asset

Bug: 7332688
Change-Id: Id7ada222551187787c4e3b50f52dcdc5c6c70929
i/AlbumSetSlotRenderer.java
ca181a68a30ad830d55eb8886f62a323c64e1ba3 16-Oct-2012 Owen Lin <owenlin@google.com> Add permission to GalleryProvider.

bug: 7202384
Change-Id: I1a13ed7e480163c898cf376219953b321290d4d4
pp/PhotoPage.java
i/ActionModeHandler.java
0f7dc6ef6e736c0993240450b50b91721c79c43e 15-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Added fixed aspect ratio support for cropping.

Bug: 7350377
Change-Id: I8110ea999c764de675fe11f586ab9bc7af205f46
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/imageshow/GeometryMath.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageRotate.java
iltershow/imageshow/ImageStraighten.java
iltershow/ui/ImageButtonTitle.java
46720ce03f12b3e168d6da6b9ba2fcaa8cea51b4 17-Oct-2012 Bobby Georgescu <georgescu@google.com> am 74d5dfd6: Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches

* commit '74d5dfd662b92c9ce1aee225291b9d1775cfb49e':
Consistent animations & up button behavior in Gallery
74d5dfd662b92c9ce1aee225291b9d1775cfb49e 17-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches
324a7804267c1e7ee34b59bba9f0a6df2354d4c5 17-Oct-2012 John Reck <jreck@google.com> am 2b543897: Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches

* commit '2b543897e077ee4803fa60b6fd7a6a604835b0b3':
Add hook to manipulate SurfaceTexture transform
2b543897e077ee4803fa60b6fd7a6a604835b0b3 17-Oct-2012 John Reck <jreck@google.com> Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches
4ce48412b86ac28042bf70e4cbe051ffc3dd489d 17-Oct-2012 John Reck <jreck@google.com> Add hook to manipulate SurfaceTexture transform

Bug: 7302956

Change-Id: I32bdeb22630dbeba9f028e1c68167d10a5288a28
i/SurfaceTextureScreenNail.java
5585826e68c62c3719fb346d40fd1999438c6c6b 15-Oct-2012 Bobby Georgescu <georgescu@google.com> Consistent animations & up button behavior in Gallery

Bug: 7302857
Bug: 7295464
This CL makes all of the transition animations throughout
the Gallery app consistent. The animation is the previous
view shrinking and fading out while the new view starts out
bigger than the view port and is coming in to the viewport
size as it fades in. Having consistent animations allows us
to not keep PhotoPage/AlbumPage instances around in certain
cases, making it possible to have consistent up button
behavior when switching between the grid and filmstrip.
Finally, this also makes the transitions in the camera app
filmstrip/grid switching consistent with those in the
gallery app.
Change-Id: I77bac6a0cde1e439738c78f9e16ab15ed5910cfb
nim/StateTransitionAnimation.java
pp/ActivityState.java
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/PhotoPage.java
pp/StateManager.java
i/GLView.java
i/PositionController.java
i/PreparePageFadeoutTexture.java
3dccbdd985521f3cf02403923373eb3d384f984b 16-Oct-2012 nicolasroard <nicolasroard@google.com> am e34a5a5e: Fix when we cannot load an image

* commit 'e34a5a5eaedb870798a5cc7415079d04a6ca42e0':
Fix when we cannot load an image
e34a5a5eaedb870798a5cc7415079d04a6ca42e0 16-Oct-2012 nicolasroard <nicolasroard@google.com> Fix when we cannot load an image

bug:7321636
Change-Id: I82cd603d531a1b743737a7c5b65005d370f2cdb1
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
3f89f750a76d52fc31544cd693b083293983aebc 16-Oct-2012 John Hoford <hoford@google.com> am 20fb632c: prevent original now acts like any other FX filter

* commit '20fb632c407a2dfb5ec769560c61deacc77b8764':
prevent original now acts like any other FX filter
20fb632c407a2dfb5ec769560c61deacc77b8764 16-Oct-2012 John Hoford <hoford@google.com> prevent original now acts like any other FX filter

bug:7353358
Change-Id: Id4efa45ddb8a8a0ca6d201ffc0b45fdd2f3caabf
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterFx.java
62f1fa3a8d1364179acb9216d8c1c4211b2c897d 16-Oct-2012 nicolasroard <nicolasroard@google.com> am 374c3c8b: Merge "Fix curves tool" into gb-ub-photos-arches

* commit '374c3c8bac97c149cdfd185b9fd76fbe069ae6db':
Fix curves tool
374c3c8bac97c149cdfd185b9fd76fbe069ae6db 16-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Fix curves tool" into gb-ub-photos-arches
3992ae6cf1cbb7b57a22d8287c40451558408335 16-Oct-2012 nicolasroard <nicolasroard@google.com> Fix curves tool

bug:7344301
bug:7328680
bug:7289525
bug:7234239
Change-Id: I78d09dc2b38b11ccb2aac38ceef3acd8041f245e
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilterCurves.java
iltershow/ui/ControlPoint.java
iltershow/ui/ImageCurves.java
iltershow/ui/Spline.java
119ea224980ebd304ed211c0e65724a7b29fc037 16-Oct-2012 Doris Liu <tianliu@google.com> am b7a0b092: Make save button in video trimming consistent

* commit 'b7a0b0926258acc67c9d447c880b9ae8be96333d':
Make save button in video trimming consistent
b7a0b0926258acc67c9d447c880b9ae8be96333d 16-Oct-2012 Doris Liu <tianliu@google.com> Make save button in video trimming consistent

Bug: 7353884

Updated save button icon and text
Save button in video trimming now acts like back button when no change
has been made.
Change-Id: Iec29315222d3f3ffac9b96a89cad2821d7f86c4f
pp/TrimVideo.java
85f2f5ee226a5fb83373229be2589e2cd8841ed8 16-Oct-2012 John Hoford <hoford@google.com> am b9c316af: Merge "filters now support orientation" into gb-ub-photos-arches

* commit 'b9c316af94f66bd708d40306e4920ae009795d4b':
filters now support orientation
b894202fbb21b237c48e24b2f65b1ca297c61332 16-Oct-2012 John Hoford <hoford@google.com> filters now support orientation

bug:7353416
Change-Id: Ie6f01f37428dc86d338c5cb5a80630aa3a879eaa
iltershow/cache/ImageLoader.java
c07b9374d265bdd79b4898c8a882b7a8ed06c1ba 16-Oct-2012 Wu-cheng Li <wuchengli@google.com> am 84440670: Remove old camera classes.

* commit '84440670da46866867ace3be2c358a54db984a6d':
Remove old camera classes.
84440670da46866867ace3be2c358a54db984a6d 14-Oct-2012 Wu-cheng Li <wuchengli@google.com> Remove old camera classes.

bug:7201108
Change-Id: I539d02c411c654238d7e5e0c34e9ec3e6e6d4d90
ata/DataManager.java
ata/LocalAlbum.java
ata/LocalImage.java
ata/LocalVideo.java
4a03e18f7e8f1acf36f54dba7906a72927c9fb01 16-Oct-2012 Owen Lin <owenlin@google.com> am 030f8dad: Fixes bugs in TiledTexture.

* commit '030f8dad6aefc42d0af39bc1b93f370937d3e2ab':
Fixes bugs in TiledTexture.
030f8dad6aefc42d0af39bc1b93f370937d3e2ab 11-Oct-2012 Owen Lin <owenlin@google.com> Fixes bugs in TiledTexture.

1. Upload tiles in SinglePhotoDataAdapter
2. Rebuild the upload queue after the screen nails being recycled

bug: 6399444

Change-Id: I57e756f8d1d84742bf82dd34c83baf8df89ae4cc
pp/CropImage.java
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/SinglePhotoDataAdapter.java
i/BitmapScreenNail.java
i/PhotoView.java
i/TileImageView.java
i/TileImageViewAdapter.java
i/TiledScreenNail.java
til/GalleryUtils.java
4e13f7b0f1344e1d02d4746786a1fbc1d031fafd 16-Oct-2012 Owen Lin <owenlin@google.com> am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches

* commit 'ff025412e2cacedd8cbb7901140e580f76634ee6':
Revert "Revert "Upload screennails in tiles to prevent jank""
ff025412e2cacedd8cbb7901140e580f76634ee6 16-Oct-2012 Owen Lin <owenlin@google.com> Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches
c80b4f8f61ce08d674cdb632a91c22648833eab9 16-Oct-2012 John Hoford <hoford@google.com> am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches

* commit '80789c089e8795968426838ff9c1e71c84cfee6f':
fix for the cache
80789c089e8795968426838ff9c1e71c84cfee6f 16-Oct-2012 John Hoford <hoford@google.com> Merge "fix for the cache" into gb-ub-photos-arches
f2bc13fc959dbb272abaaf50251540fab5c5d093 16-Oct-2012 John Hoford <hoford@google.com> fix for the cache

Change-Id: Ib5c82aa602df961d15064e732b3701c8d6cd66ff
bug:7345592
iltershow/cache/DirectPresetCache.java
c42bb220434926c23332c0f93baad4ca2c6b7588 16-Oct-2012 Mangesh Ghiware <mghiware@google.com> Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches
2f17145b0c82fff64f2f1667889ce2fe2920d83e 16-Oct-2012 John Reck <jreck@google.com> am b1a28418: Fix SRI Pano orientation

* commit 'b1a28418848ce0adeb8a845a78e246b01913d176':
Fix SRI Pano orientation
b1a28418848ce0adeb8a845a78e246b01913d176 16-Oct-2012 John Reck <jreck@google.com> Fix SRI Pano orientation

Bug: 7345511

Change-Id: I9a06f03b67ba820b86520588415ff3ab16f05829
i/GLRoot.java
i/PhotoView.java
9121776557d0fdacb3cb85cce7e1326c4ea90628 12-Oct-2012 Chih-Chung Chang <chihchung@google.com> Cherry-pick of 092fd92 to fix bug 7344730 also.

Make getSupportedOperations() call getSupportedOperations(boolean) by default.

So things will work for MediaObject who doesn't override the new method.

Bug: 7336562
Change-Id: Ic9ed6211981bb91c56702eafa7b21e83ed071cef
ata/MediaObject.java
504d7c832aa66773b9bea262a69c609195506ae8 15-Oct-2012 Wu-cheng Li <wuchengli@google.com> am 7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches

* commit '7f1ad54dc6516d7b5cd7d5cabc6b96346186fce8':
Add stitching panorama image to secure album.
7f1ad54dc6516d7b5cd7d5cabc6b96346186fce8 15-Oct-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches
1aff8e6f3090ccae53bcb6b3a1f35fb58c3705ee 14-Oct-2012 nicolasroard <nicolasroard@google.com> am 5ec40a6b: Fix dimensions to use dips instead of pixels

* commit '5ec40a6ba587fa8bd50958d263bb6fc6280de4c1':
Fix dimensions to use dips instead of pixels
5ec40a6ba587fa8bd50958d263bb6fc6280de4c1 14-Oct-2012 nicolasroard <nicolasroard@google.com> Fix dimensions to use dips instead of pixels

bug:7343798
Change-Id: I3d576ae334e580ad9da5b56d4ae84f749004ec21
iltershow/FilterShowActivity.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSmallFilter.java
iltershow/ui/ImageButtonTitle.java
cd3803c20d25dce03a8cd0450dc97b5b8e7d07c6 14-Oct-2012 nicolasroard <nicolasroard@google.com> am b470b229: Fix cropping and saving issues

* commit 'b470b229fbfd782db6758f331e4a6f918e305b02':
Fix cropping and saving issues
b470b229fbfd782db6758f331e4a6f918e305b02 14-Oct-2012 nicolasroard <nicolasroard@google.com> Fix cropping and saving issues

bug:7342359

Change-Id: Ia59eb3f423b8c4f420b7b6f120735856a84cd854
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageGeometry.java
294b9945e01ec41c1e9e58dfcd5d6e106ee2d538 13-Oct-2012 Wu-cheng Li <wuchengli@google.com> Add stitching panorama image to secure album.

bug:7285105
Change-Id: I9f609f30d817f10a6c9c94fc6eadb58bc1bdd580
pp/PhotoPage.java
ata/SecureAlbum.java
367707d4186d0d79401184a9db5b1ffe83374337 13-Oct-2012 Bobby Georgescu <georgescu@google.com> am 48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches

* commit '48b63eecbc15ff6ec7e152076262c7dab26e5a6f':
Hide Camera button on empty gallery when not available
48b63eecbc15ff6ec7e152076262c7dab26e5a6f 13-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches
4f69a058a77f741235a35e85ede78f3b2301861f 13-Oct-2012 Bobby Georgescu <georgescu@google.com> Hide Camera button on empty gallery when not available

Bug: 7342583
Change-Id: I545b6902f994f7ed0245ec486e78693aea197a4a
pp/AlbumSetPage.java
2b652421321fa6b5ac119be3512d0dbba2bbaa18 12-Oct-2012 Bobby Georgescu <georgescu@google.com> am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches

* commit '1d2e9903ab31dd88a8a7370d6e1faf4e9ed204bb':
Improve performance of filmstrip
1d2e9903ab31dd88a8a7370d6e1faf4e9ed204bb 12-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Improve performance of filmstrip" into gb-ub-photos-arches
eea31d9ac9890128ca0ab9529cfc6eb22a3756bf 12-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am 7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches

* commit '7776408c5bbd4bb2669b7a577d157dc1967e434e':
Adding crop UI. Fixes a number of other UI bugs.
62e962bcb9fc03f3cfeac5ece8d3e95fc2dd0718 12-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Adding crop UI. Fixes a number of other UI bugs.

Bug:7337191
Change-Id: If63dbdac6722ad4fc6c30c165d6c2eeb7011c240
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageStraighten.java
5273e8306410d19e2e2cf6234bfe0a05097be874 12-Oct-2012 Bobby Georgescu <georgescu@google.com> Improve performance of filmstrip

Bug: 7336758

Change-Id: I22dbf2e75bc069341a9bbc2c4dcdf7750f23be7f
pp/PhotoPage.java
ata/LocalImage.java
ata/MediaObject.java
ata/UriImage.java
add0373f800459853ef4a88e16d73bd2ce1ffb6b 12-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am 4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches

* commit '4247c2325851501cb7f4b72ea4a4b84abc0e6da7':
Moves matrix function to GeometryMetadata. Fixes scaling issues.
46163a396828fa000b4a53cf87811e4111e3cb88 12-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Moves matrix function to GeometryMetadata. Fixes scaling issues.

Bug:7337191
Change-Id: Icfd50c8a07ef02f2346a8ab7b57303de3866d74d
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageGeometry.java
9a635f78d6e10996a1ef0179989850b9e5a49e58 12-Oct-2012 Chih-Chung Chang <chihchung@google.com> Merge "Make getSupportedOperations() call getSupportedOperations(boolean) by default." into jb-mr1-dev
d2466773db3d0d756557b94b16eca3dd09e58f5a 12-Oct-2012 Chih-Chung Chang <chihchung@google.com> Make getSupportedOperations() call getSupportedOperations(boolean) by default.

So things will work for MediaObject who doesn't override the new method.

Bug: 7336562
Change-Id: Ic9ed6211981bb91c56702eafa7b21e83ed071cef
ata/MediaObject.java
a3c0447910522b91a546c616ab0df6a3e10e6804 12-Oct-2012 nicolasroard <nicolasroard@google.com> am 808dbe19: Merge "Add back button handling" into gb-ub-photos-arches

* commit '808dbe19752361ad171b58836df7f195deee8019':
Add back button handling
808dbe19752361ad171b58836df7f195deee8019 12-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Add back button handling" into gb-ub-photos-arches
75608166f54891972ebad3d8fd958fed9a5300e6 12-Oct-2012 nicolasroard <nicolasroard@google.com> Add back button handling

bug:7332980

- fix crash as well.

Change-Id: Id93ee7c194df6ac5e38def2e5f0fb3c5ecc0c2e4
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilterWBalance.java
e4474775479cb327dfb078d6b84b586628cd9ddb 12-Oct-2012 Mangesh Ghiware <mghiware@google.com> am 423e45e4: Refresh panorama image after stitching completion

* commit '423e45e492d4ebdc41ecfeba73299de23b1463c4':
Refresh panorama image after stitching completion
423e45e492d4ebdc41ecfeba73299de23b1463c4 12-Oct-2012 Mangesh Ghiware <mghiware@google.com> Refresh panorama image after stitching completion

Bug: 7336784

Updating photo refreshes the supported operations which indiate if said
MediaItem is a panorama or not.

Change-Id: If3a169c9256b3f898594a30740930b5dfd96dba0
pp/PhotoPage.java
ata/LocalImage.java
ata/UriImage.java
0bb155271ebeb595ccb1bfce7ae6ff355007f7b0 12-Oct-2012 nicolasroard <nicolasroard@google.com> am 6111c54d: Fix UI

* commit '6111c54dea4d16fce6f4981d9d5bb8ed81f31af9':
Fix UI
6111c54dea4d16fce6f4981d9d5bb8ed81f31af9 12-Oct-2012 nicolasroard <nicolasroard@google.com> Fix UI

bug:7328726

- add one pixel border
- hide parameter value on certain effects
- increase scale for border icons

Change-Id: Iffacec18477895701cba069500ee617bf3f9f2b7
iltershow/PanelController.java
iltershow/imageshow/ImageSmallBorder.java
756fb491bcdba5bf5d4a94f3207679830a29ea84 12-Oct-2012 John Hoford <hoford@google.com> am ea5df36a: layouts, image icons, and layer behavour

* commit 'ea5df36ac1cdfbb569e6ba725c2df433d614d0f5':
layouts, image icons, and layer behavour
ea5df36ac1cdfbb569e6ba725c2df433d614d0f5 12-Oct-2012 John Hoford <hoford@google.com> layouts, image icons, and layer behavour

bug:7328726
Change-Id: I94300771dd7b6ff5b4196365f13320fbc4bdde92
iltershow/CenteredLinearLayout.java
iltershow/FilterShowActivity.java
iltershow/imageshow/ImageWithIcon.java
f8500e40e4d8c4b092c09162076f9c13933c5d60 12-Oct-2012 Bart Sears <bsears@google.com> am 7d161351: Adjust text on Apply button

* commit '7d161351c5aac3f88eb61003d56f30275ad4a180':
Adjust text on Apply button
7d161351c5aac3f88eb61003d56f30275ad4a180 12-Oct-2012 Bart Sears <bsears@google.com> Adjust text on Apply button

ALL CAPS was a bit loud, so go back to mixed case, lower
font size to 18dip, and remove ":".

Bug: 7333492
Change-Id: I18885808437e6328ec94c40df25ea0678d381825
iltershow/PanelController.java
90d68928387a5d38a69cb918be5f162415b53132 12-Oct-2012 nicolasroard <nicolasroard@google.com> am 8e1536da: Add new borders

* commit '8e1536da92f155731d5fd729ec5b2bf00709091a':
Add new borders
8e1536da92f155731d5fd729ec5b2bf00709091a 12-Oct-2012 nicolasroard <nicolasroard@google.com> Add new borders

bug:7233749
Change-Id: I34afe40f85c72491dac7b26ea4433ede96e09a0a
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterParametricBorder.java
5a1b150c965a68403c77bfe6e94036bd7535b745 12-Oct-2012 nicolasroard <nicolasroard@google.com> am e533f659: Fixes Rotate, Flip, Straighten tools.

* commit 'e533f65961ed601ded1803caeab6cef0a778d2f2':
Fixes Rotate, Flip, Straighten tools.
e533f65961ed601ded1803caeab6cef0a778d2f2 12-Oct-2012 nicolasroard <nicolasroard@google.com> Fixes Rotate, Flip, Straighten tools.

bug:7314849
Bug:7224232
Bug:7218935
Change-Id: I418287ff1f81c25f8e089821d823dc29ee62ff0e
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageFlip.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageRotate.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSmallFilter.java
iltershow/imageshow/ImageStraighten.java
iltershow/presets/ImagePreset.java
3d6fd0b237fccafb3331a5f8a3505a07928f6f3d 12-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am 11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches

* commit '11a21df4be6984a180e27b9915a9d6af7e7ef359':
Fixed apply bar text. Moved strings to xml.
11a21df4be6984a180e27b9915a9d6af7e7ef359 12-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches
f685a36c85c9b8182f9afdcd98df3338a9b5b3ed 12-Oct-2012 John Hoford <hoford@google.com> am a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches

* commit 'a4ccb4af475fbabf637dd48bf68db449ea7c8197':
fixed manta image size and double FX issue
a4ccb4af475fbabf637dd48bf68db449ea7c8197 12-Oct-2012 John Hoford <hoford@google.com> Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches
8d3c2837cf91a7fca7782b82950471d4656d15a8 12-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Fixed apply bar text. Moved strings to xml.

Bug: 7333492
Change-Id: I650a7178e5351c98d0bf5808ccdf6c597a88dada
iltershow/PanelController.java
87da4055bb066419e0d41114e4ac160730532dff 12-Oct-2012 Bobby Georgescu <georgescu@google.com> am dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches

* commit 'dd1586912b5da958b33a0d9f07312160d1cb103b':
Change ActionBar spinner text size on rotate
dd1586912b5da958b33a0d9f07312160d1cb103b 12-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches
e7b51ae035063faf4da2544db8452442cf36df59 12-Oct-2012 Mangesh Ghiware <mghiware@google.com> am 825afb1b: Move calls to LightCycleHelper off the UI thread.

* commit '825afb1b3e7d15b5c258d664ee008dc68da1c407':
Move calls to LightCycleHelper off the UI thread.
825afb1b3e7d15b5c258d664ee008dc68da1c407 11-Oct-2012 Mangesh Ghiware <mghiware@google.com> Move calls to LightCycleHelper off the UI thread.

Bug: 7320303

Replace multiple methods in LightCycleHelper with a single one that
returns relevant metadata.

Change-Id: Iaa75b3c1ccc8a5b724b253cec654b5b5acb4878e
pp/PhotoPage.java
ata/DataManager.java
ata/LocalImage.java
ata/MediaItem.java
ata/MediaObject.java
ata/PanoramaMetadataJob.java
ata/UriImage.java
i/ActionModeHandler.java
5d4b8fd9fd2e601b780c027ef912c8fabfe3ee1e 11-Oct-2012 Bobby Georgescu <georgescu@google.com> Change ActionBar spinner text size on rotate

Bug: 7333151
Update the grid/filmstrip spinner switch text to
look and behave like the text in the Gmail app, as
requested by UX.

Change-Id: If822b21899172a35402477868d4f146a8e00cfea
pp/AbstractGalleryActivity.java
pp/GalleryActionBar.java
fafb2edbb9928039b887f59685d82593bd79e06a 11-Oct-2012 John Hoford <hoford@google.com> fixed manta image size and double FX issue

bug:7328636
Change-Id: I572255c65fb2d461dce6f52d056be6b3c4d987f6
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/filters/ImageFilterParametricBorder.java
iltershow/filters/ImageFilterVignette.java
iltershow/presets/ImagePreset.java
b4ac748ddeb297b8f87e71182ef93c3b57fe2049 11-Oct-2012 George Mount <mount@google.com> am 37a93336: Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches

* commit '37a9333651cead185d982d9b809cb3425a24d3d8':
Clear cached stitching preview thumbnails.
37a9333651cead185d982d9b809cb3425a24d3d8 11-Oct-2012 George Mount <mount@google.com> Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches
ea058692b6be37e9abb6f3b002428dfd4abd6e70 11-Oct-2012 Bobby Georgescu <georgescu@google.com> am bebc94be: Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches

* commit 'bebc94be08667b474587592169155e6cb9855e77':
Fix size of peripheral items when first opening filmstrip
bebc94be08667b474587592169155e6cb9855e77 11-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches
110651236a1ce10c360de0b0ed761514281d61d8 11-Oct-2012 John Hoford <hoford@google.com> am 7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches

* commit '7f34a6a5f21209c22584680f280723584e2c28e7':
Fix application of FX to not wipe out borders etc.
7f34a6a5f21209c22584680f280723584e2c28e7 11-Oct-2012 John Hoford <hoford@google.com> Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches
075b593a4fe8a0613cc1edf43ee93ba525ccdc41 11-Oct-2012 John Reck <jreck@google.com> am 5cca8b99: Fix portrait orientation on landscape devices

* commit '5cca8b99bebe6a9fbb191a8e1364b81e309a1390':
Fix portrait orientation on landscape devices
1c35ad56a274a8c1b6a60197855c0b838c4e1022 11-Oct-2012 George Mount <mount@google.com> Clear cached stitching preview thumbnails.

Bug 7328408

Change-Id: Ifbc469dc9eef95025cd8e828a0df80e76d2ff064
ata/ImageCacheService.java
5cca8b99bebe6a9fbb191a8e1364b81e309a1390 11-Oct-2012 John Reck <jreck@google.com> Fix portrait orientation on landscape devices

Bug: 7328349

Change-Id: I0f871ea56e6afb5ba0b54cac15c18f79db07f4f9
pp/OrientationManager.java
a19830b4fd9050b48386cd904d99cfd2566cc515 11-Oct-2012 John Hoford <hoford@google.com> Fix application of FX to not wipe out borders etc.

bug:7289442
Change-Id: I9efdfdc1d8a8c02a718e91a089b531ff26fd582d
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterFx.java
iltershow/filters/ImageFilterWBalance.java
iltershow/imageshow/ImageSmallFilter.java
iltershow/presets/ImagePreset.java
iltershow/presets/ImagePresetFX.java
iltershow/ui/ImageCurves.java
a8f3473271cb4bfc5b47f520402bad7cddb5d3e8 11-Oct-2012 Owen Lin <owenlin@google.com> Revert "Revert "Upload screennails in tiles to prevent jank""

This reverts commit ad7cf187bf0c11b05aa3eab7085148e0353f2af5.

bug: 6399444
Change-Id: I94b286ab3e0db21c582cbfa9183489613da30edb
pp/PhotoDataAdapter.java
i/BasicTexture.java
i/BitmapScreenNail.java
i/GLCanvas.java
i/GLCanvasImpl.java
i/TileImageView.java
i/TiledTexture.java
b6adfcf8a485da464378bb8907698a08852a68ed 11-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am fb6edb42: Remove compare and reset from apply bar and fix text.

* commit 'fb6edb42e7e0b132844d4e87c2a76c758f48b684':
Remove compare and reset from apply bar and fix text.
fb6edb42e7e0b132844d4e87c2a76c758f48b684 11-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Remove compare and reset from apply bar and fix text.

Bug: 7326079
Change-Id: Ifb4d42ec9f30b9c2c6d46e943ca36c915a15c024
iltershow/FilterShowActivity.java
iltershow/PanelController.java
23c1f701d84b2e006afa8f3c9a073fc5a34922cb 11-Oct-2012 Bobby Georgescu <georgescu@google.com> am 7761357f: Behavior of camera filmstrip in gallery closer to camera

* commit '7761357f4a55de6745ac5172355d1a09a9a37492':
Behavior of camera filmstrip in gallery closer to camera
7761357f4a55de6745ac5172355d1a09a9a37492 11-Oct-2012 Bobby Georgescu <georgescu@google.com> Behavior of camera filmstrip in gallery closer to camera

Bug: 7329118
Change-Id: I0a5753db301cc53050251455439555aa7ae414c4
pp/PhotoPage.java
a261467ecd5cc8433728185b31e3660c279a3be0 11-Oct-2012 Bobby Georgescu <georgescu@google.com> am 4d302b8a: Fix NPE in PhotoPage.updateMenuOperations

* commit '4d302b8a826ece492c2abefd56b780a65899663e':
Fix NPE in PhotoPage.updateMenuOperations
3ed6ae23e43be73c83b6be3dcaafe7400a7b3355 11-Oct-2012 Bobby Georgescu <georgescu@google.com> Fix size of peripheral items when first opening filmstrip

Bug: 7327570
Change-Id: I168a0297e9ac65786dbb05c02228665a67f80dff
i/PhotoView.java
4d302b8a826ece492c2abefd56b780a65899663e 11-Oct-2012 Bobby Georgescu <georgescu@google.com> Fix NPE in PhotoPage.updateMenuOperations

Bug: 7324012
Change-Id: If09d20b7ab64abe9020f7f6301356ed9a4155d5b
pp/PhotoPage.java
bba49368f54aa24d85b701fbd12a82da8b9e0ea8 11-Oct-2012 Bobby Georgescu <georgescu@google.com> am c735669f: Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches

* commit 'c735669fdbd1aec674412f43e64b956e8c10b643':
Make album set grid view reflect latest UI mocks
c735669fdbd1aec674412f43e64b956e8c10b643 11-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches
3def40b34a4712fd54fef397e81d4a1b802d37c5 11-Oct-2012 Bobby Georgescu <georgescu@google.com> am f8a46874: Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches

* commit 'f8a46874235b3169a68f8bd6566c81b44de34e7a':
Defer expensive UI updates in filmstrip
8a8b9cfdd15bf36ccd068563451d98a011a5eeab 11-Oct-2012 Bobby Georgescu <georgescu@google.com> Make album set grid view reflect latest UI mocks

Bug: 7300836
Change-Id: I3024b8ffbba7ee08642012c80509992335bbd5bf
pp/Config.java
i/AlbumSetSlotRenderer.java
e23a9d412cba5a202405e1c99c0cf080949db2c7 10-Oct-2012 Bobby Georgescu <georgescu@google.com> Defer expensive UI updates in filmstrip

Bug: 7322925
When using the filmstrip, delay expensive updates to
the action bar and share menus, some of which may require
disk accesses, until the rate of change of photos slows
down, instead of doing this work for every single image
that flies by.

Change-Id: Ie82adb4d54c96fec837d5954a91e1d4a17f548dd
pp/PhotoPage.java
2306d785b8a6e965c93b13f7d21da17669af3681 11-Oct-2012 George Mount <mount@google.com> am 2cb4269e: Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches

* commit '2cb4269ebc665c2f2786a8a81794d15b36e3a38c':
Fix NPE due to progress bar not existing.
2cb4269ebc665c2f2786a8a81794d15b36e3a38c 11-Oct-2012 George Mount <mount@google.com> Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches
cceb72446be42bb7546222f2871005d9f9b0042f 11-Oct-2012 Bobby Georgescu <georgescu@google.com> am b4a3f476: Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches

* commit 'b4a3f4764a58d6d918d96399e1b05db887b9f9ad':
Change FilterShow theme and extra remove gray line
b4a3f4764a58d6d918d96399e1b05db887b9f9ad 11-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches
785a1f8a5856b199f6553a92020e77621516c608 11-Oct-2012 George Mount <mount@google.com> Fix NPE due to progress bar not existing.

Bug 7325685

Change-Id: I5e24b4f8a0ee4016c122e14702e3ae575f5bb56f
pp/PhotoPage.java
810f8dffd37b4225b4fc0ad09f2a4d55cb103f3e 11-Oct-2012 John Hoford <hoford@google.com> am 53f24f0f: forced fx bitmaps to load unscaled

* commit '53f24f0fbfd787a4ab2f129499d2c7ef240a517f':
forced fx bitmaps to load unscaled
fea98f55311b39977969dc071296bacd48813e0b 11-Oct-2012 Bobby Georgescu <georgescu@google.com> Change FilterShow theme and extra remove gray line

Bug: 7326326
Change-Id: Ie2286e36da77fb22907f21d084177268f919d10e
iltershow/imageshow/ImageShow.java
53f24f0fbfd787a4ab2f129499d2c7ef240a517f 11-Oct-2012 John Hoford <hoford@google.com> forced fx bitmaps to load unscaled

bug:7327105
Change-Id: I780638f6919e89ae957993732fdbe123e8d8e866
iltershow/FilterShowActivity.java
14b42fc1c0dcf6ffd629facfada872d2d30d5d44 11-Oct-2012 John Hoford <hoford@google.com> am f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches

* commit 'f8044659db592f49e6e77c8a1d595955f9d206cb':
add White balance & disable UI elements
f8044659db592f49e6e77c8a1d595955f9d206cb 11-Oct-2012 John Hoford <hoford@google.com> Merge "add White balance & disable UI elements" into gb-ub-photos-arches
0d77d6dbedb2887312bf96198086824c279b6465 11-Oct-2012 Mangesh Ghiware <mghiware@google.com> am 9b900e0d: Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches

* commit '9b900e0d23a1a9c5b708424efe1a01b107bf774f':
Disable in-place crop for 360 panorama
9b900e0d23a1a9c5b708424efe1a01b107bf774f 11-Oct-2012 Mangesh Ghiware <mghiware@google.com> Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
4988eff4c8eda325a616337d1aaa0666cc301a7c 10-Oct-2012 John Hoford <hoford@google.com> add White balance & disable UI elements

bug:7234321
Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilterWBalance.java
682163e115a8e679b3038f4cb9886851e12a4035 10-Oct-2012 Mangesh Ghiware <mghiware@google.com> Disable in-place crop for 360 panorama

Bug: 7281479
Change-Id: Id89e25a883a5eab8a91604ebfeab4f178ba1066f
ata/LocalImage.java
ata/UriImage.java
977382f8f1e9399b14f15f8e4d636dfda55b6db3 10-Oct-2012 Bobby Georgescu <georgescu@google.com> am db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches

* commit 'db3b0d4cd1dc66d71f547fb4eb1c8d88b319185b':
Fix missing camera thumbnail in filmstrip
2aec8488aebe3d28a0a32c67d6629dfa4db4acae 10-Oct-2012 Bobby Georgescu <georgescu@google.com> Fix missing camera thumbnail in filmstrip

Bug: 7319894
Change-Id: Id1cf4f4bf718853aec73c0765732ac59e448c5d6
pp/AlbumPage.java
fcdc86edd4fdadeec5d4bac1f64c432ad000663a 10-Oct-2012 George Mount <mount@google.com> am 21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches

* commit '21832eb7fba76cd101ad5ef7b131292aa24f3864':
Change how stitched images are inserted into Gallery.
Move panorama stitch progress outside the image.
21832eb7fba76cd101ad5ef7b131292aa24f3864 10-Oct-2012 George Mount <mount@google.com> Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches

* changes:
Change how stitched images are inserted into Gallery.
Move panorama stitch progress outside the image.
4e091eb758a3ac1016b373419cea1ada1b977bc5 10-Oct-2012 George Mount <mount@google.com> Change how stitched images are inserted into Gallery.

Bug 7299396
Stitching images now use normal LocalImages for their MediaItem
instead of LightCycleItems. They are no longer part of a special
album.

Change-Id: Ic62822a44b9743829dee50bcfa6f455cd538afa7
pp/PhotoPage.java
pp/StitchingChangeListener.java
ata/DataManager.java
ata/LocalAlbumSet.java
ata/LocalImage.java
ata/SecureAlbum.java
f122d56e15e00928d731751796b0509ae47c6799 10-Oct-2012 George Mount <mount@google.com> Move panorama stitch progress outside the image.

Bug 7302513

Change-Id: Ie6505c8ed2125b878e54a93c4b8c0f51d80a1385
pp/PhotoPage.java
pp/PhotoPageProgressBar.java
194b77c1b09c65ff52ed24fafe3af6e4d33519a8 10-Oct-2012 John Reck <jreck@google.com> am eece6da4: Support REVERSE in lockOrientation

* commit 'eece6da4d344f7e1e937130c0d36cef8ef9dbe0c':
Support REVERSE in lockOrientation
eece6da4d344f7e1e937130c0d36cef8ef9dbe0c 10-Oct-2012 John Reck <jreck@google.com> Support REVERSE in lockOrientation

Bug: 7314703

Change-Id: Id459e49496f562e75c1485d9d717daa28020a587
pp/OrientationManager.java
ca41df84f8cc8f63d7856c904ceef67adb0b5207 10-Oct-2012 John Reck <jreck@google.com> am 866ed7ab: Fix inverted panorama preview

* commit '866ed7abd7960efc7986a3624414a730e17f33a6':
Fix inverted panorama preview
866ed7abd7960efc7986a3624414a730e17f33a6 10-Oct-2012 John Reck <jreck@google.com> Fix inverted panorama preview

Bug: 7314703
Panorama only support rotations of 0 and 90, so if it is greater
than that flip the output surface texture

Change-Id: I9885feb88d2d1c3e0dabaa7ecd8db66c2ddfb93b
i/PhotoView.java
efce987c5da9f8a33a1e03508853b900879f5338 10-Oct-2012 John Hoford <hoford@google.com> am 1b72a2f1: small fix to red eye code

* commit '1b72a2f1124610b8050dbbdff9f1bb548199fd2e':
small fix to red eye code
1b72a2f1124610b8050dbbdff9f1bb548199fd2e 10-Oct-2012 John Hoford <hoford@google.com> small fix to red eye code

bug:7234321
Change-Id: I796b11fd3050bf3582749e02f7d8173bc78ea292
iltershow/filters/ImageFilterRedEye.java
b3d3079b0f8ddda9f524d8fbe1ba11cef17b40cc 10-Oct-2012 nicolasroard <nicolasroard@google.com> am 08458dc6: Latest UI

* commit '08458dc637d92ee5f12e34d49c34cc10f4e19c7d':
Latest UI
08458dc637d92ee5f12e34d49c34cc10f4e19c7d 10-Oct-2012 nicolasroard <nicolasroard@google.com> Latest UI

bug:7233983
bug:7233980

Also fixes border scaling issues.

Change-Id: Ia9365800e057f481936ffdd13a5d8c5a9dab14b5
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterBWBlue.java
iltershow/filters/ImageFilterBWGreen.java
iltershow/filters/ImageFilterBWRed.java
iltershow/filters/ImageFilterBorder.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSmallBorder.java
iltershow/imageshow/ImageSmallFilter.java
iltershow/presets/ImagePreset.java
iltershow/presets/ImagePresetBW.java
iltershow/presets/ImagePresetBWBlue.java
iltershow/presets/ImagePresetBWGreen.java
iltershow/presets/ImagePresetBWRed.java
iltershow/presets/ImagePresetSaturated.java
a83c9beb952f68622757ac73ccab6a47f7a6e516 10-Oct-2012 John Hoford <hoford@google.com> am 457e88cd: add filters

* commit '457e88cd2ba6a8a93b1643a3fb3d50ee758671ad':
add filters
457e88cd2ba6a8a93b1643a3fb3d50ee758671ad 10-Oct-2012 John Hoford <hoford@google.com> add filters

bug:7234321
Change-Id: I4c9695c3ad90fcb7f4d67d40faa0a7da85f99030
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterFx.java
iltershow/presets/ImagePresetFX.java
41fda3d39b60be35760a27619e0c755f5025ccb9 10-Oct-2012 Bobby Georgescu <georgescu@google.com> am d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches

* commit 'd78c5734346cabc2577a5b9100f0f943c381ee47':
Correct stale background on completely empty gallery
08e510887119516ac8031fe276df7e0f8e223a8c 10-Oct-2012 Bobby Georgescu <georgescu@google.com> am 501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches

* commit '501bd1bff5189542612929b2428b7a69abc575a6':
Update design for grid/filmstrip switcher
d78c5734346cabc2577a5b9100f0f943c381ee47 10-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches
501bd1bff5189542612929b2428b7a69abc575a6 10-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches
07f340a9a1b0a63aaf73bb1eb1fdf284d5847dcb 10-Oct-2012 Bobby Georgescu <georgescu@google.com> am 3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches

* commit '3d81fdfd5916747b237229a2515152daf639447a':
Fix lack of snapback on very short scroll
3d81fdfd5916747b237229a2515152daf639447a 10-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches
77fa1d232c1a804d17f3b1ceeaa6ab6c6555b047 10-Oct-2012 Bobby Georgescu <georgescu@google.com> Correct stale background on completely empty gallery

Bug: 7314560
When the last album is delete by long pressing and pressing
the delete icon, and the gallery is left completely empty,
the slotview was not being correctly invalidated.

Change-Id: I2d5ec7ac7fb9604fd74ca8fa4fa6df09d6dec49d
pp/AlbumSetPage.java
dc55d3b1a614b95a36aab60c06f7961a800ec85a 10-Oct-2012 Bobby Georgescu <georgescu@google.com> Fix lack of snapback on very short scroll

Bug: 7318609

snapToNeighborImage returns false if it didn't
actually need to move to a neighboring image, so
use this information to correctly snapback if
needed.

Change-Id: I28bbcb5ea224957fefa3838891c4343a1d9b8aff
i/PhotoView.java
a2ce811cb505d579112f5e3c4ecb030d8252371e 09-Oct-2012 Bobby Georgescu <georgescu@google.com> Update design for grid/filmstrip switcher

Bug: 7317501
Change-Id: I8975071b2a6d8b9f03c54c4bd3a6aa157fc6dc2e
pp/GalleryActionBar.java
bc56bd0b83e52ed9ca3b17d5b41d4b03e33a17f8 09-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches

* commit 'bd14e82756742a67f3a6dfe5d1f93d7ae5cadef0':
Implementing Geometry save operations.
bd14e82756742a67f3a6dfe5d1f93d7ae5cadef0 09-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Implementing Geometry save operations." into gb-ub-photos-arches
1f6a2d898092d87734e41080b55fecf84d12ec0a 09-Oct-2012 Bobby Georgescu <georgescu@google.com> am d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches

* commit 'd490f1aa851db853b9865a380abd01c67605d58b':
Dejank camera roll scrolling in grid view.
d490f1aa851db853b9865a380abd01c67605d58b 09-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches
18fc4c1c247897db0dc74e4598a512827af816e9 09-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Implementing Geometry save operations.

Bug: 7224232
Bug: 7218935
Change-Id: I83e5f8a5dc29c5b6be0bb69f10eadf823122bb97
iltershow/filters/ImageFilterGeometry.java
a90d5d2d3d50ff07406c3e60bab23de1df288891 09-Oct-2012 Bobby Georgescu <georgescu@google.com> am 6e733b74: Fix share crash after closing photo editor

* commit '6e733b74465ad6994c23d624fd8ee9b7c249e7b3':
Fix share crash after closing photo editor
6e733b74465ad6994c23d624fd8ee9b7c249e7b3 09-Oct-2012 Bobby Georgescu <georgescu@google.com> Fix share crash after closing photo editor

Bug: 7306707
Change-Id: If589e1d84bc05c4d68a02feed7aaed05a568359d
iltershow/FilterShowActivity.java
e5c579872b254489f85b396055607ecbc4a5a664 09-Oct-2012 nicolasroard <nicolasroard@google.com> am ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-arches

* commit 'ee7c1e011ddf4c54d5eb6104796e113d17d29e72':
Add procedural borders
ee7c1e011ddf4c54d5eb6104796e113d17d29e72 09-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Add procedural borders" into gb-ub-photos-arches
6ddbf0db026fbf8b8d3e21a7fa1351764a095359 09-Oct-2012 Wu-cheng Li <wuchengli@google.com> am 2c83c5f0: Handle stitching progress in secure album.

* commit '2c83c5f09aa79d81ee11da517fd62222f8c3337d':
Handle stitching progress in secure album.
2c83c5f09aa79d81ee11da517fd62222f8c3337d 09-Oct-2012 Wu-cheng Li <wuchengli@google.com> Handle stitching progress in secure album.

- In secure album, show stitching progress only if it is
captured after the device is locked.
- Make sure image capture intent does not show stitching
progress.

bug:7285105

Change-Id: I0b3ba60fe3c03f488bea25e2f09843dd84ab6dfb
pp/PhotoPage.java
pp/StitchingChangeListener.java
ata/SecureAlbum.java
fcc92a7e74f0e10458dfada217c286ac08d0eec1 09-Oct-2012 Mangesh Ghiware <mghiware@google.com> am 71ce96fc: Fix sharing as photo option for 360 degree panorama

* commit '71ce96fc79787dedac56af75385dc227d52be3af':
Fix sharing as photo option for 360 degree panorama
71ce96fc79787dedac56af75385dc227d52be3af 09-Oct-2012 Mangesh Ghiware <mghiware@google.com> Fix sharing as photo option for 360 degree panorama

Bug: 7310190
Bug: 7302023

Also, fix disappearing sharing menu item in action bar.

Change-Id: Id555426cce5f25d21405c885b6f7331d238cdd07
pp/GalleryActionBar.java
pp/PhotoPage.java
3985d73416065001058ea6f38ac4ca26206ed314 09-Oct-2012 Pin Ting <pinting@google.com> Dejank camera roll scrolling in grid view.

Bug:7302644
Change-Id: I280be430101f57dde5a5a6f427cf48e725e39b45
ata/ImageCacheService.java
til/GalleryUtils.java
93dfe7a1df07a64701369b480578410efb740a27 09-Oct-2012 nicolasroard <nicolasroard@google.com> Add procedural borders

bug:7233980
Change-Id: I81008efa3d256061ec27d1ca2333debfb0ab6dd5
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterParametricBorder.java
iltershow/imageshow/ImageSmallFilter.java
iltershow/presets/ImagePreset.java
e28986dda9d58c834fd10b179f4e2b0131260f9d 09-Oct-2012 Bobby Georgescu <georgescu@google.com> am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches

* commit '3a1279f11ec88e62a75303469b886f1cb9d50c30':
Start Camera album in grid mode
a74f1f4c2228ad43de5385682656cf780d84d3dd 09-Oct-2012 nicolasroard <nicolasroard@google.com> am 895e13e8: Fix crash when starting the editor

* commit '895e13e85dcb156cdc4eff882e10c4497a56de1e':
Fix crash when starting the editor
3a1279f11ec88e62a75303469b886f1cb9d50c30 09-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Start Camera album in grid mode" into gb-ub-photos-arches
895e13e85dcb156cdc4eff882e10c4497a56de1e 09-Oct-2012 nicolasroard <nicolasroard@google.com> Fix crash when starting the editor

Bug: 7224232

CL 236429 readded offending lines after the merge...

Change-Id: I670c60ba366d2c8ec343b26c65580e8900c67819
iltershow/imageshow/ImageShow.java
7a84c578a4b3bea9eebb0b21ac161c18aad49346 09-Oct-2012 Bobby Georgescu <georgescu@google.com> Start Camera album in grid mode

Bug: 7304603
Change-Id: I537f74cd0d34b4b095c031572f8d817dd49b6388
pp/AlbumSetPage.java
cf66c41401af64b2b3446602302cc94fff8fbfe4 09-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am a66df0c9: Added the rest of the Geometryfilter stubs.

* commit 'a66df0c9e8106ef6a275e20ab2a47286e054fe7c':
Added the rest of the Geometryfilter stubs.
a66df0c9e8106ef6a275e20ab2a47286e054fe7c 09-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Added the rest of the Geometryfilter stubs.

Bug: 7224232
Bug: 7218935
Change-Id: I9ebbc4a98b5696e1514995e465aa4e145fdfa4f8
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageShow.java
8e5ccb2197b2322ecffa5c6b4195f7ac85d3119c 09-Oct-2012 nicolasroard <nicolasroard@google.com> am f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches

* commit 'f70a356842a14fee9e2ba9ab3aa31195841715f1':
Fix crash introduced with the GeometryMetadata
f70a356842a14fee9e2ba9ab3aa31195841715f1 09-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches
fe02f8c1dee70f766828444e820b5766fd16147e 09-Oct-2012 Doris Liu <tianliu@google.com> am 4438a7cc: Fix details dialog not being dismissed

* commit '4438a7cce00cb19cb35cfc3cc149533f40043c00':
Fix details dialog not being dismissed
4438a7cce00cb19cb35cfc3cc149533f40043c00 09-Oct-2012 Doris Liu <tianliu@google.com> Fix details dialog not being dismissed

Bug: 7300997
Change-Id: I0d0dad50a9777f8ea49889a4517b8704a03021c5
pp/PhotoPage.java
de154778c8f94121cb2117fcf6224c40c01b6132 09-Oct-2012 nicolasroard <nicolasroard@google.com> Fix crash introduced with the GeometryMetadata

bug:7224232
bug:7279964
bug:7298708

- Also remove the slide gesture (only use the slider widget)
- use scaleFactor to apply sharpen proportionally

Change-Id: Icce786cb53f2d3d6feada76c63108a563aaab7a3
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/filters/ImageFilterRS.java
iltershow/filters/ImageFilterSharpen.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageZoom.java
73d3785cf92da3cc81ea75f44ab1eb34294655fd 09-Oct-2012 John Reck <jreck@google.com> am a29eeac8: Use framework orientation

* commit 'a29eeac8993b221d98cffbec5583b5cba1921c89':
Use framework orientation
a29eeac8993b221d98cffbec5583b5cba1921c89 08-Oct-2012 John Reck <jreck@google.com> Use framework orientation

Bug: 7292373

Change-Id: I66e0c3a3b43a5d544ecc3fc9a4a04fa5521d36b2
pp/PhotoPage.java
i/PhotoView.java
3122f4d1eba587749a790f28cf3a91694bbf6307 09-Oct-2012 John Hoford <hoford@google.com> am 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches

* commit '1a291db030b2f3f7752026dd347ec34b82f8891e':
add redeye and improve shadow removal
1a291db030b2f3f7752026dd347ec34b82f8891e 09-Oct-2012 John Hoford <hoford@google.com> Merge "add redeye and improve shadow removal" into gb-ub-photos-arches
90b1d251973bfa748d435896fc277cb4024451ad 08-Oct-2012 John Hoford <hoford@google.com> add redeye and improve shadow removal

bug:7234321
Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/filters/ImageFilterRedEye.java
iltershow/filters/ImageFilterShadows.java
05ae08060173934dcd180b6de2a1d7c5b1d0d7ca 09-Oct-2012 Bobby Georgescu <georgescu@google.com> am 639095c6: Correct undo behavior

* commit '639095c6bed84ab0bf9ebc7c4f8b8c944df285a1':
Correct undo behavior
639095c6bed84ab0bf9ebc7c4f8b8c944df285a1 08-Oct-2012 Bobby Georgescu <georgescu@google.com> Correct undo behavior

Bug: 7307293
Change-Id: I72f814acd3625024f1e2aeccec4abfd28ad3319b
pp/PhotoPage.java
i/PhotoView.java
0efc1133fa3c8f512ef6adccf0fefc291ebe36f1 08-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am 7bd60250: Added stub for applying geometry flip.

* commit '7bd602506fee36f3ef0a68bfa1ba5dd1e74ca5dd':
Added stub for applying geometry flip.
7bd602506fee36f3ef0a68bfa1ba5dd1e74ca5dd 08-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Added stub for applying geometry flip.

Bug: 7224232
Bug: 7218935
Change-Id: Iaeea6a94f4fea44a8046f09a0fce72fe32ed7cc0
iltershow/filters/ImageFilterGeometry.java
iltershow/imageshow/GeometryMetadata.java
iltershow/presets/ImagePreset.java
3f496bb02f11067b4b66d9a1dce74262dcb80c3f 08-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches

* commit '8e7b50948261570ec1d75ba451236b971dc5dc0f':
Adding Crop, Rotate, Flip.
8537d097f8827caedc8c39564de54d36eae8b16f 27-Sep-2012 Ruben Brunk <rubenbrunk@google.com> Adding Crop, Rotate, Flip.

Bug: 7224232
Bug: 7218935

Adding geometry manipulation UI features.

Change-Id: If924313c18121e6d192a1934e76691bd578d8eb0
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/imageshow/GeometryMetadata.java
iltershow/imageshow/ImageCrop.java
iltershow/imageshow/ImageFlip.java
iltershow/imageshow/ImageGeometry.java
iltershow/imageshow/ImageRotate.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSlave.java
iltershow/imageshow/ImageStraighten.java
iltershow/presets/ImagePreset.java
e0ad4914d533f9dab3b0e0f21808a3c6dd4aa5d4 08-Oct-2012 Mangesh Ghiware <mghiware@google.com> am 51ebe5f7: Share only 360-degree panoramas with new MIME type

* commit '51ebe5f71b9f00af95c8d64f1ff895fc7b9aa018':
Share only 360-degree panoramas with new MIME type
51ebe5f71b9f00af95c8d64f1ff895fc7b9aa018 08-Oct-2012 Mangesh Ghiware <mghiware@google.com> Share only 360-degree panoramas with new MIME type

Bug: 7302972

Instead of using the UsePanoramaViewer attribute in XMP metadata,
ensure that the panorama is full 360 degree by checking if the
cropped width is same as the full panorama width.

Change-Id: I66d864df96052f96db5fa19fb02b3abe214b4dec
pp/PhotoPage.java
ata/LocalImage.java
ata/MediaItem.java
ata/MediaObject.java
ata/UriImage.java
i/ActionModeHandler.java
i/MenuExecutor.java
til/GalleryUtils.java
a255a55433a01ec0c713d970f2ca88ee951014c0 08-Oct-2012 Bobby Georgescu <georgescu@google.com> am 76f18810: Launch correct photo when tapping grid item in Camera roll

* commit '76f1881067d7ca4eda6d3e398567473d2913c5d1':
Launch correct photo when tapping grid item in Camera roll
1414391d9143ef8ea9e88b8b0efa5cd467f50251 08-Oct-2012 Owen Lin <owenlin@google.com> am ed8c8810: Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches

* commit 'ed8c88102153dd7dca8458d7f0a9b81937c58023':
Fix ANR in creating the fallback animation.
96cc89604c8129ef5cea23639f0e3f81f69e8040 08-Oct-2012 Bobby Georgescu <georgescu@google.com> am d81b2649: No Camera recenter on resume after editing or viewing items

* commit 'd81b264931cfa3b34096efd46659b81f9a628fb5':
No Camera recenter on resume after editing or viewing items
60309301ba9c6e59d49babb96f048034ad610e53 08-Oct-2012 Bobby Georgescu <georgescu@google.com> am 4b39551d: Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches

* commit '4b39551d67b9868c289fd2c31f62d3326fc6f697':
Show progress indicator dialog when saving edited image
76f1881067d7ca4eda6d3e398567473d2913c5d1 08-Oct-2012 Bobby Georgescu <georgescu@google.com> Launch correct photo when tapping grid item in Camera roll

Bug: 7303049
Change-Id: Ie3dd2b010d60669cd000a2ed9b52e0611b0977bd
pp/PhotoPage.java
ed8c88102153dd7dca8458d7f0a9b81937c58023 08-Oct-2012 Owen Lin <owenlin@google.com> Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches
d81b264931cfa3b34096efd46659b81f9a628fb5 08-Oct-2012 Bobby Georgescu <georgescu@google.com> No Camera recenter on resume after editing or viewing items

Bug: 7302361
Change-Id: I7420f89a766dc86d873166789b1875539541825c
pp/PhotoPage.java
4b39551d67b9868c289fd2c31f62d3326fc6f697 08-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches
ec29b73d77a8ff2f000eb04d662d85d63d8f8d09 08-Oct-2012 Bobby Georgescu <georgescu@google.com> Show progress indicator dialog when saving edited image

Bug: 7301277
Change-Id: Ied4f9abeeaa950a0c78c0a652b3be4634dd96ce3
iltershow/FilterShowActivity.java
28fa6384f41d182dde403bc5c156cb23b248898f 07-Oct-2012 George Mount <mount@google.com> am f5017c40: Merge "Show stitched panorama in secure album." into gb-ub-photos-arches

* commit 'f5017c407c969da88017a697aae7462b552e65ee':
Show stitched panorama in secure album.
f5017c407c969da88017a697aae7462b552e65ee 07-Oct-2012 George Mount <mount@google.com> Merge "Show stitched panorama in secure album." into gb-ub-photos-arches
d7b3cb87ddd85bd6e361b0dabe0dd02d0bb53f7a 07-Oct-2012 Bobby Georgescu <georgescu@google.com> am bbc99316: Fix orientation locking issues when going back to Camera

* commit 'bbc993162d687df20e2ff9a329bb9b6e04926ba8':
Fix orientation locking issues when going back to Camera
bbc993162d687df20e2ff9a329bb9b6e04926ba8 07-Oct-2012 Bobby Georgescu <georgescu@google.com> Fix orientation locking issues when going back to Camera

Bug: 7287039
Change-Id: Ib993266706b24269fd759f1ded1b6a85c2c5c7ba
pp/PhotoPage.java
9333917b0c31c4bdfd76593849f55d9e1e1988e9 07-Oct-2012 Bobby Georgescu <georgescu@google.com> am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches

* commit '4de36129b57e3a5308c109a407ea17b4fa103fe4':
Change display of 360 panorama button
4de36129b57e3a5308c109a407ea17b4fa103fe4 07-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Change display of 360 panorama button" into gb-ub-photos-arches
e55e04857bb2bfe46cedc0c9888c3a065e868efd 07-Oct-2012 Bobby Georgescu <georgescu@google.com> am 43ba9f66: Implement new grid layout in Gallery

* commit '43ba9f6644e4183b8ee27f96de3dda703d136c52':
Implement new grid layout in Gallery
4cd1ceeebe17b6accc63e09400e737f38a8374f6 07-Oct-2012 Bobby Georgescu <georgescu@google.com> am 3711d3ea: Tune swipe to delete in filmstrip

* commit '3711d3ea870acba8ad83d0c51b0d03b0082ef0f0':
Tune swipe to delete in filmstrip
9fe7d852f12fece9350a1c1c653edd66d543e9df 07-Oct-2012 Bobby Georgescu <georgescu@google.com> am 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches

* commit '701f83f0c7fd26ad0633b6c1dd01e5145086f6c5':
Fix display of spinner and SQL exception for view intent
ec147fde392f8c74be7c65abdf6f6916ee96f3e0 07-Oct-2012 Bart Sears <bsears@google.com> am ad7cf187: Revert "Upload screennails in tiles to prevent jank"

* commit 'ad7cf187bf0c11b05aa3eab7085148e0353f2af5':
Revert "Upload screennails in tiles to prevent jank"
2c848b26619de242a96ba4b20c252416a39506d6 07-Oct-2012 Wu-cheng Li <wuchengli@google.com> Show stitched panorama in secure album.

bug:7285105
Change-Id: I36801d4e5b19cceb10600d41a3a3c78244c5ee4a
pp/StitchingChangeListener.java
ata/SecureAlbum.java
43ba9f6644e4183b8ee27f96de3dda703d136c52 07-Oct-2012 Bobby Georgescu <georgescu@google.com> Implement new grid layout in Gallery

Bug: 7300836
Change-Id: Iab2b4f1caa52c5aa7638983fec194b3f81cc4c31
i/AlbumSetSlotRenderer.java
d2724f69edf39cf2019eac1b49f316d22ab70d0a 07-Oct-2012 Bobby Georgescu <georgescu@google.com> Change display of 360 panorama button

Bug: 7300866
-Move pano button to center and make larger
-Pano button visible even when in full-screen mode
-Show edit button only when image editor is available
-Correctly hide bottom controls when switching from
filmstrip mode to grid mode
Change-Id: I485b1988733bedd0c03e89a261a6ce80be46b9bc
pp/PhotoPage.java
3711d3ea870acba8ad83d0c51b0d03b0082ef0f0 07-Oct-2012 Bobby Georgescu <georgescu@google.com> Tune swipe to delete in filmstrip

Bug: 7277872
Change-Id: I01da98f4528b92308984e6ec7f1bc68e3e55697d
i/PhotoView.java
ba65c373f244f6de0b45afa6b7cd711866f1bfe4 06-Oct-2012 Bobby Georgescu <georgescu@google.com> Fix display of spinner and SQL exception for view intent

Bug: 7288544
Bug: 7219163
Remove the query for photo DISPLAY_NAME in view intent
since it is no longer used, and hide the spinner when
launching PhotoPage via this intent.

Change-Id: Id41ff3d623e7fd2e708b1042782333b48e8ba4a7
pp/Gallery.java
pp/PhotoPage.java
ad7cf187bf0c11b05aa3eab7085148e0353f2af5 06-Oct-2012 Bart Sears <bsears@google.com> Revert "Upload screennails in tiles to prevent jank"

This CL is reported to cause images to not be displayed correctly when opened via the view intent.

Bug: 7299123

This reverts commit e29fc4a51b99f12f7fae13fae272858df2e1af36

Change-Id: I5052548a826c275cb4559eeb4721c19f06861b3d
pp/PhotoDataAdapter.java
i/BasicTexture.java
i/BitmapScreenNail.java
i/GLCanvas.java
i/GLCanvasImpl.java
i/TileImageView.java
i/TiledTexture.java
bdcc92ef09560e26b561af0bf71563cd2ae71086 06-Oct-2012 nicolasroard <nicolasroard@google.com> am df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches

* commit 'df479ddec29551216a9344e4bae925f60185210a':
Add scale factor / quality parameters in filters
df479ddec29551216a9344e4bae925f60185210a 06-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches
81eb9976f967d9b3faa1749a8ab29d1743cf347d 06-Oct-2012 nicolasroard <nicolasroard@google.com> Add scale factor / quality parameters in filters

bug:7248352
Change-Id: I2e4ca86d681eba2e97ddc550f88d9f702ecba65d
iltershow/cache/BitmapCache.java
iltershow/cache/DelayedPresetCache.java
iltershow/cache/DirectPresetCache.java
iltershow/cache/ImageLoader.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterBW.java
iltershow/filters/ImageFilterBWBlue.java
iltershow/filters/ImageFilterBWGreen.java
iltershow/filters/ImageFilterBWRed.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterContrast.java
iltershow/filters/ImageFilterCurves.java
iltershow/filters/ImageFilterExposure.java
iltershow/filters/ImageFilterGradient.java
iltershow/filters/ImageFilterHue.java
iltershow/filters/ImageFilterRS.java
iltershow/filters/ImageFilterSaturated.java
iltershow/filters/ImageFilterShadows.java
iltershow/filters/ImageFilterStraighten.java
iltershow/filters/ImageFilterVibrance.java
iltershow/filters/ImageFilterVignette.java
iltershow/presets/ImagePreset.java
iltershow/tools/ProcessedBitmap.java
4a48f3736b693b3be9fe714b63d2bcb4f00dae33 06-Oct-2012 Bobby Georgescu <georgescu@google.com> am 39e5dfdd: Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches

* commit '39e5dfdd15055f2f96f45b1afd9c705f27a6d911':
Set the thumbnail/screennail sizes based on screensize
39e5dfdd15055f2f96f45b1afd9c705f27a6d911 06-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches
3ea0bfbcbea64276595029878d37f25bf4fbb881 04-Oct-2012 Bobby Georgescu <georgescu@google.com> Set the thumbnail/screennail sizes based on screensize

Bug: 7232758
Prior to this CL, the thumbnail and screennail sizes were
hardcoded which resulted in mediocre image quality when
using the Gallery in general and the camera filmstrip.
Now, we set the size of these items based on the resolution
of the display. Because high-resolution devices tend to
have higher-performance graphics to drive their large
displays, we expect that this will not introduce any
significant performance impact.

Change-Id: I90e08f7aca670e275c913fd9e21e4459c8bf9fcf
ata/ImageCacheService.java
ata/MediaItem.java
i/BitmapScreenNail.java
til/GalleryUtils.java
6cf059364b3c84e51b19cf335c708ecd107e0d25 05-Oct-2012 John Reck <jreck@google.com> am a6591448: Don\'t film strip animate when switching cameras

* commit 'a65914485de7b82b96b616c7be738ab952e09c83':
Don't film strip animate when switching cameras
a65914485de7b82b96b616c7be738ab952e09c83 05-Oct-2012 John Reck <jreck@google.com> Don't film strip animate when switching cameras

Bug: 7265781

Change-Id: Ibdef7d804923094f3b26471726a642a1b68e9540
i/PositionController.java
3c336202bb1f9afec7d16ae6877f6d49c92a6f2a 05-Oct-2012 nicolasroard <nicolasroard@google.com> am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches

* commit '7ca5aedd8249a642e3755f3614fc0a43225b4b58':
New UI...
7ca5aedd8249a642e3755f3614fc0a43225b4b58 05-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "New UI..." into gb-ub-photos-arches
92e2341248e99c691f38820503984bc5e2f18811 05-Oct-2012 nicolasroard <nicolasroard@google.com> New UI...

bug:7289525
bug:7289361

Change-Id: Ifde15d57f0d307417a1c7a7ae9b1122be873558f
iltershow/FilterShowActivity.java
iltershow/PanelController.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSlave.java
iltershow/imageshow/ImageStraighten.java
iltershow/presets/ImagePreset.java
iltershow/ui/ImageCurves.java
iltershow/ui/SliderController.java
5515801ddea6953e95b2c41a9434bb1fe489e08a 05-Oct-2012 Owen Lin <owenlin@google.com> Fix ANR in creating the fallback animation.

bug: 6620501
Change-Id: Ibb798cce5dd49bb5083de6f29225bae512d589f8
i/GLRootView.java
a556c0581fcb4323146df5e1f7c28bbf35a0e8e5 05-Oct-2012 Owen Lin <owenlin@google.com> am e29fc4a5: Upload screennails in tiles to prevent jank

* commit 'e29fc4a51b99f12f7fae13fae272858df2e1af36':
Upload screennails in tiles to prevent jank
e29fc4a51b99f12f7fae13fae272858df2e1af36 24-Sep-2012 Owen Lin <owenlin@google.com> Upload screennails in tiles to prevent jank

bug: 6399444

Change-Id: Id2338db34d7f87fbabd7861f78b42f2a81d9794b
pp/PhotoDataAdapter.java
i/BasicTexture.java
i/BitmapScreenNail.java
i/GLCanvas.java
i/GLCanvasImpl.java
i/TileImageView.java
i/TiledTexture.java
002e90bf111c3eb5847f92e4d3ede899dfc8ba0f 05-Oct-2012 Hung-ying Tyan <tyanh@google.com> am 9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches

* commit '9bcba5b049f199ad78051c2ad27897cad389679d':
Open album in filmstrip only if the item exists.
9bcba5b049f199ad78051c2ad27897cad389679d 05-Oct-2012 Hung-ying Tyan <tyanh@google.com> Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches
ca3c75ffbf1863a3e4bd827f74a61cc7657d6679 05-Oct-2012 nicolasroard <nicolasroard@google.com> am f47e790e: Add a reset item menu

* commit 'f47e790e3f3553f69abe054eec20bd7585118843':
Add a reset item menu
f47e790e3f3553f69abe054eec20bd7585118843 05-Oct-2012 nicolasroard <nicolasroard@google.com> Add a reset item menu

bug:7234317
Change-Id: I3129b16f83981ab22ce17341d8401822369686eb
iltershow/FilterShowActivity.java
02b24ed2e858d1dbef0d85bc485d4090dac47e17 05-Oct-2012 John Hoford <hoford@google.com> am b559b2dd: add vibrance fix a free in shadows

* commit 'b559b2dd6637660ddbbdbae79a742c9f0fb1180b':
add vibrance fix a free in shadows
b559b2dd6637660ddbbdbae79a742c9f0fb1180b 04-Oct-2012 John Hoford <hoford@google.com> add vibrance fix a free in shadows

bug:7234321
Change-Id: I52b1b952fcdc34c23464793621df60aa7e8e00b2
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterVibrance.java
f8d0367ea29515689c58ac821434947a888d1ca4 05-Oct-2012 nicolasroard <nicolasroard@google.com> am 5448bf80: Implement sharpen

* commit '5448bf8095483574649afcc2add7f153670c7450':
Implement sharpen
5448bf8095483574649afcc2add7f153670c7450 03-Oct-2012 nicolasroard <nicolasroard@google.com> Implement sharpen

bug:7279964
bug:7247494
bug:7234321

- add a sharpen filter
- add infrastructure to use RenderScript
- some refactoring (add an ImageSlave class)
- add new zoom UI

Change-Id: Id94dc94d32866c7107b6818adf4db35d0c6c0b01
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/cache/ZoomCache.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterRS.java
iltershow/filters/ImageFilterSharpen.java
iltershow/filters/convolve3x3.rs
iltershow/imageshow/ImageBorder.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSlave.java
iltershow/imageshow/ImageStraighten.java
iltershow/imageshow/ImageZoom.java
iltershow/ui/ImageCurves.java
iltershow/ui/SliderController.java
iltershow/ui/SliderListener.java
d5e9f02de0de89f4a04091e00a76fbd915ea7e2b 04-Oct-2012 George Mount <mount@google.com> am 29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches

* commit '29b553a54cbe4d95c174121e4f956a74117a4fc9':
Support panorama progress items in Gallery.
29b553a54cbe4d95c174121e4f956a74117a4fc9 04-Oct-2012 George Mount <mount@google.com> Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches
41190e100f3dd3e895d378f752c7f4661c690f88 04-Oct-2012 Bobby Georgescu <georgescu@google.com> am 8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into gb-ub-photos-arches

* commit '8a415f457fe9fd18b369ac4ec354a33e3affcb94':
Don't allow switching to filmstrip in get content intent
8a415f457fe9fd18b369ac4ec354a33e3affcb94 04-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Don't allow switching to filmstrip in get content intent" into gb-ub-photos-arches
3158c0f214169dd7e1dc7ff50368f840cdcd148f 04-Oct-2012 Bobby Georgescu <georgescu@google.com> am 0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches

* commit '0eefb1733f5ff2e2f6f4846bdbd8873639b4d085':
Upscale images to fill screen for slideshow
0eefb1733f5ff2e2f6f4846bdbd8873639b4d085 04-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches
7e6537ca106a80aeb4a52182b31ddc9aa642abe5 04-Oct-2012 Bobby Georgescu <georgescu@google.com> Upscale images to fill screen for slideshow

Bug: 7110382
This fixes the slideshow mode on high-resolution
displays. Note that this will scale up screennails
to fill the screen even if they are fairly low quality.
The resolution to 7232758 will set the size of the
screennails appropriately based on screen size.

Change-Id: I7b5367c2fce1d10f6d5e70c1239d893f54236b10
i/SlideshowView.java
4c9e3e1d7a5af64ddc946297db9d07dc394d861e 04-Oct-2012 Bobby Georgescu <georgescu@google.com> Don't allow switching to filmstrip in get content intent

Bug: 7288252
Change-Id: I247e7c22ed3e90de0222ac82a55ed027c9f252c1
pp/AlbumPage.java
ca4241c8e87434636ccc29468f700e83ecd83a46 04-Oct-2012 Bobby Georgescu <georgescu@google.com> am b1a51397: Snap back photo after swipe in y-direction in filmstrip

* commit 'b1a513974d59c1dc14e004338b6795d6c3c5e5e8':
Snap back photo after swipe in y-direction in filmstrip
c64d127c976f8ef647552063ff14ead4388ce699 19-Sep-2012 Angus Kong <shkong@google.com> Support panorama progress items in Gallery.

Bug 7259843
Add dummy files for showing panorama progress in filmstrip.

Change-Id: I7ae92b90bbbd992fde00cfcfc68af69b34d34d74
pp/GalleryApp.java
pp/GalleryAppImpl.java
pp/PhotoPage.java
pp/StitchingChangeListener.java
ata/DataManager.java
ata/LocalAlbumSet.java
b1a513974d59c1dc14e004338b6795d6c3c5e5e8 04-Oct-2012 Bobby Georgescu <georgescu@google.com> Snap back photo after swipe in y-direction in filmstrip

Bug: 7283537
Change-Id: Ifee561a978d418f7a1e96f1a3ddb7cc8df53752c
i/PhotoView.java
a4ca12ee030fa79403b5e2cde20238a99c6e8673 04-Oct-2012 Romain Guy <romainguy@google.com> Merge "@#!$# Bug #7275145" into jb-mr1-dev
31bf2be07efdecc91f0e72e5fd2d3750fa1755c8 04-Oct-2012 Pin Ting <pinting@google.com> am 2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos-arches

* commit '2abc1350cde24e810f6437592f099c149ce19ada':
Accelerate PNG image rendering.
2abc1350cde24e810f6437592f099c149ce19ada 04-Oct-2012 Pin Ting <pinting@google.com> Merge "Accelerate PNG image rendering." into gb-ub-photos-arches
27565de3ab86e81a20c9804ebc7f8d3f737031a0 04-Oct-2012 Hung-ying Tyan <tyanh@google.com> Open album in filmstrip only if the item exists.

Metadata of picasa photos may not be available when user taps to view a picasa
album. Cannot enter PhotoPage directly in such a case.

Bug: 7213464
Change-Id: Ife2e8768fc9b8d8757235610a02f029f40205b5b
pp/AlbumSetPage.java
8c377351cfbc425f7eb6dbe94af0a96d71560a4b 04-Oct-2012 Pin Ting <pinting@google.com> Accelerate PNG image rendering.

Bug:7137662
Change-Id: I050a228a6c8031c6a2d068eb4ba1b39be86e9f4a
i/TileImageView.java
i/TileImageViewAdapter.java
til/GalleryUtils.java
7a44c6a6430da1fe68a44139a49db581d51086b0 04-Oct-2012 Owen Lin <owenlin@google.com> am accef756: Fix NPE in ImageLoader.

* commit 'accef756f100d5c27a4d13d6a6bfa5c75714e5bc':
Fix NPE in ImageLoader.
accef756f100d5c27a4d13d6a6bfa5c75714e5bc 04-Oct-2012 Owen Lin <owenlin@google.com> Fix NPE in ImageLoader.

bug: 7275805
Change-Id: Ied04553a97efe5b4996418f20d834d6bd0893976
iltershow/cache/ImageLoader.java
2d4c11a4ecaf70ad2f25f0cb3bc529b42b68f36c 04-Oct-2012 Owen Lin <owenlin@google.com> am fab36399: Merge "Set type as well while launching editor." into gb-ub-photos-arches

* commit 'fab36399a0fa455377854d65fab012ee6ee55868':
Set type as well while launching editor.
b6692653af5dbce477f33df721aa6177fabeda4b 04-Oct-2012 Owen Lin <owenlin@google.com> Set type as well while launching editor.

bug: 7275805
Change-Id: I6b86dd03d92b2cf453947bd84a0247e1626c81db
pp/PhotoPage.java
1c44dc1ca6bffcff87a3470a51064ffbd95c0251 04-Oct-2012 Romain Guy <romainguy@google.com> @#!$#
Bug #7275145

Removing the window background when it's not visible is a good idea
to save on performance. Removing *all* the backgrounds is just a silly
idea that leads to weird looking results that drive graphics engineers
mad for a day until they figure out that everything is working properly
and that the app is simply asking the system to draw whatever garbage
is left in the GPU's graphics buffers.

Change-Id: Icd12cd4ec6fc313f80acfd8deb7133a17ea11302
pp/MoviePlayer.java
ce5610100513fd73c4e67c4112ceeb3121287343 04-Oct-2012 Mangesh Ghiware <mghiware@google.com> am 6090237f: Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches

* commit '6090237f178914fa7d7eef514c2e2512d4c27847':
Revert "Add a overflow menu item to view 360-degree panorama."
6090237f178914fa7d7eef514c2e2512d4c27847 04-Oct-2012 Mangesh Ghiware <mghiware@google.com> Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches
541315cda58bfdb30b3acab14af6944f83908103 04-Oct-2012 Mangesh Ghiware <mghiware@google.com> Revert "Add a overflow menu item to view 360-degree panorama."

This reverts commit d84ae72adb147c0e8517a438b3dea3e87d319bb7

Change-Id: I5921cbb476034da2798480534e9084e287312f04
pp/PhotoPage.java
i/MenuExecutor.java
32ffa82178358194cfbbcb479594648af8a24c46 03-Oct-2012 nicolasroard <nicolasroard@google.com> am 124a9d3f: Merge "Fix ANR in image editor" into gb-ub-photos-arches

* commit '124a9d3f2adc08fdef179e1922762d024d27fd69':
Fix ANR in image editor
124a9d3f2adc08fdef179e1922762d024d27fd69 03-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Fix ANR in image editor" into gb-ub-photos-arches
1046a23a15aa2aa291b490ce7c0781141f4c2f20 03-Oct-2012 nicolasroard <nicolasroard@google.com> Fix ANR in image editor

bug:7275425
Change-Id: I01a89579e17a0e4fc0817b61c7fda48ca54d0afa
iltershow/filters/ImageFilterGradient.java
iltershow/imageshow/ImageStraighten.java
711c498f36d63f542b7cc45ca9acbb719e83171f 03-Oct-2012 Bobby Georgescu <georgescu@google.com> am 56bc8b74: Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches

* commit '56bc8b742d750f2fff9d3a30e6cc96e1850c782d':
Fix snapping behavior in filmstrip
56bc8b742d750f2fff9d3a30e6cc96e1850c782d 03-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches
499ac9eae0eb26eaf7ebf79fb88ba929b71c8145 03-Oct-2012 Bobby Georgescu <georgescu@google.com> Fix snapping behavior in filmstrip

Bug: 7277936
Change-Id: I57569eaac0b9e633d249754dcb3613c6c4f7ad3a
i/PhotoView.java
81912a44c7e7d2519a7f89d9860e698959b8fe9e 03-Oct-2012 Mangesh Ghiware <mghiware@google.com> am b57e72bb: Disable destructive rotate for lightcycle panorama

* commit 'b57e72bb1a093afc5aee276855656c8b285c73b3':
Disable destructive rotate for lightcycle panorama
b57e72bb1a093afc5aee276855656c8b285c73b3 03-Oct-2012 Mangesh Ghiware <mghiware@google.com> Disable destructive rotate for lightcycle panorama

Bug: 7276024
Change-Id: I2b223d3928517b083cc982db8142770da02dd5b9
ata/LocalImage.java
d0bd885b90576cf0ff1317c236adc805c0d0d2f4 03-Oct-2012 Mangesh Ghiware <mghiware@google.com> am d84ae72a: Add a overflow menu item to view 360-degree panorama.

* commit 'd84ae72adb147c0e8517a438b3dea3e87d319bb7':
Add a overflow menu item to view 360-degree panorama.
d84ae72adb147c0e8517a438b3dea3e87d319bb7 03-Oct-2012 Mangesh Ghiware <mghiware@google.com> Add a overflow menu item to view 360-degree panorama.

Bug: 7276026
Change-Id: Ib4979e45867e22267b34fb77342ca625337c7ee4
pp/PhotoPage.java
i/MenuExecutor.java
b80ac7f5bbaff18103465eb313e86b9fe573f5e3 03-Oct-2012 Bobby Georgescu <georgescu@google.com> am f4e22eb4: Correct behavior when swiping to placeholder item in PhotoPage

* commit 'f4e22eb44bfae0c2a3b6570f19480c8c3535d808':
Correct behavior when swiping to placeholder item in PhotoPage
f4e22eb44bfae0c2a3b6570f19480c8c3535d808 03-Oct-2012 Bobby Georgescu <georgescu@google.com> Correct behavior when swiping to placeholder item in PhotoPage

Bug: 7261641
Change-Id: I54deed0f20a4673cb5470ffc128c73cddc071772
pp/PhotoPage.java
i/PhotoView.java
f6af2a3240cbd6de44e51049e8f5c5a87cab09f8 03-Oct-2012 Mangesh Ghiware <mghiware@google.com> am 847587b5: Remove redundant handling of share action.

* commit '847587b51800d4b2d241cd1b7c8b589be2c24133':
Remove redundant handling of share action.
847587b51800d4b2d241cd1b7c8b589be2c24133 03-Oct-2012 Mangesh Ghiware <mghiware@google.com> Remove redundant handling of share action.

Bug: 7256214

Gallery PhotoPage was handling the menu item selection for the share
action, in addition to the ShareActionProvider. Removing this leftover
code from pre-ActionBar implementation.

Change-Id: I0c91b9a7c05b38758ad1b76dd657225daaab1922
pp/PhotoPage.java
edceb4d0b3974931c2f83a8d67b3fd8b14f65036 03-Oct-2012 John Hoford <hoford@google.com> am c7b2c287: Add Shadow feature

* commit 'c7b2c287bfbe3f53a4d65800c3884b0082ad683c':
Add Shadow feature
c7b2c287bfbe3f53a4d65800c3884b0082ad683c 03-Oct-2012 John Hoford <hoford@google.com> Add Shadow feature

bug:7234321
Change-Id: Ib0d4db773486e469ed818385b68b7b907070c297
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterShadows.java
iltershow/ui/ControlPoint.java
75a946ff012f966601d1098aac761a8ff69789f6 03-Oct-2012 nicolasroard <nicolasroard@google.com> am 45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches

* commit '45e666c65b75d36327c3491fb8e1245ba5cf4c77':
Implements image sharing
45e666c65b75d36327c3491fb8e1245ba5cf4c77 03-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Implements image sharing" into gb-ub-photos-arches
0ee91a2b74808fa3f51d370daaddf99f588d72ef 01-Oct-2012 nicolasroard <nicolasroard@google.com> Implements image sharing

bug:7233986
Change-Id: I8feb94d77facf8dbb8da5fab89b49ed7c224116e
iltershow/FilterShowActivity.java
iltershow/cache/ImageLoader.java
iltershow/imageshow/ImageShow.java
iltershow/provider/SharedImageProvider.java
iltershow/tools/ProcessedBitmap.java
iltershow/tools/SaveCopyTask.java
11a41ac916415bd4fab16d7e1a8f2b61fe97231f 03-Oct-2012 Bobby Georgescu <georgescu@google.com> am 9481d05b: Do not show grid/filmstrip spinner in secure camera mode

* commit '9481d05b0782dccd495c66d2e3240cd7448bbd4a':
Do not show grid/filmstrip spinner in secure camera mode
9481d05b0782dccd495c66d2e3240cd7448bbd4a 03-Oct-2012 Bobby Georgescu <georgescu@google.com> Do not show grid/filmstrip spinner in secure camera mode

Bug: 7274284
Change-Id: I74ede883fe726bd05e95b30d3f91da2856543123
pp/PhotoPage.java
4b759a1341313fa4aeaaf8293202eb2aaabadec5 03-Oct-2012 Bobby Georgescu <georgescu@google.com> am 45f089d6: Show Camera placeholder as first filmstrip item in roll

* commit '45f089d69141e3fb0dfaad9bc34d275b61eb2aee':
Show Camera placeholder as first filmstrip item in roll
45f089d69141e3fb0dfaad9bc34d275b61eb2aee 02-Oct-2012 Bobby Georgescu <georgescu@google.com> Show Camera placeholder as first filmstrip item in roll

Bug: 7272674
The camera roll filmstrip view now shows a shortcut to
launch the camera when opened from the Gallery app.
Note: the edits to SnailAlbum and SnailSource were made to
allow sharing code between SingleItemAlbum and SnailAlbum

Change-Id: I1bd2f3db99138c4b79a41c9c5baee46704cd18e0
pp/AlbumSetPage.java
pp/PhotoPage.java
ata/CameraShortcutImage.java
ata/FilterSource.java
ata/MediaObject.java
ata/SingleItemAlbum.java
ata/SnailAlbum.java
ata/SnailSource.java
65c16ee5bb556df724b4d4a59dbc31c25697a939 02-Oct-2012 Teng-Hui Zhu <ztenghui@google.com> am 51915a62: Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches

* commit '51915a622bbd32e90f0cd43b69a7851e13825737':
Trimming: Exit current activity after click done
51915a622bbd32e90f0cd43b69a7851e13825737 02-Oct-2012 Teng-Hui Zhu <ztenghui@google.com> Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches
31e3baa099c0d57280c4a538296ec0826b21d6ad 02-Oct-2012 John Reck <jreck@google.com> am 536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches

* commit '536ff1512fae7c8ad6ee276bf102269011fb6e50':
Fix NFC regression
536ff1512fae7c8ad6ee276bf102269011fb6e50 02-Oct-2012 John Reck <jreck@google.com> Merge "Fix NFC regression" into gb-ub-photos-arches
2619f20d30123a391cc6d37515fe8eb9d81d5029 02-Oct-2012 John Reck <jreck@google.com> Fix NFC regression

Bug: 7263536

Change-Id: Ieba6147fdc0279888ec1e6ea2101eab235522b9f
pp/PhotoPage.java
i/ActionModeHandler.java
2ddf485a61b675e84f00ed3e415788aaa8a8c156 02-Oct-2012 Bobby Georgescu <georgescu@google.com> am 6423defe: Fix crash, remove logging added to diagnose bug

* commit '6423defee1d8ccf4d462d40ae4f82c7d73b11ab5':
Fix crash, remove logging added to diagnose bug
6423defee1d8ccf4d462d40ae4f82c7d73b11ab5 02-Oct-2012 Bobby Georgescu <georgescu@google.com> Fix crash, remove logging added to diagnose bug

Bug: 7216012
LocalMergeAlbum index was not being initialized
in constructor so it was possible to access the
index before it was populated with information.

Change-Id: I7025839b0f3953b827f06c717cff6dc47a15b06c
ata/LocalMergeAlbum.java
2833355c86cff90163457779adb2bc78a6ca0faa 02-Oct-2012 Teng-Hui Zhu <ztenghui@google.com> Trimming: Exit current activity after click done

Don't auto exit the trimmed video playing.
bug:7093055

Change-Id: I97fa1556cbe0591f2204ab4135b85375f82abbe8
pp/TrimVideo.java
1856b8fcfdfe75093a14fe53c3d25f64680c941c 02-Oct-2012 Bobby Georgescu <georgescu@google.com> am 462923e5: Check item is editable before attempting to launch editor

* commit '462923e5800e151ab5ec450063334ba430c1da3a':
Check item is editable before attempting to launch editor
462923e5800e151ab5ec450063334ba430c1da3a 02-Oct-2012 Bobby Georgescu <georgescu@google.com> Check item is editable before attempting to launch editor

Bug: 7269840
Change-Id: I18af824865b8a158c7a89e2b34f51a32de144057
pp/PhotoPage.java
a3d2afd6b885ebc56f590e0b373f625bd0d64155 02-Oct-2012 Owen Lin <owenlin@google.com> am 13360629: Remove ActionBarSherlock

* commit '1336062985c9824d7fd796b1cebd5eaa8e4163ca':
Remove ActionBarSherlock
1336062985c9824d7fd796b1cebd5eaa8e4163ca 02-Oct-2012 Owen Lin <owenlin@google.com> Remove ActionBarSherlock

bug: 7242682

Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb
pp/AbstractGalleryActivity.java
pp/ActivityState.java
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/CropImage.java
pp/Gallery.java
pp/GalleryActionBar.java
pp/MovieActivity.java
pp/PhotoPage.java
pp/PickerActivity.java
pp/SinglePhotoDataAdapter.java
pp/StateManager.java
i/ActionModeHandler.java
i/MenuExecutor.java
i/PopupList.java
70814a18aa9327c02e7876a939d10637dbf02155 02-Oct-2012 Wu-cheng Li <wuchengli@google.com> am 935b9cfe: Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches

* commit '935b9cfe991c3afe119720c487dc24cc02c55584':
Update assets of the lock screen image in the secure album.
935b9cfe991c3afe119720c487dc24cc02c55584 02-Oct-2012 Wu-cheng Li <wuchengli@google.com> Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches
ba36d9b1ecc0d6021701d28682e5b1fccc165ab0 02-Oct-2012 George Mount <mount@google.com> am 2fc053ed: Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches

* commit '2fc053edc38bf5070d980b541aa267b7a3325a8c':
Revert "Enable swiping from LightCycle to Gallery"
2fc053edc38bf5070d980b541aa267b7a3325a8c 02-Oct-2012 George Mount <mount@google.com> Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches
abf8e3fd799bb729536973cef9863a78038497d5 02-Oct-2012 Bobby Georgescu <georgescu@google.com> am 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches

* commit '7b4bdd0ac9d2b13e33d46918551f7fb2d642922d':
Improve display of ActionBar album mode switcher
7b4bdd0ac9d2b13e33d46918551f7fb2d642922d 02-Oct-2012 Bobby Georgescu <georgescu@google.com> Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches
ee899c09c88e5b054397ac44ad20e5055cd24f39 02-Oct-2012 Bobby Georgescu <georgescu@google.com> Improve display of ActionBar album mode switcher

Bug: 7265942
Bug: 7266862
- Ellipsize the title of the album when appropriate
- Show correctly title when swiping from camera to gallery
- Hide the delete icon in the overflow menu to match the
latest UX mocks, making more room for title

Change-Id: Ief77f65c972e75086c5dbf4229c9462cbcc17940
pp/GalleryActionBar.java
pp/PhotoPage.java
ata/ComboAlbum.java
3508b213dbad5dce76a3c57f8f4b76ad4e765b83 02-Oct-2012 George Mount <mount@google.com> Revert "Enable swiping from LightCycle to Gallery"

This reverts commit 6fd25fd9a457346c8c32e8c4e68c7c491205730b
Changed mechanism for enabling swipe in LightCycle.

Change-Id: I5c9395eb97ee88d015fb3765d0594d92c4ae126d
i/ExtTexture.java
til/TextureBuffer.java
d0b8143d42b96760aa864d36821ed57925444509 02-Oct-2012 John Hoford <hoford@google.com> am 3cf07221: Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches

* commit '3cf072213abc2e2b03f7c1a0069b37b2ca79f70c':
Fix exposure and fixed warnings
3cf072213abc2e2b03f7c1a0069b37b2ca79f70c 02-Oct-2012 John Hoford <hoford@google.com> Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches
bf97d3aaeddfba06f6a00ee7abb23fcd28eb2e7d 02-Oct-2012 John Hoford <hoford@google.com> Fix exposure and fixed warnings

bug:7234321
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilterBrightness.java
iltershow/filters/ImageFilterExposure.java
838f598105693121fb73e8dcf3b9fcbc204a3b5b 02-Oct-2012 Ruben Brunk <rubenbrunk@google.com> am 83f50a9b: Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches

* commit '83f50a9b3f3ba9ada8dc6999ed997499fd78c052':
Fix for exceptions when image has no orientation data.
83f50a9b3f3ba9ada8dc6999ed997499fd78c052 02-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches
700ae7e0a7737690abf20a7602bcab4ba4fff414 02-Oct-2012 George Mount <mount@google.com> am 526c3060: Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches

* commit '526c306051b0b92bcd54923a52a4c5bccaef7d77':
Enable swiping from LightCycle to Gallery
526c306051b0b92bcd54923a52a4c5bccaef7d77 02-Oct-2012 George Mount <mount@google.com> Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches
e61c870ff4ff215d553e3596a519ead0b255ec0d 02-Oct-2012 Bobby Georgescu <georgescu@google.com> am 3cf502a9: Move grid/filmstrip switching to ActionBar title "spinner"

* commit '3cf502a91b36bf6ce633f897505b0a2c3fc53ad5':
Move grid/filmstrip switching to ActionBar title "spinner"
3cf502a91b36bf6ce633f897505b0a2c3fc53ad5 02-Oct-2012 Bobby Georgescu <georgescu@google.com> Move grid/filmstrip switching to ActionBar title "spinner"

Bug: 7233818
Bug: 7240846
Bug: 7258973

Tapping the title of the album, whether in filmstrip or
grid mode, allows switching between these modes using a
menu. The album name is now displayed when viewing pictures
in the filmstrip or zoomed in modes. Finally, no longer
allow switching to grid mode when not appropriate.

Change-Id: I4ee511feb7a74581fe185933ddd5110e5eb9feb0
pp/AlbumPage.java
pp/GalleryActionBar.java
pp/PhotoPage.java
f18dd1e13dc291c03df01db703178b5fb414d0d1 02-Oct-2012 John Reck <jreck@google.com> am c58fe396: Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches

* commit 'c58fe396fb7c6208740fa22a005e94a358b8266f':
Remove OnFrameAvailableListener in tear down
c58fe396fb7c6208740fa22a005e94a358b8266f 02-Oct-2012 John Reck <jreck@google.com> Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches
71ba6e959569cb90f415490e40bd95855f894cc5 02-Oct-2012 John Reck <jreck@google.com> Remove OnFrameAvailableListener in tear down

Bug: 7217305

Change-Id: I79d1741cd757b2cc15a42336153af755ae84bd57
i/SurfaceTextureScreenNail.java
02506a90577ba3f767d192b9547d4478bcc149a8 02-Oct-2012 Ruben Brunk <rubenbrunk@google.com> Fix for exceptions when image has no orientation data.

Bug: 7219163

When image has no orientation data, getOrientation now
catches the SQLiteException.

Change-Id: I6783f05bae67532c1b186fc07ca96b9361440984
iltershow/cache/ImageLoader.java
6fd25fd9a457346c8c32e8c4e68c7c491205730b 28-Sep-2012 George Mount <mount@google.com> Enable swiping from LightCycle to Gallery

Bug 7212420

Change-Id: Ic61bc06c6113c969e4b2e6e9c87c78a8aa2cb402
i/ExtTexture.java
til/TextureBuffer.java
a58b741cb28a7b64b09d75785b6cf2002a181093 01-Oct-2012 Bobby Georgescu <georgescu@google.com> am d87c8624: More logs for gallery crash error, remove a potential cause

* commit 'd87c8624a7ae477a6dea86d63866ade04f8d7e7c':
More logs for gallery crash error, remove a potential cause
d87c8624a7ae477a6dea86d63866ade04f8d7e7c 30-Sep-2012 Bobby Georgescu <georgescu@google.com> More logs for gallery crash error, remove a potential cause

Bug: 7216012
Made sure that FilterDeleteSet doesn't ever return stale
item counts, added extra logging in LocalMergeAlbum for
NoSuchElementException so that we can have more info to
diagnose this crash if it happens in the future.

Change-Id: Ic988522fda4a16bb483db6ad34bc7f81ee098b03
ata/FilterDeleteSet.java
ata/LocalMergeAlbum.java
445605fe37d3678c0297d99ae6ec036574d19633 01-Oct-2012 Wu-cheng Li <wuchengli@google.com> Update assets of the lock screen image in the secure album.

bug:7192331
Change-Id: I551e14420e43106e97b093884571eaea27b00425
ata/UnlockImage.java
4038913fa2333706b7e87a82aef61749f53be368 01-Oct-2012 nicolasroard <nicolasroard@google.com> am f497fdfa: Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches

* commit 'f497fdfa1abfea7b4ddabd7850eb528ea1c126ee':
Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now
f497fdfa1abfea7b4ddabd7850eb528ea1c126ee 01-Oct-2012 nicolasroard <nicolasroard@google.com> Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches
3c9d65d5b0bab6bb93a9e3f48352c099b4ee2976 30-Sep-2012 Bobby Georgescu <georgescu@google.com> am 21421a10: Merge "Fix crash in album page" into gb-ub-photos-arches

* commit '21421a10bc2ad9151d3d3075ad77d96610c2043f':
Fix crash in album page
21421a10bc2ad9151d3d3075ad77d96610c2043f 30-Sep-2012 Bobby Georgescu <georgescu@google.com> Merge "Fix crash in album page" into gb-ub-photos-arches
ed07af07a8e793e0702c9fcf2ef14273eac03d3d 30-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> am 5168509f: Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches

* commit '5168509fe260a9d549278a9a287c3d7e0c1b739e':
Trimming: clean up strings and prevent too short or no trimming.
5168509fe260a9d549278a9a287c3d7e0c1b739e 30-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches
61861118986a0311293be74396a66ce900a39d59 30-Sep-2012 Bobby Georgescu <georgescu@google.com> Fix crash in album page

Bug: 7258955
Avoid second call to onPause when finishing
ActivityState instance within onPause.

Change-Id: I6081a6467e109a6edf35e60d24193e550cb0dd21
pp/AlbumPage.java
pp/StateManager.java
ff43ce9433610caaab3fb18a0822e04206d697ab 30-Sep-2012 Mangesh Ghiware <mghiware@google.com> am 3e2e9e9c: Merge "Remove video play icon and tap to play behavior for panorama." into gb-ub-photos-arches

* commit '3e2e9e9c7ee62b79632243a3e52f0abd70ce2a59':
Remove video play icon and tap to play behavior for panorama.
94e05269ad0f8b965b76695223c2e84e5cb382e1 30-Sep-2012 Bobby Georgescu <georgescu@google.com> am 0aaf8fb8: Update FX/pano button appearance, placement, animation

* commit '0aaf8fb8b86cbf6353937c12f377ad524661c553':
Update FX/pano button appearance, placement, animation
3e2e9e9c7ee62b79632243a3e52f0abd70ce2a59 30-Sep-2012 Mangesh Ghiware <mghiware@google.com> Merge "Remove video play icon and tap to play behavior for panorama." into gb-ub-photos-arches
0aaf8fb8b86cbf6353937c12f377ad524661c553 30-Sep-2012 Bobby Georgescu <georgescu@google.com> Update FX/pano button appearance, placement, animation

Bug: 7213162
Bug: 7233446
Change-Id: Ief62e3f17ee08999a23656217dcf39bb91421d1e
pp/PhotoPageBottomControls.java
c1c67ea813421a6173d1dab2ad75c11b51c7976d 30-Sep-2012 Mangesh Ghiware <mghiware@google.com> Remove video play icon and tap to play behavior for panorama.

Bug: 7258968

Per new UX design, there'll be a panorama viewer icon in the bottom
right instead (see b/7233446)

This is essentially a revert of Change-Id
I17fdb5d6bcab1f3997a1ab92fcf45e0309b394b3

Change-Id: Ib35c99cca4ee9b2422dd16f5ea3b931ad5f08f35
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/SinglePhotoDataAdapter.java
i/PhotoView.java
bf93da72576b28f4e9dfb27f8f3fef702c8ae82d 29-Sep-2012 nicolasroard <nicolasroard@google.com> Fix border bug and filter application
- fix layout (use framelayout)
- fix copy imagepreset
- added a current image state panel
- remove title for border images for now

bug:7256090
bug:7249672
bug:7234317
bug:7225150

Change-Id: I958628a1604c7e436e5d121556c8744f5748b1ec
iltershow/FilterShowActivity.java
iltershow/HistoryAdapter.java
iltershow/ImageStateAdapter.java
iltershow/filters/ColorSpaceMatrix.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterBW.java
iltershow/filters/ImageFilterBWBlue.java
iltershow/filters/ImageFilterBWGreen.java
iltershow/filters/ImageFilterBWRed.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterBrightness.java
iltershow/filters/ImageFilterContrast.java
iltershow/filters/ImageFilterCurves.java
iltershow/filters/ImageFilterGradient.java
iltershow/filters/ImageFilterHue.java
iltershow/filters/ImageFilterSaturated.java
iltershow/filters/ImageFilterStraighten.java
iltershow/filters/ImageFilterVignette.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSmallFilter.java
iltershow/presets/ImagePreset.java
d44b0d8348a9f91259ecbd59ec48c9df9f058141 29-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> Trimming: clean up strings and prevent too short or no trimming.

Also view the result if the activity is not stopped.
bug:7093055

Change-Id: If244d567a4be9da22542398f6b7c22a081786339
pp/TrimVideo.java
7e035f20c961d2f0dccd48772dee5273e95b9d45 29-Sep-2012 nicolasroard <nicolasroard@google.com> am 0c3203f1: Remove the individual Curves channel filters Reorder the filters

* commit '0c3203f1789df3f8bd772dfd655e73b44636b629':
Remove the individual Curves channel filters Reorder the filters
0c3203f1789df3f8bd772dfd655e73b44636b629 29-Sep-2012 nicolasroard <nicolasroard@google.com> Remove the individual Curves channel filters
Reorder the filters

bug:7234317
Change-Id: Ia726fa8ea82580c97784eb03d4c6740cf4a603c4
iltershow/FilterShowActivity.java
eb9d5d27df1708c4269612b95ba8b56fb5da5993 29-Sep-2012 John Hoford <hoford@google.com> am d42f6c69: Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure

* commit 'd42f6c69c5980110c16cd679f914c4e4e7caa29d':
Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
d42f6c69c5980110c16cd679f914c4e4e7caa29d 28-Sep-2012 John Hoford <hoford@google.com> Add contrast & brightness filters
Added hue fixed contrast
Stablized Contrast, Saturation, Tint, Exposure

bug:7234321
Change-Id: Iadd1e3ab215b60f920b718fa56611a07f24effee
iltershow/FilterShowActivity.java
iltershow/filters/ColorSpaceMatrix.java
iltershow/filters/ImageFilterBrightness.java
iltershow/filters/ImageFilterContrast.java
iltershow/filters/ImageFilterHue.java
iltershow/filters/ImageFilterSaturated.java
c92d9de295efa5e0773aef1642d184e5fe8e8a38 29-Sep-2012 nicolasroard <nicolasroard@google.com> am 786fe647: Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark

* commit '786fe6476e4ccf4b98489ff69d8ef439533cdc2a':
Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
786fe6476e4ccf4b98489ff69d8ef439533cdc2a 29-Sep-2012 nicolasroard <nicolasroard@google.com> Improve ActionBar
- show both undo and redo
- add the checkmark with done instead of the up mark

bug:7233986

Change-Id: I32af8068b08763461b720054f270cb6acabefbbf
iltershow/FilterShowActivity.java
8c35f7954f4e7aa6c2701fa1131978e6cd5cf79e 29-Sep-2012 Bobby Georgescu <georgescu@google.com> am d5480bd5: Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches

* commit 'd5480bd5a849517106f232326fd2d31b80b72b3f':
Debounce after quick fling towards camera but zoom if slow
d5480bd5a849517106f232326fd2d31b80b72b3f 29-Sep-2012 Bobby Georgescu <georgescu@google.com> Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches
b27df4650459068b409924493bbadaf25bb7e191 28-Sep-2012 Bobby Georgescu <georgescu@google.com> Debounce after quick fling towards camera but zoom if slow

Bug: 7250026
Bug: 7213802
Change-Id: I3c900813937161744a36015469c70112f2cf356b
pp/PhotoPage.java
i/PhotoView.java
i/PositionController.java
639c9c6d767f70ab83fb97b13b108bb1df06cabf 28-Sep-2012 Mangesh Ghiware <mghiware@google.com> am f98aafb7: Fix NPE in GalleryActionBar

* commit 'f98aafb7eb65b889b0f831d607828ca4f8af64b6':
Fix NPE in GalleryActionBar
f98aafb7eb65b889b0f831d607828ca4f8af64b6 28-Sep-2012 Mangesh Ghiware <mghiware@google.com> Fix NPE in GalleryActionBar

Bug: 7252666
Change-Id: Ide3c8e0d609743b34a3c53f3bb48dbeddb3f98c0
pp/GalleryActionBar.java
i/ActionModeHandler.java
91cb11f248a10b1b35621d092d9c0418e6867ede 28-Sep-2012 nicolasroard <nicolasroard@google.com> am 7caab0dc: Change the slider values range to -100 -> 100

* commit '7caab0dc36f69b4c51c39bd191f2df44ea586b70':
Change the slider values range to -100 -> 100
7caab0dc36f69b4c51c39bd191f2df44ea586b70 28-Sep-2012 nicolasroard <nicolasroard@google.com> Change the slider values range to -100 -> 100

bug:7247494
Change-Id: Ie007d93ac5e6c412fb97c1fc8cfb383387cec2a0
iltershow/ui/SliderController.java
20ee087f90ea1205761f4aa1f27f1914adad6bed 28-Sep-2012 Ruben Brunk <rubenbrunk@google.com> am 75a93c78: Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches

* commit '75a93c78cd2a09eff08c16c6fee2bf683f483027':
Fixed behavior for back key when viewing download.
75a93c78cd2a09eff08c16c6fee2bf683f483027 28-Sep-2012 Ruben Brunk <rubenbrunk@google.com> Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches
86a693077dbd255939fe0c30edf046acfbff7974 28-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> am 3e77e84c: Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches

* commit '3e77e84c66aa5ba2efab7ecc3dd37a03a790af9f':
Trimming: Use OnClickListener for saving
3e77e84c66aa5ba2efab7ecc3dd37a03a790af9f 28-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches
4450e439731d12638525c86a36cd26ac97bdc735 28-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> Trimming: Use OnClickListener for saving

bug:7093055

Change-Id: I4b6b408bb051aa1a7fb506f0b5d1db75fe3f1a2f
pp/TrimVideo.java
3235768b6bf413e56fb76b469a7699a1df0107dd 28-Sep-2012 Bobby Georgescu <georgescu@google.com> am c7e3c76d: Show a placeholder when the camera filmstrip is empty

* commit 'c7e3c76d6965f520a9651d309052c5f01726cd58':
Show a placeholder when the camera filmstrip is empty
c7e3c76d6965f520a9651d309052c5f01726cd58 28-Sep-2012 Bobby Georgescu <georgescu@google.com> Show a placeholder when the camera filmstrip is empty

Bug: 7213757
Tapping the placeholder takes the user back to the
full-screen camera capture mode.

Change-Id: I844f789b8e80f34e79f4a9c366c1c244bbf1f2a5
pp/PhotoPage.java
ata/ActionImage.java
ata/EmptyAlbumImage.java
ata/FilterEmptyPromptSet.java
ata/FilterSource.java
ata/MediaObject.java
ata/UnlockImage.java
i/PhotoView.java
bd1c876a885f14f489b612e90a1a8d94a5040732 28-Sep-2012 Mangesh Ghiware <mghiware@google.com> am 2e8472f3: Merge "Update to sharing panorama" into gb-ub-photos-arches

* commit '2e8472f304737acc3fbeb167b1b6f660f111f5c7':
Update to sharing panorama
2e8472f304737acc3fbeb167b1b6f660f111f5c7 28-Sep-2012 Mangesh Ghiware <mghiware@google.com> Merge "Update to sharing panorama" into gb-ub-photos-arches
5172dee697c05235ddf932827d75e6fa0b81d382 28-Sep-2012 Mangesh Ghiware <mghiware@google.com> Update to sharing panorama

Bug: 7150324

Use separate share intents for sharing panoarma and regular JPGs.

If photo is a 360 panorama, promote sharing it on the action bar,
and move sharing as JPG to overflow menu.

MIME type changed to specify panorama360.

Change-Id: I8d52733d105820ac17ff36a6ad9d7525893f6d27
pp/GalleryActionBar.java
pp/PhotoPage.java
i/ActionModeHandler.java
i/MenuExecutor.java
til/GalleryUtils.java
625a1ec63d3fa405d375fb74d6fb0544ae8b1b7f 28-Sep-2012 nicolasroard <nicolasroard@google.com> am 5a429e56: Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches

* commit '5a429e56ccf9b4ba2a0f5248b2e18d35122d6af6':
Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu.
5a429e56ccf9b4ba2a0f5248b2e18d35122d6af6 28-Sep-2012 nicolasroard <nicolasroard@google.com> Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches
9594c8d3e0dd0d6157710ceae1d1deea8e566db4 28-Sep-2012 nicolasroard <nicolasroard@google.com> Use an actionbar
- move the "show original" button to the bottom left
- move the history button to the overflow menu for now
- add a reset item in the overflow menu.

bug:7234317
bug:7233975
bug:7233986
Change-Id: Icc1d03d1e1ce18f38b1169b466be62645424bc7e
iltershow/FilterShowActivity.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSmallFilter.java
iltershow/imageshow/ImageVignette.java
8a7f0bd6c9897a8191bdefd26e4a67ab3a601548 28-Sep-2012 Bobby Georgescu <georgescu@google.com> am 624ed9df: Fix up button behavior in camera app

* commit '624ed9df710ac4e34f3ff1d0c3bf4acd1c056258':
Fix up button behavior in camera app
624ed9df710ac4e34f3ff1d0c3bf4acd1c056258 28-Sep-2012 Bobby Georgescu <georgescu@google.com> Fix up button behavior in camera app

Bug: 7233448
Change-Id: Ifb2833f6c1303dc60a9b88b217648d0c0098f242
pp/AlbumPage.java
56c1aed46be3c42a169f9da3545cb565b0732107 28-Sep-2012 nicolasroard <nicolasroard@google.com> am 863b4e65: We weren\'t applying the parameter on an existing filter

* commit '863b4e65d172a19111f46e43f97e7e41927a3bc7':
We weren't applying the parameter on an existing filter
863b4e65d172a19111f46e43f97e7e41927a3bc7 28-Sep-2012 nicolasroard <nicolasroard@google.com> We weren't applying the parameter on an existing filter

bug:7247494
Change-Id: I482eecc34a5f91bc7d2cc5986e79b832b9aa3ef2
iltershow/FilterShowActivity.java
d019ac64c24d03873ba5983193f3fb10163e625c 28-Sep-2012 nicolasroard <nicolasroard@google.com> am 9579b815: Only apply the parameter to the currently edited filter

* commit '9579b81504c16ac77aa7442767fbabe6abcfe24b':
Only apply the parameter to the currently edited filter
9579b81504c16ac77aa7442767fbabe6abcfe24b 28-Sep-2012 nicolasroard <nicolasroard@google.com> Only apply the parameter to the currently edited filter

bug:7247494
Change-Id: I88b90ee5ea1d5bb83342a4be392308ea756375a1
iltershow/FilterShowActivity.java
iltershow/filters/ImageFilter.java
iltershow/imageshow/ImageShow.java
iltershow/presets/ImagePreset.java
9ad74d1f01a322173d259fce1f90a59de39cc903 28-Sep-2012 John Reck <jreck@google.com> am 98d17b86: Merge "Fix Monkey NPE" into gb-ub-photos-arches

* commit '98d17b863a5c8dc194496422459e73d7d38a2b9e':
Fix Monkey NPE
98d17b863a5c8dc194496422459e73d7d38a2b9e 28-Sep-2012 John Reck <jreck@google.com> Merge "Fix Monkey NPE" into gb-ub-photos-arches
8d7ea82d99eef07925f47237abef4ee5844e59ed 28-Sep-2012 nicolasroard <nicolasroard@google.com> am 02f778af: Remove the pie slider, add a linear slider

* commit '02f778af1f8a2250d91da450f82c30572de96062':
Remove the pie slider, add a linear slider
02f778af1f8a2250d91da450f82c30572de96062 28-Sep-2012 nicolasroard <nicolasroard@google.com> Remove the pie slider, add a linear slider

bug:7247494

Change-Id: Id002b46d4a0ee0ff2a3ed9c4924defd0b1760b79
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSmallFilter.java
iltershow/ui/PieSlider.java
iltershow/ui/PieSliderListener.java
iltershow/ui/SliderController.java
iltershow/ui/SliderListener.java
53fe9f72433f2fdae30e1708c5933390202cbcf5 28-Sep-2012 John Reck <jreck@google.com> Fix Monkey NPE

Bug: 7243032

Change-Id: I0e8757e6108f2e86bf4608b1535b1c528f2f3197
pp/PhotoPage.java
cf5247ae5a105dfff156cb739619484c6e35b233 27-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> am 65f1bad3: Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches

* commit '65f1bad399eca7fe1e31808f2cb0ad3c9399901e':
Trimming: clean up the UI for trimming.
028ecd4e3bbd68c3b5b2fb91d3e7a666bc151765 27-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> Trimming: clean up the UI for trimming.

Get rid of the home button and use the done button only in the action bar.
Switch back to use system actionbar / activity.
Rename the ShortenExample.

bug:7093240

Change-Id: I61684e9723af12cecc212bbd911c23aab0258463
pp/ShortenExample.java
pp/TrimVideo.java
pp/TrimVideoUtils.java
b6f203d25b64e31062f0a3b040eeb5f5da464200 27-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> am 27e933b0: Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches

* commit '27e933b00279c177ae0d36b599aa1c90870922c1':
Trimming: switch to use sherlock action bar
27e933b00279c177ae0d36b599aa1c90870922c1 27-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches
30270915eb98894dd9ea1f613749ba0dd41fefe4 27-Sep-2012 Wu-cheng Li <wuchengli@google.com> am 743f8152: Several secure album changes.

* commit '743f8152a1dd6ea47bcabc6fd95b6e8d8f1cd3e5':
Several secure album changes.
743f8152a1dd6ea47bcabc6fd95b6e8d8f1cd3e5 27-Sep-2012 Wu-cheng Li <wuchengli@google.com> Several secure album changes.

- Make the lock screen photo be a standard portrait size photo
- In the filmstrip, have the first tap on the lock screen photo
take the user directly to the unlock screen.
- Switch the asset to be a "locked" lock rather than an
"unlocked" lock.

bug:7192331

Change-Id: If7541cd67cdfb711f8dd721796db3343ae91343a
ata/UnlockImage.java
i/PhotoView.java
8c60119e20aa43bda2ccc3dee0da6ea6498e9a53 27-Sep-2012 Owen Lin <owenlin@google.com> am 4419f551: Merge "Don\'t set treat back as up if there is no parent album." into gb-ub-photos-arches

* commit '4419f551b4ccb7457626dbb5a37c41afd71eb5ed':
Don't set treat back as up if there is no parent album.
4419f551b4ccb7457626dbb5a37c41afd71eb5ed 27-Sep-2012 Owen Lin <owenlin@google.com> Merge "Don't set treat back as up if there is no parent album." into gb-ub-photos-arches
f452f5d6e4750cecdc9d0483767bae4fc7da83f2 27-Sep-2012 Wu-cheng Li <wuchengli@google.com> am b904ecba: Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches

* commit 'b904ecba4fed5c6abd877a326acfbd0440887b62':
Show unlock image in secure album only when camera roll has items.
b904ecba4fed5c6abd877a326acfbd0440887b62 27-Sep-2012 Wu-cheng Li <wuchengli@google.com> Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches
990c072597b7836105a5ff4e7ec2483f8899b61e 27-Sep-2012 nicolasroard <nicolasroard@google.com> am e3f9f579: Load the correct library...

* commit 'e3f9f579d73af613a33ba1d0a93dc101ea671a69':
Load the correct library...
e3f9f579d73af613a33ba1d0a93dc101ea671a69 27-Sep-2012 nicolasroard <nicolasroard@google.com> Load the correct library...

bug:7165910
Change-Id: I4cb19078b00268f179722a1c8ed594e68b35e953
iltershow/FilterShowActivity.java
5e92668f42b5f29a0e55653b0bbf2df342723a6d 26-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> Trimming: switch to use sherlock action bar

Show a "done" instead of the icon according to the UX team.
And we don't have API level dependency.

bug:7093240

Change-Id: Ib331495dd233c4dcbeb3d587bd5a4d0d89039d49
pp/TrimVideo.java
i/MenuExecutor.java
d2fd71f89c6caf8e2dca4aeca1e1da1807a125ec 27-Sep-2012 John Reck <jreck@google.com> am 2ce4bec8: Only create debugTag if necessary

* commit '2ce4bec82fd46ff71ee4a586719904a6313689bf':
Only create debugTag if necessary
2c55a48ebbb94f1595fef943fea375290327b8c6 27-Sep-2012 John Reck <jreck@google.com> am 8fe22ecb: Don\'t requery a constant

* commit '8fe22ecb8e744a09a2e0d867f876ecbf74c82298':
Don't requery a constant
2ce4bec82fd46ff71ee4a586719904a6313689bf 27-Sep-2012 John Reck <jreck@google.com> Only create debugTag if necessary

Bug: 7238418
String concatenation isn't free

Change-Id: I510a89ef8b673efb631d6f8929ab3d9d9b454931
ata/ImageCacheRequest.java
8fe22ecb8e744a09a2e0d867f876ecbf74c82298 27-Sep-2012 John Reck <jreck@google.com> Don't requery a constant

Bug: 7238418

Change-Id: I1b7117cd30ffc51b51980830791779ec899c2f4b
pp/PhotoPage.java
0ccadcf4a32a5bcdd97efd81da2312d38d4707df 27-Sep-2012 nicolasroard <nicolasroard@google.com> am 0d7cdf8e: Initial import of the new image editor

* commit '0d7cdf8e763fb65c32bfad65245b3753deb75737':
Initial import of the new image editor
0d7cdf8e763fb65c32bfad65245b3753deb75737 25-Sep-2012 nicolasroard <nicolasroard@google.com> Initial import of the new image editor

bug:7165910
Change-Id: I756d6594f5bddd233772c979410362ca22e232a3
iltershow/FilterShowActivity.java
iltershow/HistoryAdapter.java
iltershow/cache/BitmapCache.java
iltershow/cache/Cache.java
iltershow/cache/DelayedPresetCache.java
iltershow/cache/DirectPresetCache.java
iltershow/cache/ImageLoader.java
iltershow/filters/ImageFilter.java
iltershow/filters/ImageFilterBW.java
iltershow/filters/ImageFilterBWBlue.java
iltershow/filters/ImageFilterBWGreen.java
iltershow/filters/ImageFilterBWRed.java
iltershow/filters/ImageFilterBorder.java
iltershow/filters/ImageFilterCurves.java
iltershow/filters/ImageFilterGradient.java
iltershow/filters/ImageFilterSaturated.java
iltershow/filters/ImageFilterStraighten.java
iltershow/filters/ImageFilterVignette.java
iltershow/imageshow/ImageBorder.java
iltershow/imageshow/ImageShow.java
iltershow/imageshow/ImageSmallFilter.java
iltershow/imageshow/ImageStraighten.java
iltershow/imageshow/ImageVignette.java
iltershow/presets/ImagePreset.java
iltershow/presets/ImagePresetBW.java
iltershow/presets/ImagePresetBWBlue.java
iltershow/presets/ImagePresetBWGreen.java
iltershow/presets/ImagePresetBWRed.java
iltershow/presets/ImagePresetOld.java
iltershow/presets/ImagePresetSaturated.java
iltershow/presets/ImagePresetXProcessing.java
iltershow/tools/SaveCopyTask.java
iltershow/ui/ControlPoint.java
iltershow/ui/ImageButtonTitle.java
iltershow/ui/ImageCurves.java
iltershow/ui/PieSlider.java
iltershow/ui/PieSliderListener.java
iltershow/ui/Spline.java
bc0d5b1fc519e22375c5bef6113a4741427ca241 27-Sep-2012 Bobby Georgescu <georgescu@google.com> am 833f775a: Fix behavior of up button in Camera app

* commit '833f775afc9515567dc5aaf0cafe20e006e77545':
Fix behavior of up button in Camera app
833f775afc9515567dc5aaf0cafe20e006e77545 26-Sep-2012 Bobby Georgescu <georgescu@google.com> Fix behavior of up button in Camera app

Bug: 7233448
- Up button now goes to gallery root when appropriate.

Change-Id: Ib474335b2ac4139e7c5a213bda3efa481b24f224
pp/AlbumPage.java
pp/PhotoPage.java
til/GalleryUtils.java
def1872dc0facaee5ef85c1bec7ce21a3f5185a6 26-Sep-2012 John Reck <jreck@google.com> am 726cbd1a: Merge "Avoid unnecessary allocation" into gb-ub-photos-arches

* commit '726cbd1af44cf7b0f795c4f0639b9b358be960c1':
Avoid unnecessary allocation
726cbd1af44cf7b0f795c4f0639b9b358be960c1 26-Sep-2012 John Reck <jreck@google.com> Merge "Avoid unnecessary allocation" into gb-ub-photos-arches
a9b37429cf4caf22a9b4a2b140f0cc8764e4e0fa 26-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> am eb90d7e2: Merge "Trimming: switch to use selectors." into gb-ub-photos-arches

* commit 'eb90d7e21a4814a920de5c7d6e5f662d7f0e6865':
Trimming: switch to use selectors.
eb90d7e21a4814a920de5c7d6e5f662d7f0e6865 26-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> Merge "Trimming: switch to use selectors." into gb-ub-photos-arches
9f59a5fa0302f80cd5bd540e864de091fb5703df 25-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> Trimming: switch to use selectors.

Switch into using 2 selectors for the starting and end point of triming.
Shift the bar up a bit to accommandate the selectors.
bug:7093240

Change-Id: If3b6fe285cd69756ecbfe1d52efd90b499150c72
pp/TimeBar.java
pp/TrimTimeBar.java
ddf0225a5192a589fc578945f56440b09bf74d12 26-Sep-2012 John Reck <jreck@google.com> Avoid unnecessary allocation

Bug: 7238418

Change-Id: Ic0a1ef0368368526401a53f02f680ef9d42ea310
pp/PhotoPage.java
a04d66ec1561825577b89ca2fa886ba99117002c 20-Sep-2012 Ruben Brunk <rubenbrunk@google.com> Fixed behavior for back key when viewing download.

Bug: 7205463
Bug: 7164238
Bug: 7175040

When viewing an image via the download notification from browser,
changed the default behavior of the back key to take the user to
the downloads folder.

Change-Id: Ia842bfa0f23c3b0ba767e3f0447add2c9b2cc6a7
ata/UriSource.java
432eb115e7395af525ec02a83c3caff0b0ed92d9 19-Sep-2012 Owen Lin <owenlin@google.com> Don't set treat back as up if there is no parent album.

Change-Id: I2ecadd8ace0f8d3e5ed38710a776e7c114f24274
fix: 7180467
pp/Gallery.java
41153708c1ecf5a1fe1c85093748d1b79e6c6d2b 26-Sep-2012 Bobby Georgescu <georgescu@google.com> am 3fd76400: Fix display of clustering items in album set page

* commit '3fd764008a73dd76be87b02f42d0e00786015c8a':
Fix display of clustering items in album set page
3fd764008a73dd76be87b02f42d0e00786015c8a 26-Sep-2012 Bobby Georgescu <georgescu@google.com> Fix display of clustering items in album set page

Bug: 7217602
There was an incorrect assumption that onCreateActionBar
would always be called before onResume.

Change-Id: Id50c2dc3fd8167958501e12c66d11ac82a86349b
pp/AlbumSetPage.java
cc2f059ce62cbb04a605e6adda6f4b278210cd1a 26-Sep-2012 Wu-cheng Li <wuchengli@google.com> Show unlock image in secure album only when camera roll has items.

bug:7192331

Change-Id: I8e0a9ea87181c2256632a4dc802cc0668fac1e0e
ata/SecureAlbum.java
eef77bc56d79695a99d0690bfdb8049eaeb87d84 25-Sep-2012 Doris Liu <tianliu@google.com> am e5bb9ff0: Merge "Making switchState public" into gb-ub-photos-arches

* commit 'e5bb9ff0a5c2a02aa1ba441f62dec6a4e197d0d3':
Making switchState public
e5bb9ff0a5c2a02aa1ba441f62dec6a4e197d0d3 25-Sep-2012 Doris Liu <tianliu@google.com> Merge "Making switchState public" into gb-ub-photos-arches
726d29f915ab0a128fecf32c20e6fbd1de7b71ee 25-Sep-2012 Bobby Georgescu <georgescu@google.com> am 00ccf35f: Grid/filmstrip switching behavior improvements

* commit '00ccf35f8ec016b2cb8fdcf0c65ba643dca54a14':
Grid/filmstrip switching behavior improvements
00ccf35f8ec016b2cb8fdcf0c65ba643dca54a14 20-Sep-2012 Bobby Georgescu <georgescu@google.com> Grid/filmstrip switching behavior improvements

Bug: 7200453
Bug: 7196483
Bug: 7222179
Bug: 7224619

Changes:
- Launch camera in capture even if paused in grid/filmstrip
- Fixed behavior of filmstrip button after launching grid
from camera
- Refresh bar timeouts after swiping a photo
- Partially swiping from camera to filmstrip without lifting
finger and then swiping back no longer results in unwanted
switch to filmstrip
- Removed hacky solution to switching to filmstrip mode

Change-Id: I5cdde927e6a27a03b99a7f4883c5601bc281f4c8
pp/AlbumPage.java
pp/PhotoPage.java
pp/TransitionStore.java
i/PhotoView.java
9c6615ed2e55349e69861fd390099c59378741e1 25-Sep-2012 Wu-cheng Li <wuchengli@google.com> am 7c79f6ca: Merge "Add an unlock image in the end of secure album." into gb-ub-photos-arches

* commit '7c79f6cab19e60d887a42b03fb123bb0358141b5':
Add an unlock image in the end of secure album.
8868aa1b2d199e7fa869c9c5fad3079175621002 24-Sep-2012 Wu-cheng Li <wuchengli@google.com> Add an unlock image in the end of secure album.

When camera is started from secure lock screen, put placeholder
"proto-photo" at the end of the camera roll. When it is clicked,
it takes the user to the lock screen.

bug:7192331

Change-Id: Ia444d3bb8a88ba69bba4c47cb9783a60a6986c34
pp/PhotoPage.java
ata/MediaObject.java
ata/SecureAlbum.java
ata/SecureSource.java
ata/UnlockImage.java
9c8506d7b7fde6e2fcb93912f0210f48a41fbdb7 24-Sep-2012 Bobby Georgescu <georgescu@google.com> am e06c9f10: Restore missing "Group by" option in camera roll grid view

* commit 'e06c9f109f06813ca1f8a0abb549d51aefd4973d':
Restore missing "Group by" option in camera roll grid view
e06c9f109f06813ca1f8a0abb549d51aefd4973d 24-Sep-2012 Bobby Georgescu <georgescu@google.com> Restore missing "Group by" option in camera roll grid view

Bug: 7217410
Change-Id: I1488f02919a8702be2eb41696f627f9e3d94ce88
pp/PhotoPage.java
de1a390c3d9d6e74c0469fd60eeaed6d601b75a0 24-Sep-2012 Bobby Georgescu <georgescu@google.com> am 3eb2e643: Fix occasional crash when restoring photo page state

* commit '3eb2e643a40d1be77998373343cdf8b14764f58c':
Fix occasional crash when restoring photo page state
3eb2e643a40d1be77998373343cdf8b14764f58c 24-Sep-2012 Bobby Georgescu <georgescu@google.com> Fix occasional crash when restoring photo page state

Bug: 7216012
If the saved state being used to restore the photo page
includes an out-of-bounds index, ignore it and reset the
index to 0.

Change-Id: I1b8aa82cbc553297189abb57bd274d7eb53f61e0
pp/PhotoPage.java
fd020e657d18528ab47b7650d6e109f16e5317a2 24-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> am 15ff1b1c: The trimming solution with the mp4parser library.

* commit '15ff1b1ca52bea348b8a490b5b5abe53fa43eaf2':
The trimming solution with the mp4parser library.
15ff1b1ca52bea348b8a490b5b5abe53fa43eaf2 24-Sep-2012 Teng-Hui Zhu <ztenghui@google.com> The trimming solution with the mp4parser library.

bug:7093055

Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff
pp/PhotoPage.java
pp/ShortenExample.java
pp/TrimVideo.java
0d1d54052b2905ea68fc7d79f4dbfd40f610fcb5 24-Sep-2012 Mangesh Ghiware <mghiware@google.com> am 4f32d514: Use vendor specific MIME type for sharing LightCycle panoramas

* commit '4f32d514ee7474d867d04bf3934f9e11e9e92783':
Use vendor specific MIME type for sharing LightCycle panoramas
4f32d514ee7474d867d04bf3934f9e11e9e92783 24-Sep-2012 Mangesh Ghiware <mghiware@google.com> Use vendor specific MIME type for sharing LightCycle panoramas

Bug: 7150324
Change-Id: I78d426672e9a8fc69f0b9b564438e40eb0230719
pp/PhotoPage.java
ata/LocalImage.java
ata/MediaObject.java
ata/UriImage.java
i/ActionModeHandler.java
i/MenuExecutor.java
9b8a4277b5c0e8b29cab51834c6a8bf4147576ba 22-Sep-2012 Doris Liu <tianliu@google.com> Making switchState public

Bug: 7208910

switchState was only accessible within package com.android.gallery3d.app . Now
changing it to public so that it can be called from camera. This is part 1 of 2
in fixing the bug. Not sure if it's the best way to fix it. Comments are welcome.

Change-Id: I4aac46f640f2dd3aa973abd9610a37fa2842ed29
pp/StateManager.java
16635c683408a9644b8aa3916f55c74702e90aa4 21-Sep-2012 Bobby Georgescu <georgescu@google.com> am 9b270f4f: Snap a photo to the center after fling ends in filmstrip

* commit '9b270f4f2e20fb0f0455529c2e20990173a75470':
Snap a photo to the center after fling ends in filmstrip
9b270f4f2e20fb0f0455529c2e20990173a75470 21-Sep-2012 Bobby Georgescu <georgescu@google.com> Snap a photo to the center after fling ends in filmstrip

Bug: 7050303
Change-Id: I7770d5642b376a1b888f34c5806f2291b64ecf68
i/PositionController.java
d62ab871d5e32140bc36a2fe4cb47588dff1fa52 21-Sep-2012 Wu-cheng Li <wuchengli@google.com> am 23e595f0: Support secure image capture mode.

* commit '23e595f0c656ebaeb63f78e3018b5830628c5afe':
Support secure image capture mode.
5d1a63eac8e719f20b76b79bef99e2bce84180c9 21-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am 2f4c73d9: Merge from AOSP

* commit '2f4c73d9995158522bd18db125232838afd099e8':
Fine-tune SDK versions
Progressbar: correct the first updated value for progressbar
23e595f0c656ebaeb63f78e3018b5830628c5afe 21-Sep-2012 Wu-cheng Li <wuchengli@google.com> Support secure image capture mode.

bug:7141738

Change-Id: I4ea010609d16da469998ebb40ad8282b9468de25
pp/CropImage.java
pp/PhotoPage.java
7d3f604287805c6f00adb4e69e1c26488acf3487 20-Sep-2012 Wu-cheng Li <wuchengli@google.com> Merge "Hide grid view menu item in secure album." into gb-ub-photos-arches
fc3651d38708c6475b808b6fad27ee66bdd6ee04 20-Sep-2012 Wu-cheng Li <wuchengli@google.com> Hide grid view menu item in secure album.

bug:7200451
Change-Id: I23b6fbc48aac46e9b25b159416bc9f64a357d038
pp/PhotoPage.java
133c49e9bda0b3dcc005a0dfc7ab999926c0ef7f 19-Sep-2012 Earl Ou <shunhsingou@google.com> Fix metadata of cropped image for details display.

+ drop the old thumbnail of the cropped image
+ update DateTime tag in EXIF
+ add EXIF Software tag
+ display DATE_MODIFIED in details instead of DATE_TAKEN

Bug:7192433
Change-Id: I89dcb29dd3242f58fe96cd25398217e94f42fc97
pp/CropImage.java
ata/LocalImage.java
ata/LocalMediaItem.java
xif/ExifData.java
xif/ExifTag.java
c6c63414293c31bdc4c10ebb5e8f232306d136ec 20-Sep-2012 Hung-ying Tyan <tyanh@google.com> Merge "Simplify the usage of ExifData" into gb-ub-photos-arches
f44499dda32783cc74643723ed01ce636e81b186 18-Sep-2012 Bobby Georgescu <georgescu@google.com> Add bottom bar UI for photo page

Bug: 7050303
Bug: 7170148
Pulled the handling of the display of the edit (FX) button
out into a separate file and put in the groundwork for
supporting multiple buttons within a container along the
bottom of the screen and managing their display as well as
animating them in and out. Also added a button for launching
the panorama viewer when appropriate

Change-Id: Iee3083e0693ef3c1f55264b922f02b9a702d2103
pp/PhotoPage.java
pp/PhotoPageBottomControls.java
56bdcb7272f222fde5e4c6fc133cb490b31c7667 20-Sep-2012 Bobby Georgescu <georgescu@google.com> Make ActionBar always present in filmstrip

Bug: 7196718
Change-Id: Id297f28402da20efd99a9f90376a18f041fe8448
pp/PhotoPage.java
i/PhotoView.java
89591324c5d1097e59217177ad3ea74598867584 30-Aug-2012 Earl Ou <shunhsingou@google.com> Simplify the usage of ExifData

Bug:7192363

Change-Id: I2c6ab9974f4472f63483a4de814728584944535e
pp/CropImage.java
xif/ExifData.java
xif/ExifOutputStream.java
xif/ExifParser.java
xif/ExifTag.java
xif/IfdData.java
577f939faa74e6189152bc016666d79dc647de4a 19-Sep-2012 Pin Ting <pinting@google.com> Merge "Use 565 pixel format for pre-JB; use 888 otherwise." into gb-ub-photos-arches
2e1771b997ab6966411b2c612562c538ae3e325d 19-Sep-2012 Pin Ting <pinting@google.com> Use 565 pixel format for pre-JB; use 888 otherwise.

Bug:7189512
Change-Id: Iec5d528fef4f4fc589370339add299a40fc8f26e
i/GLRootView.java
i/GalleryEGLConfigChooser.java
f8a39c644637a15b9291eb9299762b8cf91cd76a 18-Sep-2012 George Mount <mount@google.com> Add UriImage support for viewing LightCycle panoramas.

Change-Id: I7f61cef39370fd23b9481708dc3c902c17873074
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/SinglePhotoDataAdapter.java
ata/LocalImage.java
ata/MediaItem.java
ata/UriImage.java
17ac550d1c73ce89a6fa7f68c5b02fc44e6030b3 18-Sep-2012 Bobby Georgescu <georgescu@google.com> Merge "Fix incorrect texture size causing artifacts in animation" into gb-ub-photos-arches
7077701c8b11f6022cc712f5450e0f7b29535e41 18-Sep-2012 Bobby Georgescu <georgescu@google.com> Fix incorrect texture size causing artifacts in animation

Bug: 7181383
Change-Id: I3895b89ccdd03e55acc656f0d6944f4a9d398ad5
pp/AlbumPage.java
pp/AlbumSetPage.java
i/PreparePageFadeoutTexture.java
58f898c9cc0228f084d903b5d27ae609cedfc9b9 17-Sep-2012 Wu-cheng Li <wuchengli@google.com> Do not show edit button in secure album.

bug:7183052
Change-Id: I94ca6703e5c3a0e2af552be2065be361210185b2
pp/PhotoPage.java
e508d0198377d6fe56650814f137a30285367d44 18-Sep-2012 Bobby Georgescu <georgescu@google.com> Merge "Fix bugs relating to grid/filmstrip switching" into gb-ub-photos-arches
83380c9f6b75603633bbec2efa1034d4de489e7b 17-Sep-2012 Bobby Georgescu <georgescu@google.com> Don't switch back to fullscreen camera when flinging

Bug: 7145903
Bug: 7050303
It was very annoying to users to fling in the filmstrip
and end up in the fullscreen camera mode, so disabling
that. Long-term, we want to be smarter about this and
do the zoom to the full-screen if it's a short swipe
rather than a fling.

Change-Id: I40ac4848a267c06fc41e161a7a292b8f03b2ef4c
i/PhotoView.java
a9b52df63ae6edbe0f2158bfc3c701fde41782c1 17-Sep-2012 Bobby Georgescu <georgescu@google.com> Fix bugs relating to grid/filmstrip switching

Bug: 7180582
Bug: 7146147
Change-Id: I3d2ad8866a938f9f162e14f11bc2e021834ba513
pp/AlbumPage.java
pp/PhotoPage.java
ata/FilterDeleteSet.java
d4553b1337cf6729ee3bc572b9cb3841145db7dd 17-Sep-2012 Bobby Georgescu <georgescu@google.com> Reskin: do not show edit (FX) button in filmstrip mode

Bug: 7050303
Change-Id: Ibab686bc8581e8cc24a722950ff3b8b77023edd4
pp/PhotoPage.java
8cfc7f0ce4bed1538b85b40fe08a5528cac8c270 17-Sep-2012 Bobby Georgescu <georgescu@google.com> Fix build breakage

Change-Id: I88f1a9f2f1306d959d6a5398faa2c6f50cb24501
pp/AlbumSetPage.java
d208e12012152bf757c0492cd3bfc91f101294cc 14-Sep-2012 Bobby Georgescu <georgescu@google.com> Show large button to open the camera when gallery is empty

Bug: 7156303
Change-Id: I0447c3eaee680e80f09cc3aff714aace85ee77d9
pp/AlbumSetPage.java
0b0283daab224412f9b3f7d04294ddea83d8f582 14-Sep-2012 Bobby Georgescu <georgescu@google.com> Merge "Only show FX button for photos" into gb-ub-photos-arches
e18ad87571a6a9f0e1943f9c527c8d908494256e 14-Sep-2012 Bobby Georgescu <georgescu@google.com> Merge "Show animation when opening albums directly in filmstrip" into gb-ub-photos-arches
2873cd146c22734371c1ee458131d56616f25e6a 14-Sep-2012 Owen Lin <owenlin@google.com> Merge "Cancel the loading task when clicking on back in Cropping." into gb-ub-photos-arches
14ad4efd409887a0f4cd90e29818c8c3bd2ece8f 14-Sep-2012 Bobby Georgescu <georgescu@google.com> Only show FX button for photos

Bug: 7165294
Change-Id: Ia35f5981cba5a69f94964a9c38361b01ea1cdbfd
pp/PhotoPage.java
6b64c0670429a41b1fabb36e679a36b7e6fa9194 14-Sep-2012 Bobby Georgescu <georgescu@google.com> Show animation when opening albums directly in filmstrip

Bug: 7166947
Change-Id: Id67e93431365043673e08b400aea5df9ae53f14c
pp/AlbumSetPage.java
51bc561e85053abfd7fda695e3cd20710acca85c 14-Sep-2012 Bobby Georgescu <georgescu@google.com> Animate correctly when opening single-photo album

Bug: 7164177
Change-Id: I5ce60a8e842e3ddf0e356568f17ee488edef23cd
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/PhotoPage.java
i/PreparePageFadeoutTexture.java
i/SlotView.java
222c07220dbe5b1be959437eb315ae72a0c8aa50 13-Sep-2012 Owen Lin <owenlin@google.com> Cancel the loading task when clicking on back in Cropping.

bug: 5636363
Change-Id: I0e00b6119c4d184328002d1b2128e33ababc798b
pp/CropImage.java
b265ebb01cc046b74329eeb28dbecb24e0f953d2 13-Sep-2012 Bobby Georgescu <georgescu@google.com> When tapping single-photo albums, launch photo directly

Bug: 7145102
Change-Id: I75c66f2f37fc11f3846fdbd40083787ba38af207
pp/AlbumSetPage.java
pp/PhotoPage.java
d397378f8a1a2a1107e258155448b02599fdc2ce 12-Sep-2012 Bobby Georgescu <georgescu@google.com> Reskin: Fix stability bugs introduced by reskin

Bug: 7150348
Bug: 7144206
Bug: 7050303

If PhotoPage is launched/resumed on a completely empty
album (for instance, if Gallery was opened to the Camera
folder and paused, all photos were deleted via the Camera
app, and then Gallery is resumed), bail out of PhotoPage
since it cannot handle this. Also fixes an NPE.

Change-Id: I162ff5ad149c322704c8af7d4705d87ae6c6098a
pp/AlbumPage.java
pp/PhotoPage.java
b5c28dec15896a8f75c47aed932b66ec11e01425 12-Sep-2012 Bobby Georgescu <georgescu@google.com> Merge "Reskin: fix bug introduce by Gallery reskin" into gb-ub-photos-arches
a9948ef755f665f1327ef80760df3858f1030454 12-Sep-2012 Bobby Georgescu <georgescu@google.com> Launch next-gen editor if present and show FX button

Bug: 7050303
Shows editor button on the photo page and launches the
next-gen photo editor if it is present on the device.

Change-Id: I4058cffaec3fc4b446bd90dbecb809681d3255ea
pp/PhotoPage.java
ata/FilterDeleteSet.java
9159cccd5d7e840b04c2507bfe29c76e046a4f6f 11-Sep-2012 Bobby Georgescu <georgescu@google.com> Reskin: fix bug introduce by Gallery reskin

Bug: 7146147
Bug: 7050303
Change-Id: Ia9782868937cc9a03e4c8b5f77033d13d80d5d8a
pp/AlbumPage.java
9e2feb16dac75187c71789435c6003b5f194ddd2 11-Sep-2012 Bobby Georgescu <georgescu@google.com> Merge "Reskin: stop at first photo after swipe from camera" into gb-ub-photos-arches
dc10b30ba0366126ed1ad5133b36e97d76335049 11-Sep-2012 Bobby Georgescu <georgescu@google.com> Reskin: stop at first photo after swipe from camera

Bug: 6399763
Bug: 7050303
Change-Id: I433bead637416f3c6e47fdc7567bb5de7575c01c
i/PhotoView.java
3f1f1baf3a674927e25cd5cd885fb372796bd3a0 24-Aug-2012 Teng-Hui Zhu <ztenghui@google.com> Add the UI elements for video trim activity.

1. Refactored the classes to support both the video play and trim.

Now the common code for controller overlay is in CommonControllerOverlay,
which is basically the same as the original MovieControllerOverlay without
animation. Because in trimming, we don't want to hide all the controller.
The specific animations are implemented in the sub-classes which are
TrimControllerOverlay and MovieControllerOverlay.

At the same time, TrimTimeBar extended TimeBar to support the extra
trimming start scrubber and end scrubber.

The interface between the timebar and the controllerOverlay are kept almost
the same way, except adding the trimming info when necessary.

With all these, the activity of TrimVideo now relied on the TrimTimeBar
and TrimControllerOverlay. Similarily, the MovieActivity relied on the TimeBar
and MovieControllerOverlay.

2. Hook the TrimVideo activity with the trim menu.

Note that the icons are temporary for now, still need UX input on that.

bug:7093055

Change-Id: Ib9bfbc090106744a569fce4c451ddffc0a2c699b
pp/CommonControllerOverlay.java
pp/ControllerOverlay.java
pp/MovieControllerOverlay.java
pp/MoviePlayer.java
pp/PhotoPage.java
pp/TimeBar.java
pp/TrimControllerOverlay.java
pp/TrimTimeBar.java
pp/TrimVideo.java
i/MenuExecutor.java
e9494164bd7dd1c55c99b3ae1e842b88bf6abd78 06-Sep-2012 Chih-Chung Chang <chihchung@google.com> Do not accept fling gesture after we changed from/to filmstrip mode.

Change-Id: Ifb3d692bcf621ff02c6d4e6d91ba8484d702f905
i/PhotoView.java
df6a98a8a7ff8cbbb0fc633ec855c66d4e306fbb 11-Sep-2012 Owen Lin <owenlin@google.com> Merge "Don't start filmstrip mode in Get Content mode." into gb-ub-photos-arches
676d4762496eddae66930c6f8b0bae22a22b3ef6 04-Sep-2012 Owen Lin <owenlin@google.com> Ensure peekObject is called in the syncrhonization block.

bug: 7019598
Change-Id: If153287078826afc9827ea64364b4fb64f2b3a5f
pp/AlbumDataLoader.java
pp/AlbumSetDataLoader.java
pp/PhotoDataAdapter.java
ata/ClusterAlbumSet.java
ata/DataManager.java
ata/LocalAlbum.java
ata/MediaSource.java
ata/MtpDevice.java
ata/Path.java
d9473d49b311306196327cc3083696911e857df3 11-Sep-2012 Owen Lin <owenlin@google.com> Merge "Remove the space before colons in details." into gb-ub-photos-arches
10d8759b5b4d0cf0351bce929eb7b6420aabbfd9 11-Sep-2012 Owen Lin <owenlin@google.com> Don't start filmstrip mode in Get Content mode.

Change-Id: Ib04f5c134d44b2d8e80e7fdecf2503e950487837
fix: 7135936
pp/AlbumSetPage.java
8b092bce0716e5f53d53dc9f9be2e7c9978d685c 11-Sep-2012 Bobby Georgescu <georgescu@google.com> Merge "Improvements to empty album behavior in Gallery" into gb-ub-photos-arches
09995299480b797254873319caffd5408624988b 10-Sep-2012 Bobby Georgescu <georgescu@google.com> Improvements to empty album behavior in Gallery

Bug: 7131332
Bug: 7009464
Toasts are now immediately dismissed if a non-empty album
is selected, and dismissed once Picasa Albums load at an
otherwise empty gallery root. The alert added in a previous
prompt has been replaced with a Toast also.

Change-Id: Icca79ab264b94979eedcf78e5c3899af745d8813
pp/AlbumPage.java
pp/AlbumSetPage.java
a9144c8942f68d4a68de63103f590d0f55a95dd4 11-Sep-2012 Doris Liu <tianliu@google.com> More logging added for monkey crash

The crash is difficult to repro. So I'm adding more logging here to help figure out what caused the crash next time it happens.

Bug: 6495745
Change-Id: Ib6a47f45e0508bc5def61fdc9f4e4a488b48ad92
ata/MediaObject.java
7108c4078436488ede37608c62a6b953b51db835 10-Sep-2012 George Mount <mount@google.com> Remove VIEW activity from LightCycle.

Bug 7133257

Change-Id: I4b3c968ceaa01d9461a788553f23bf7694ac4b3c
pp/PhotoPage.java
a535522fa7661771351e42465c67ed70825ed2e4 07-Sep-2012 George Mount <mount@google.com> Show play icon for panorama.

Bug 7124494

Change-Id: I17fdb5d6bcab1f3997a1ab92fcf45e0309b394b3
pp/PhotoDataAdapter.java
pp/SinglePhotoDataAdapter.java
ata/LocalImage.java
ata/LocalVideo.java
ata/MediaItem.java
i/PhotoView.java
3e654aabf9af7a5396faa7fbea11bc7076db1c3e 10-Sep-2012 Doris Liu <tianliu@google.com> Merge "Back button should progress through the app" into gb-ub-photos-arches
bef18c1e167f5835c8f854e76a91da63b700f93b 10-Sep-2012 Wu-cheng Li <wuchengli@google.com> Do not allow panorama viewer in secure album.

bug:7053266
Change-Id: I5195638e03e5eb32d47b50b7b568a40cd8a222d9
pp/PhotoPage.java
23e1cc8d20971a03db2bbbe8b012fabcb40c6431 10-Sep-2012 Wu-cheng Li <wuchengli@google.com> Fix build error in old version of java.

Change-Id: I2f88846a10afd696d7dd94ddeee767c3d89d5ccf
pp/TransitionStore.java
c6781c0c0d8d193863ca09455a5bda3d542db493 10-Sep-2012 Bobby Georgescu <georgescu@google.com> Fix import statement breaking build

Change-Id: I0d2acb3ece6ed2aea04033f911a69b266b6cc7de
pp/PhotoPage.java
7eea4d3ac59aa88d327fc0d58f5e4052f43c54c9 07-Sep-2012 Bobby Georgescu <georgescu@google.com> Reskin: switching between filmstrip and grid in album

Bug: 7050303
Bug: 6541425
Allows switching between the filmstrip and the grid views
within albums and launches camera roll in filmstrip mode
by default. Also fixes animation issue when animating from
full-screen to grid view.

Change-Id: I2a37b92c129cc090fd807973f7e3e82fed207cd3
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/PhotoPage.java
pp/TransitionStore.java
ata/LocalAlbum.java
ata/LocalMergeAlbum.java
ata/MediaSet.java
i/PhotoView.java
til/MediaSetUtils.java
aeb4cccdc14c2b3199658a1d109a1fd89a53a288 07-Sep-2012 Doris Liu <tianliu@google.com> Back button should progress through the app

When Gallery is launched via notification, back button should progress through the app before return to Home

Bug: 6925612
Change-Id: I9da2120c6f607f8b6d3fa57d8a70225bc66fb8ef
pp/Gallery.java
4badebb6c36f6dc5ae1af74d78acd1e7f2e251c9 07-Sep-2012 George Mount <mount@google.com> Merge "Use XmpUtil to detect panorama instead of caption." into gb-ub-photos-arches
f10ed2d3355f808304e33cb145d0c232a787d03a 07-Sep-2012 George Mount <mount@google.com> Use XmpUtil to detect panorama instead of caption.

Bug 7124493

Change-Id: I7a21206b47aea701428132d8500fa0873cb3c91a
ata/LocalImage.java
88e08dcfe74274646383a237b6306877ef74bf1f 05-Sep-2012 Wu-cheng Li <wuchengli@google.com> Update media items when a picture is deleted in secure album.

Query the database and only show the media items that
still exist.

bug:7053266

Change-Id: Ic8c1b8c514e59741436bca14e918ef100eaf14f8
ata/SecureAlbum.java
f6ed8a0f048ac3a17664bd2d0899542a5bf1be54 06-Sep-2012 Hung-ying Tyan <tyanh@google.com> Merge "Fix some typos and style in ExifTag" into gb-ub-photos-arches
580daa127d39eb539e6c7911d3a2329a9cfe30db 06-Sep-2012 Hung-ying Tyan <tyanh@google.com> Merge "Rearrange the constants in ExifTag" into gb-ub-photos-arches
a01ddb85bf1fbca2ea9a2bc200853ba0c8a252f3 05-Sep-2012 Earl Ou <shunhsingou@google.com> Fix some typos and style in ExifTag

Change-Id: I2f8a8f0e529d6db9132ac57e09e86fcc18aba842
xif/ExifTag.java
2486ee3787f4fa8aeec4983559101f0000cd92b0 30-Aug-2012 Earl Ou <shunhsingou@google.com> Rearrange the constants in ExifTag

Change-Id: I62ab6e52869dfa5b3fee7993bd109f4c5eed91a9
pp/CropImage.java
xif/ExifData.java
xif/ExifOutputStream.java
xif/ExifParser.java
xif/ExifTag.java
cda9315a4b3fb0228cbcd3e9a18d8c90f0a8a3e0 06-Sep-2012 Doris Liu <tianliu@google.com> Fix tap to focus, back button to camera on Manta

Changed the move threshold from a hard coded value to be proportional to the size of the view.

Bug: 7080033
Bug: 7066859
Change-Id: Id7b81fb3da1783951886d43fe9a3df35186af985
i/PhotoView.java
581f8fc2f7b9453cb91ba0eacd3412f8c99a6e38 06-Sep-2012 George Mount <mount@google.com> Merge "Change lightcycle call to be in Gallery's package" into gb-ub-photos-arches
2e6c1901f6d83d448686950722b6fac064282780 05-Sep-2012 George Mount <mount@google.com> Change lightcycle call to be in Gallery's package

Bug 7076869

Change-Id: I315b660d8a7cd84db6d06f0aa38275c7f5e4b4a6
pp/PackagesMonitor.java
d496898ad9554554655ff4fa39d509ea21be9178 05-Sep-2012 Bobby Georgescu <georgescu@google.com> Merge "Increase threshold for logging texture size warnings" into gb-ub-photos-arches
4f59a411667f1c75c1b3ea2ad0ec07e82defa5d1 04-Sep-2012 Angus Kong <shkong@google.com> Move LightCycle checking to the closed source.

bug:7076779
Change-Id: Ieebe0343a46257ca07f06483beb9391a90d7727a
pp/PackagesMonitor.java
pp/PhotoPage.java
ata/LocalImage.java
02ec00b91039736d478c6e59ba90d5bbcd1a8044 05-Sep-2012 Owen Lin <owenlin@google.com> Remove the space before colons in details.

bug: 6587084
Change-Id: Ifdbe24e84fb55c1892edb5652455274fc3775291
i/DialogDetailsView.java
6b41f11759977c4d34755627858192b7e9cd33c7 04-Sep-2012 Bobby Georgescu <georgescu@google.com> Increase threshold for logging texture size warnings

Bug: 7094140
Change-Id: I0dc56dc92db6821527ceb71e49c3e83d818340c2
i/BasicTexture.java
5cbe945e294fff334a71b55a994c948da997cb2a 04-Sep-2012 Owen Lin <owenlin@google.com> Merge "Make a time jump when user clicks outsides the scrubber." into gb-ub-photos-arches
ac0d63e802aae7732f5efa840af41016fc26f728 04-Sep-2012 Owen Lin <owenlin@google.com> Merge "Set inMutable to true if we may reuse the bitmap." into gb-ub-photos-arches
bcca048557ff3637b7d1cce2893cfc095111ebdd 04-Sep-2012 Owen Lin <owenlin@google.com> Make a time jump when user clicks outsides the scrubber.

bug: 7080593
Change-Id: I913aee6e416c10d68403d7f9d4102d4dcc41e1d4
pp/TimeBar.java
a625b6562d3bfc86465778b336c96fb42064be21 04-Sep-2012 Owen Lin <owenlin@google.com> Set inMutable to true if we may reuse the bitmap.

bug: 7092330
Change-Id: I0def7e2e9ce57d09ba7f5e001b33cc605a6af44c
ata/DecodeUtils.java
ecb4052503ad1c37c796699d3aec6a1e749f25f1 04-Sep-2012 Hung-ying Tyan <tyanh@google.com> Fix NPE in CropImage.changeExifImageSizeTag().

Bug: 7099850
Change-Id: Ib7b3b7d9fddaf53853bcc98b9588dfadda0aee6f
pp/CropImage.java
38e7740b7c363a993390f53a70a6e5c0536825e8 03-Sep-2012 Owen Lin <owenlin@google.com> Merge "Fix NPE when deleting a photo in Clustering mode." into gb-ub-photos-arches
331de49c4624e49b903bfd0b7da69e1dc5e446f4 03-Sep-2012 Hung-ying Tyan <tyanh@google.com> Merge "Handle other header tag in ExifParser before APP1" into gb-ub-photos-arches
512b025a04796ef057afdf780f21039068ba74d4 03-Sep-2012 Hung-ying Tyan <tyanh@google.com> Merge "Handle mis-ordered APP segment in ExifOutputStream" into gb-ub-photos-arches
e4ffc8ea9320109a30f377324d5d109d5615293b 03-Sep-2012 Hung-ying Tyan <tyanh@google.com> Merge "Remove the parameter of getAllExifTags() in IfdData" into gb-ub-photos-arches
49c8a24d7492d0de939d1f3d351586a5e3678e1e 03-Sep-2012 Hung-ying Tyan <tyanh@google.com> Merge "Fix some typos and style in previous CL" into gb-ub-photos-arches
993d5f7c4c39c66647a248ffa623f4e60b76ff36 03-Sep-2012 Hung-ying Tyan <tyanh@google.com> Merge "Save EXIF info to cropped picasa image with the new EXIF lib." into gb-ub-photos-arches
4cec566b34655e76b90f8ca089f151e6f42ede0c 31-Aug-2012 Earl Ou <shunhsingou@google.com> Handle other header tag in ExifParser before APP1

Change-Id: I44398e3ed054de441810b795daff8d1edb06df59
xif/ExifOutputStream.java
xif/ExifParser.java
xif/JpegHeader.java
b6cb8121aa89d06d1fc397d443d22224b634da88 31-Aug-2012 Earl Ou <shunhsingou@google.com> Handle mis-ordered APP segment in ExifOutputStream

Change-Id: Ic5ce13d17658e24d1ae42009d3ab30ae538cee10
xif/ExifOutputStream.java
efd480e85dc5bd0d2ca0ac82d03e141212388830 30-Aug-2012 Wu-cheng Li <wuchengli@google.com> Use FLAG_SHOW_WHEN_LOCKED for secure album.

The activity needs this flag to be on top of the lock screen
when the camera is started from the secure lock screen.

bug:5955016

Change-Id: If554a3f7fef4c03a981c83afe22b8c4980b954d1
pp/ActivityState.java
pp/PhotoPage.java
pp/SlideshowPage.java
9bc2a5c83de59a3131bfeb31dad45df2b47715ab 31-Aug-2012 Earl Ou <shunhsingou@google.com> Remove the parameter of getAllExifTags() in IfdData

Change-Id: Iec7f04a9866c53caa2d66d5ea6f679460980b378
xif/ExifOutputStream.java
xif/IfdData.java
e48c0f96ee3f9654c3538664dd59485927fb44d6 31-Aug-2012 Earl Ou <shunhsingou@google.com> Fix some typos and style in previous CL

Change-Id: If78c0bfebccb20b0c4dad42a11b5dd0946b4e172
xif/ExifData.java
xif/ExifOutputStream.java
xif/OrderedDataOutputStream.java
3b8bd33be5041d77855f756fbba1993294cffac4 29-Aug-2012 Earl Ou <shunhsingou@google.com> Save EXIF info to cropped picasa image with the new EXIF lib.

Bug:5248023
Change-Id: I35f401826f4fa586e9899e3ca5f5f9b9ab39b28e
pp/CropImage.java
xif/ExifData.java
xif/ExifTag.java
5babc396c3d3692445387864c4ea1740f6d92b06 29-Aug-2012 Earl Ou <shunhsingou@google.com> Add prefix to GPS tag in ExifTag

Change-Id: Ib07d2847ddcbed3b06d07afa2a6d5851c27760b1
xif/ExifTag.java
5f18b4c19b0d854475bb8cb611fd7c23a3f7a1c5 29-Aug-2012 Earl Ou <shunhsingou@google.com> Re-save Exif info for cropped local image

Bug:5248023

Change-Id: I744330f28b887bff4d12937e06f8d20db153ac7e
pp/CropImage.java
940819044b7d780f1dd7109d6dbdc365b3c08c14 30-Aug-2012 Owen Lin <owenlin@android.com> Merge "ExifOutputStream" into gb-ub-photos-arches
28cb4161da5fc3756933ca67d509b8af1c6275f1 29-Aug-2012 Owen Lin <owenlin@google.com> Remove unused resources and fix some warnings.

Change-Id: I075977150c7da7650e723e29406f24ae2e23ea97
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/CropImage.java
pp/ManageCachePage.java
pp/MoviePlayer.java
pp/PhotoPage.java
ata/LocalAlbumSet.java
ata/MtpDevice.java
ata/MtpImage.java
ata/SizeClustering.java
ata/UriSource.java
i/MenuExecutor.java
i/Paper.java
i/PhotoView.java
i/PositionController.java
til/GalleryUtils.java
b9e41109f413768d6f8bb5ec7c14ca31fbc0c098 30-Aug-2012 Owen Lin <owenlin@google.com> Fix NPE when deleting a photo in Clustering mode.

bug: 7075760
Change-Id: I64b278b8c9436ada23738f28510736dcf7e18755
ata/MediaSet.java
e786d3cb1521db74a1c48cae52b8b55b1cee0292 30-Aug-2012 Hung-ying Tyan <tyanh@google.com> Merge "Add equals() function in ExifData, IfdData, and ExifTag" into gb-ub-photos-arches
9e15920a6a152a1e93e457cdaf6cd14758007be4 30-Aug-2012 Hung-ying Tyan <tyanh@google.com> Merge "Redesign the set function of ExifTag" into gb-ub-photos-arches
4f529e7cada294befb66a1fc9b72b1aa164597df 28-Aug-2012 Earl Ou <shunhsingou@google.com> ExifOutputStream

Change-Id: I9f2de77e87a502ccdadba0b18658621028c538c9
xif/ExifData.java
xif/ExifOutputStream.java
xif/OrderedDataOutputStream.java
xif/Util.java
cde6ac521216801e835df1c20b68dd21d4fd04a4 28-Aug-2012 Earl Ou <shunhsingou@google.com> Add equals() function in ExifData, IfdData, and ExifTag

Change-Id: I96c5767354548d0f0d7571fd1d8812e1ab54a5c4
xif/ExifData.java
xif/ExifTag.java
xif/IfdData.java
xif/Rational.java
xif/Util.java
5df339d5ef4550ceb12070f5e17335df2c4fff62 29-Aug-2012 Earl Ou <shunhsingou@google.com> Redesign the set function of ExifTag

Change-Id: Iaf5632d759fe14c167cba54099b99719b31e3431
xif/ExifParser.java
xif/ExifTag.java
39f8f0bf9ebbcc580948f022649dd0d1f29656a3 30-Aug-2012 Owen Lin <owenlin@google.com> Merge "Fix OOM in TileImageView." into gb-ub-photos-arches
352e514333afed64d2914e16e9f91dfffa8f7bd7 30-Aug-2012 Bobby Georgescu <georgescu@google.com> Merge "Reskin: Correctly position rotated thumbs in album listing" into gb-ub-photos-arches
39765b30b48c4530e11642a05a582ddf3ad27992 28-Aug-2012 Bobby Georgescu <georgescu@google.com> Reskin: Correctly position rotated thumbs in album listing

Bug: 7067732
Bug: 7050303
Changing the slots to be non-square surfaced a small math
error, and also raised the question of where exactly to
render the texture. The solution that makes the most sense
given the current design is to fit the thumbnail (which is
always square in our case) in the largest square that fits
inside the slot, and aligned to the top.

Change-Id: I98d94ad9255399aa4f1e5c403ff81811674bb264
i/AbstractSlotRenderer.java
83be4e0c9b8e3372eff8f9b1a396afd961b72921 24-Aug-2012 Angus Kong <shkong@google.com> Invoke LightCycle viewer for panoramas.

1. Add SUPPORT_PANORAMA_VIEW to supported operations.
2. Add helper methods in LightCycleHelper:
a. checks if the image file is a panorama.
b. invokes the panorama view activity.

bug:6912297
Change-Id: I7909e49632cad02a795943a113bca6aec17df9dd
pp/PhotoPage.java
ata/LocalImage.java
ata/MediaObject.java
b048b26bdcd533a7f52558bd25201d74df7c591e 29-Aug-2012 Hung-ying Tyan <tyanh@google.com> Merge "Fix pinch out gesture for film strip mode on gingerbread." into gb-ub-photos-arches
5b7c8cd73344b76c8f77764317d477d2b9a49884 29-Aug-2012 Owen Lin <owenlin@google.com> Fix OOM in TileImageView.

The problem is we keep too many decoded images in the upload queue.
Those images will be free after it getting uploaded.

However, there is a bug which suspend the uploading sometimes.

Change-Id: Id97c04eba974cc77e5d8c50588b0cbef776f79da
fix: 6995091
i/TextureUploader.java
i/TileImageView.java
baef14a1aafdd7a173b90f022ed3c9272fb9f359 29-Aug-2012 Owen Lin <owenlin@google.com> Merge "Fix NPE in viewing single image." into gb-ub-photos-arches
4d47b3472cccf84e8c71d8fb389a79bc83b321ee 29-Aug-2012 Hung-ying Tyan <tyanh@google.com> Fix pinch out gesture for film strip mode on gingerbread.

On crespo running Android 2.3.6, a pinch out gesture results in the following
call sequence: onDown(), onUp() and then onSingleTapUp(). The correct sequence
for a single-tap-up gesture should be: onDown(), onSingleTapUp() and onUp().
The call sequence for a pinch out gesture in JB is: onDown() and then onUp().
Base on these observations, a condition is added in onSingleTapUp() to filter
out the false alarm where onSingleTapUp() is called within a pinch out gesture.

Bug: 7023717
Change-Id: I010b87f95c3197a299a7d907ce32e93a1d5e958f
i/PhotoView.java
b0f84ee364784ffb64bb58df675a8042cbb49a6d 28-Aug-2012 Earl Ou <shunhsingou@google.com> Save the offset of next IFD in the IfdData

Change-Id: I2c5d2ad390d970603a7a9ce2145029d871098fdb
xif/IfdData.java
7973bc292dcacaa5e68eecaff533d19b5cffc1e8 28-Aug-2012 Earl Ou <shunhsingou@google.com> Save ByteOrder in the ExifData

This is useful for decoding undefined data.

Change-Id: Ied6864c4d3a8e05ca47215bf5358bd4196f2d3a0
xif/ExifData.java
xif/ExifParser.java
xif/ExifReader.java
24081fe26ca25448ddb9c8f9cc7f406d26344dec 28-Aug-2012 Owen Lin <owenlin@google.com> Fix NPE in viewing single image.

bug: 7052228
Change-Id: Iaca5ed062cd3c8233f212551cf4312f0828f12dc
pp/GalleryActionBar.java
pp/PhotoPage.java
766941ee72831a2c76defb4d826cab24d918e0df 27-Aug-2012 Bobby Georgescu <georgescu@google.com> Reskin: Launch photos in lights-out mode

Bug: 7050303
- Launch photos in lights out mode when opening from album
- One last missing call to super.onCreate added in
ManageCachePage

Change-Id: I7ad0e64f30748b724d184791e0e0a6a030850049
pp/AlbumPage.java
pp/ManageCachePage.java
pp/PhotoPage.java
3fa6947fc3909020f3a37cc1fd9a9b9d4d9f93e8 27-Aug-2012 Owen Lin <owenlin@google.com> Fix some UI bugs in using SherlockActionBar.

- Use sherlock's verion of requestWindowFeature.
- Use sherlock's theme in Custom selection list.

bug: 6927267
Change-Id: I706e45378b10e6e088e048d97fcaca57fb4bf3f4
pp/CropImage.java
pp/Gallery.java
pp/MovieActivity.java
pp/PickerActivity.java
i/PopupList.java
898a2f4540635528a0916b0a6b0a177869854ae9 26-Aug-2012 Wu-cheng Li <wuchengli@google.com> Disable action bar home button and menu items in secure album.

All menu items are disabled except delete.

bug:5955016

Change-Id: Ibf947b0c50b0591a774d298fbfbe692c9a88575d
pp/PhotoPage.java
50ea2d2938218ac6b2039f0e42998cfbbc45d1f1 24-Aug-2012 Teng-Hui Zhu <ztenghui@google.com> add the menu button to support trimming

This is only visible for video item.

Change-Id: I17f8e902f3560cc8524f890705c020901331df74
pp/PhotoPage.java
ata/LocalVideo.java
ata/MediaObject.java
i/MenuExecutor.java
45c56f2d34c71d0bc9b84ebeef6d1314738d0fc0 27-Aug-2012 Bobby Georgescu <georgescu@google.com> Reskin: tweaks to colors and spacings to match mocks

Bug: 7050303

- Call super.onCreate in ActivityState subclasses in
order to correctly initialize background colors,
correcting oversight in previous change
- Tweak background and label colors to match mocks
- Tweak grid spacings to match mocks

Change-Id: Iba5cba6c60e8a750d8e50c1d0c14c916754a95c2
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/PhotoPage.java
pp/SlideshowPage.java
90432185dfabecad9b805b1f166cc58147c9be73 27-Aug-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add secure album support for lock screen camera." into gb-ub-photos-arches
a0ce682e40c39ce046c48d8a7f989fff01bb9f2c 22-Aug-2012 Wu-cheng Li <wuchengli@google.com> Add secure album support for lock screen camera.

Secure album only shows the media items added by
the camera.

bug:5955016

Change-Id: Id26abec4dfcc036cf9de682398fed25eed73d1a5
pp/AppBridge.java
pp/PhotoPage.java
ata/ChangeNotifier.java
ata/DataManager.java
ata/LocalAlbumSet.java
ata/SecureAlbum.java
ata/SecureSource.java
d2ddb74b4731fc51fe6942bb4da7b2c38a2a1577 27-Aug-2012 Angus Kong <shkong@google.com> Merge "Add LightCycle helper class." into gb-ub-photos-arches
b0c2d70af79673fed3fda13657f92bccec35da19 26-Aug-2012 Angus Kong <shkong@google.com> Add LightCycle helper class.

LightCycleHelper also receives event of package changes to get updated.

bug:6912297
Change-Id: Ib822ee778537b64986389bf8eeec36f61c9289f2
pp/PackagesMonitor.java
541e25df9f933d58d4678f58519558473db5a333 25-Aug-2012 Bobby Georgescu <georgescu@google.com> Reskin: show placeholder color before album label is ready

Bug: 7050303
Change-Id: I679ecf6360f2ae3bfe19fc0677998ac8b1589bcf
i/AlbumSetSlotRenderer.java
02ef48574ef7099ebaa0386bd6fd676bd2fd5489 25-Aug-2012 Bobby Georgescu <georgescu@google.com> Make transition from album page to photo page even smoother

Bug: 6979922
Bug: 7050303
Change-Id: Iaa2582125f0706a34317fa90fea73749cd2cf995
pp/AlbumPage.java
pp/PhotoPage.java
i/PositionController.java
5992daf6f4cb56742cbf33a014c5c2c142c6957e 23-Aug-2012 Bobby Georgescu <georgescu@google.com> Offer to launch camera when Gallery completely empty

Bug: 7009464
Rather than showing a blank screen, alerts the user that
the gallery is empty and offers to launch the camera, if
the device has one.

Change-Id: I0bf71f1cbe7c96a4dc063b5d38b9a282538234c9
pp/AlbumSetPage.java
30bf426bdecfe355fcc3a10b8102649c9c70b37b 27-Aug-2012 Owen Lin <owenlin@google.com> Merge "Uses ActionBarSherlock in Gallery" into gb-ub-photos-arches
b21b8e58a604f6c701245d84b141b5b87663192b 23-Aug-2012 Owen Lin <owenlin@google.com> Uses ActionBarSherlock in Gallery

bug: 6927267

Change-Id: I1c22975d1a1f3a36510ad93e6a0cefea110ca38f
ctionbar/ActionBarInterface.java
ctionbar/ActionBarUtils.java
ctionbar/ActionModeInterface.java
ctionbar/MenuHolder.java
ctionbar/SimpleActionBar.java
ctionbar/SimpleActionBarView.java
ctionbar/SimpleActionMode.java
ctionbar/SimpleMenu.java
ctionbar/SimpleMenuInflater.java
ctionbar/SystemActionBarWrapper.java
ctionbar/SystemActionModeWrapper.java
pp/AbstractGalleryActivity.java
pp/ActivityState.java
pp/AlbumDataLoader.java
pp/AlbumPage.java
pp/AlbumSetDataLoader.java
pp/AlbumSetPage.java
pp/CropImage.java
pp/FilterUtils.java
pp/GalleryActionBar.java
pp/GalleryActivity.java
pp/MovieActivity.java
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/PickerActivity.java
pp/SinglePhotoDataAdapter.java
pp/StateManager.java
i/ActionModeHandler.java
i/AlbumSetSlidingWindow.java
i/AlbumSetSlotRenderer.java
i/AlbumSlidingWindow.java
i/AlbumSlotRenderer.java
i/CacheStorageUsageInfo.java
i/CropView.java
i/DetailsAddressResolver.java
i/DetailsHelper.java
i/DialogDetailsView.java
i/ImportCompleteListener.java
i/ManageCacheDrawer.java
i/MenuExecutor.java
i/PhotoView.java
i/SelectionManager.java
i/SlotView.java
f6513f51e9c8cc307164305215e4122bf93fb08d 27-Aug-2012 Hung-ying Tyan <tyanh@google.com> Merge "Read thumbnail into ExifData" into gb-ub-photos-arches
d83a3749f50a8b493a12dfc96aaa0da2f9a6d08b 16-Aug-2012 Earl Ou <shunhsingou@google.com> Read thumbnail into ExifData

Change-Id: Iccc0fbbda1734795ff431075bade700ca5076a08
xif/ExifData.java
xif/ExifReader.java
915c2c5b2c367df71599370613af0924bd7c4887 23-Aug-2012 Bobby Georgescu <georgescu@google.com> Ongoing reskin of Gallery app

Bug: 7050303
Moved the majority of color settings from hardcoded to
colors.xml in order to allow rapid iteration with UX input.
Started changing some colors and layouts to reflect latest
UX mocks.

Change-Id: I300338e9f75c71f3ed3f36140d16e893387f3184
pp/ActivityState.java
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/Config.java
pp/ManageCachePage.java
pp/PhotoPage.java
pp/SlideshowPage.java
i/AlbumLabelMaker.java
i/AlbumSetSlotRenderer.java
i/AlbumSlotRenderer.java
i/BitmapScreenNail.java
i/GLCanvas.java
i/GLCanvasImpl.java
i/ManageCacheDrawer.java
i/PhotoView.java
i/SlotView.java
til/GalleryUtils.java
1e16dd6bdaa2ef99539f60e051a816f4ce9f3a3f 24-Aug-2012 Hung-ying Tyan <tyanh@google.com> Merge "Rename TiffInputStream to CountedDataInputStream" into gb-ub-photos-arches
66e64517f9b2b18485f4436aecac54f1998f2823 24-Aug-2012 Hung-ying Tyan <tyanh@google.com> Merge "Re-design ExifParser for some strange Exif header" into gb-ub-photos-arches
bdbf57f29db2c98dd2e0d05cd062c063fe90cd54 15-Aug-2012 Earl Ou <shunhsingou@google.com> Rename TiffInputStream to CountedDataInputStream

Change-Id: Ie52ab9a58ae47f5a0b9113c6006844b73567d864
xif/CountedDataInputStream.java
xif/ExifParser.java
xif/TiffInputStream.java
4ae9b211fee74f801f003bc9ad716e214de1a4f0 14-Aug-2012 Earl Ou <shunhsingou@google.com> Re-design ExifParser for some strange Exif header

The previous design failed to parser file with strange IFD position.
Therefore we need a new design.

Change-Id: I9f008a9259df6ef7d9a5022e126d6f25069e3d00
xif/ExifData.java
xif/ExifParser.java
xif/ExifReader.java
xif/ExifTag.java
xif/IfdData.java
xif/IfdId.java
xif/IfdParser.java
xif/Rational.java
97fd6fa6b87350a609d717c56ade783135a81616 24-Aug-2012 Owen Lin <owenlin@android.com> Merge "Use GalleryUtils.getSelectionModePrompt instead of duplicated code." into gb-ub-photos-arches
8a861a02136d15b45b9dbdc80e4f3bcc9de057c8 24-Aug-2012 Owen Lin <owenlin@google.com> Revert "Revert "Uses ActionBarSherlock library in MovieActivity.""

This reverts commit 13da281769d4558c42d86a54536ff6da6826b0ac.
pp/MovieActivity.java
13da281769d4558c42d86a54536ff6da6826b0ac 24-Aug-2012 Owen Lin <owenlin@google.com> Revert "Uses ActionBarSherlock library in MovieActivity."

This reverts commit 89b437722a24d0c7d6e2acffc30c215f22814234.
pp/MovieActivity.java
89b437722a24d0c7d6e2acffc30c215f22814234 22-Aug-2012 Owen Lin <owenlin@google.com> Uses ActionBarSherlock library in MovieActivity.

bug: 6927267

Change-Id: I4b63e41be5cff22af0f7d830739c719e91cd6fff
pp/MovieActivity.java
4e88a8c2a2addfadb05ca9699f505a3f348f3692 23-Aug-2012 Bobby Georgescu <georgescu@google.com> Fix NPE, ANRs in Gallery

Bug: 7041482
Bug: 7041769
Change-Id: I06596bd9a058a8fe51c19108a0891c458950f22b
pp/AlbumPage.java
i/PreparePageFadeoutTexture.java
c760a5c49774c90b97ae818c6ee4e14825361b4b 23-Aug-2012 Bobby Georgescu <georgescu@google.com> Fix ANRs in Gallery

Bug: 7041769
Change-Id: Idc2a266bffd0d2c641fba69cfede13e1e83f276b
i/PreparePageFadeoutTexture.java
9a93949a6ab6348b1a600496a7d52267620aab95 22-Aug-2012 Ahbong Chang <cwahbong@google.com> Use GalleryUtils.getSelectionModePrompt instead of duplicated code.

Change-Id: I1cdffb8b8d87f25f91382c3602f12c327ec11849
pp/AlbumSetPage.java
20f54bd2a66eb4e1fdf78abe9ba514395d2bcd83 22-Aug-2012 Yuli Huang <yuli@google.com> Merge "Dismiss dialog in onPause() where we still have the window." into gb-ub-photos-arches
3b3de069bc6c3b533844f010d8a4877416db2942 21-Aug-2012 Bobby Georgescu <georgescu@google.com> Merge "Improvements in animation from album page to photo page" into gb-ub-photos-arches
f4a707f9716874025b189d0e4ca4dfad0d7abbab 21-Aug-2012 Bobby Georgescu <georgescu@google.com> Improvements in animation from album page to photo page

Bug: 6631829
Bug: 6979922
Change-Id: I99fd330f3ec8bf363f8602a2f893167ca2a9c71b
pp/AlbumPage.java
pp/PhotoPage.java
i/BitmapScreenNail.java
i/PositionController.java
i/PreparePageFadeoutTexture.java
447577d618a474bca15c50706da7f8fd853d726a 21-Aug-2012 Yuli Huang <yuli@google.com> Dismiss dialog in onPause() where we still have the window.

bug:6561957
Change-Id: I652c4ec1dd64c650c29f3e4e36ae1200da691694
pp/CropImage.java
a7f90298629bc6549ffd60adadd387f6caee8c59 21-Aug-2012 Hung-ying Tyan <tyanh@google.com> Move ThreadPool to gallerycommon for picasasync and picasastore.

Bug: 7005321
Change-Id: I7ae4bafed141be03bca74772a261c7c2fb3036c4
til/Future.java
til/FutureListener.java
til/PriorityThreadFactory.java
til/ThreadPool.java
dbb6acc204ba6f095eb0e49e1298e9ceda2c3096 19-Aug-2012 Wu-cheng Li <wuchengli@google.com> Rotate the camera screen nail correctly in gingerbread.

In gingerbread, camera screen nail is a static image.
Handle its rotation like a bitmap screen nail.

bug:6927809

Change-Id: I554483e58fc9e32399acb20f426d7ec35631b7ac
pp/AppBridge.java
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/SinglePhotoDataAdapter.java
i/PhotoView.java
14d3289b4867c21da93ec4032119c0091bc78c30 16-Aug-2012 George Mount <mount@google.com> Clear activity result when launching from lock screen.

Bug 6710029
When the screen is locked during video play, the activity result
from that play will be triggered immediately when unlocking to
camera. The result must be destroyed on unlock so that the resume
goes to the camera rather than to the video display.

Change-Id: Ifa6f00fa1cba119d5fc6e762d1757bd6aac576f4
pp/ActivityState.java
pp/PhotoPage.java
pp/StateManager.java
bbe8bd33beb1ee7a01a55cca74624b36a7d25074 17-Aug-2012 Owen Lin <owenlin@google.com> Fix NPE when view a single photo.

bug: 6995776
Change-Id: Iba213dfefcab04f2c856f55dc3446e3314f30a6f
ctionbar/SystemActionBarWrapper.java
17a27b9733ef4cfe047deebbabaa4ab64ede2a71 08-May-2012 Wu, Hao <hao.wu@intel.com> Progressbar: correct the first updated value for progressbar

This patch corrects the first updated value from 0 to 1. After
execute first operation, then need to update Progress to 1, not
0.

Change-Id: Ie3ae6bea79b3e50e727723d75de84b1797aaf382
Author: Wu, Hao <hao.wu@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 34729
i/MenuExecutor.java
91055408e94f0a7517971f52290c52f2a75ed52a 16-Aug-2012 Owen Lin <owenlin@google.com> Load AsyncTask class in UI thread.

bug: 7005321

Change-Id: I4f8806553aee34fb2ebeaef010c14c88679a7f72
pp/GalleryAppImpl.java
a1627e5b586d6e3cfbd0578fd483af6967fcf388 16-Aug-2012 Owen Lin <owenlin@google.com> Merge "Fix some bugs introduced by the ActionBarWrapper." into gb-ub-photos-arches
0cc65b3bd5e4fc1c54fda93d3dab171adcca30a6 16-Aug-2012 Owen Lin <owenlin@google.com> Fix some bugs introduced by the ActionBarWrapper.

bug: 6927267

Change-Id: If05082a4fec25f93d38c6096ebacc5a82e7e7c2e
ctionbar/SystemActionBarWrapper.java
ctionbar/SystemActionModeWrapper.java
i/ActionModeHandler.java
til/Holder.java
4cf1aefb45fcb7eb7395cdb59aaf462c43f60905 16-Aug-2012 Ahbong Chang <cwahbong@google.com> Check if actionbar exists at ActionBarUtils.getActionBar().

Bug: 6927267
Change-Id: I85645f25879ced48a85a2bef4f55f1c34b8806ec
ctionbar/ActionBarUtils.java
1adebb6237ef1f14643971218dac6bd87196bf37 15-Aug-2012 Owen Lin <owenlin@google.com> Merge "Add SimpleMenuXXX implementation for the Gingerbread platform." into gb-ub-photos-arches
f1d63437353326b3d59c20361959a6e4d7450e57 15-Aug-2012 Owen Lin <owenlin@google.com> Merge "Extract the action bar interface." into gb-ub-photos-arches
d84941f0649c751c0cc5fd2f6b233380e878ca26 17-Jul-2012 Owen Lin <owenlin@google.com> Add SimpleMenuXXX implementation for the Gingerbread platform.

1. Add a SimpleMenuInflator to parse the res/menu/xxx.xml files.
2. Add minimal code to show the menu.

**NOTE**
This change is going to be replaced by the ActionBar compat library
when it gets ready and integrated. The purpose of this change is making
Gallery/Camera run on GB.

Change-Id: Ia7d402c82a6da1b9558ebbd103e161d2471b34dd
ctionbar/ActionBarUtils.java
ctionbar/SimpleActionBar.java
ctionbar/SimpleActionBarView.java
ctionbar/SimpleActionMode.java
ctionbar/SimpleMenu.java
ctionbar/SimpleMenuInflater.java
ctionbar/SystemActionModeWrapper.java
pp/ActivityState.java
i/PopupList.java
2bb717f1ea38e2ce33dd102a23afe6bfacb5675c 13-Jul-2012 Owen Lin <owenlin@google.com> Extract the action bar interface.

So that we can use different implementation for different API levels.

**NOTE**
This change is going to be replaced by the ActionBar compat library
when it gets ready. The purpose of this change is making Gallery/Camera
run on GB.

bug: 6927267

Change-Id: Ic8bb2518918168ea889db6452d6760de390d96b2
ctionbar/ActionBarInterface.java
ctionbar/ActionBarUtils.java
ctionbar/ActionModeInterface.java
ctionbar/MenuHolder.java
ctionbar/SystemActionBarWrapper.java
ctionbar/SystemActionModeWrapper.java
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/CropImage.java
pp/GalleryActionBar.java
pp/MovieActivity.java
pp/PhotoPage.java
i/ActionModeHandler.java
i/MenuExecutor.java
til/HelpUtils.java
d959ed2336fceacf3a983f178494dd539f12068f 15-Aug-2012 Owen Lin <owenlin@android.com> Merge "A simple ExifReader and its test" into gb-ub-photos-arches
321e7c477a66df696b92d1617a33f6bafab7886d 09-Aug-2012 Earl Ou <shunhsingou@google.com> A simple ExifReader and its test

Change-Id: I1a30d24591bbdab288e04e3705ece388b533f247
xif/ExifData.java
xif/ExifReader.java
xif/IfdData.java
3c6116e67c18e10fdc9186f4c0191690f217ef11 14-Aug-2012 Bobby Georgescu <georgescu@google.com> Merge "Gallery reskin: album list spacing, action bar theme" into gb-ub-photos-arches
f0c89374bfc008fb79ac3cb91cfd6d565d203041 13-Aug-2012 Bobby Georgescu <georgescu@google.com> Gallery reskin: album list spacing, action bar theme

Change-Id: Ic556f22bd25c57ddd0b659a7f43a7a1afbdcb8df
pp/AlbumSetPage.java
pp/Config.java
cac6ef162e2cd25df1bbd03c4930fd8110b31724 14-Aug-2012 Wu-cheng Li <wuchengli@google.com> Merge "Make a copy of MotionEvent in MotionEventHelper.transform." into gb-ub-photos-arches
5b60e00145ba8dd5086723c98a5d6c4c3188d3d1 14-Aug-2012 Owen Lin <owenlin@google.com> Merge "Extract EXIF info only for JPEG files" into gb-ub-photos-arches
e24cc7208a6d3760a87dfd4b80a7a6683fe146eb 13-Aug-2012 Bobby Georgescu <georgescu@google.com> Show album counts in Gallery & other small reskin fixes

Bug: 6975144
Change-Id: I2f12c6482cc009aecbca3e26482ebd8944f01bb8
pp/Config.java
i/AlbumLabelMaker.java
i/AlbumSetSlotRenderer.java
37ba3d7b5953decbb7cc21f74cd61ceed12b199a 13-Aug-2012 Wu-cheng Li <wuchengli@google.com> Make a copy of MotionEvent in MotionEventHelper.transform.

RotateLayout transforms the event in dispatchTouchEvent.
If the event is not handled, the parent of RotateLayout
may send the transformed event to other views and the
coordinates will be wrong. Make a copy of MotionEvent in
transform. This also makes the behavior consistent in
different API levels.

bug:6974916
Change-Id: Id835767cc9be3f244e5abe2b855e5188045adedc
til/MotionEventHelper.java
bc8808a30e524e943b28b484d974b52769694e37 09-Aug-2012 Owen Lin <owenlin@google.com> Extract EXIF info only for JPEG files

bug: 6489840
Change-Id: I0ad682bffa5374d0d61ebaa502cc8b90e469b4c8
ata/LocalImage.java
ata/LocalMediaItem.java
i/PopupList.java
42a68a6f524bbd206b68eda650cc45d7e2a509af 10-Aug-2012 Bobby Georgescu <georgescu@google.com> Merge "First gallery reskin iteration." into gb-ub-photos-arches
112a8beb812397c9cfbc49e218d7864fc7c23e91 10-Aug-2012 Wu-cheng Li <wuchengli@google.com> Merge "Guard android.media.effect.Effect with TargetApi." into gb-ub-photos-arches
c9388fe7c9c5cc68ee121927c19f73db524c6662 10-Aug-2012 Wu-cheng Li <wuchengli@google.com> Merge "Guard SurfaceTextureScreenNail with TargetApi." into gb-ub-photos-arches
9eff62295434aef142037c969863a248140da0d4 10-Aug-2012 Owen Lin <owenlin@android.com> Merge "Fix ExifParser bug when APP0 exists in Jpeg file" into gb-ub-photos-arches
13722d8f4dc6d0b0f868f73885f5f1c1298590cc 10-Aug-2012 Owen Lin <owenlin@android.com> Merge "Handle error when string length=0 in IfdParser" into gb-ub-photos-arches
a9fb0f51165bf1ba8287f4abaf5319efaf2cae84 10-Aug-2012 Wu-cheng Li <wuchengli@google.com> Guard SurfaceTextureScreenNail with TargetApi.

bug:6927809
Change-Id: If03ffbcbf908a960f00bba97be0cdbf317ecabe8
i/SurfaceTextureScreenNail.java
8731f48d35a9039b49e11b5f5ac33f8ae27ec399 10-Aug-2012 Wu-cheng Li <wuchengli@google.com> Guard android.media.effect.Effect with TargetApi.

bug:6927717
Change-Id: I25f881ab449ea4cb26a41c5219884d93725a1693
hotoeditor/filters/AutoFixFilter.java
hotoeditor/filters/ColorTemperatureFilter.java
hotoeditor/filters/CropFilter.java
hotoeditor/filters/CrossProcessFilter.java
hotoeditor/filters/DocumentaryFilter.java
hotoeditor/filters/DoodleFilter.java
hotoeditor/filters/DuotoneFilter.java
hotoeditor/filters/FaceTanFilter.java
hotoeditor/filters/FaceliftFilter.java
hotoeditor/filters/FillLightFilter.java
hotoeditor/filters/Filter.java
hotoeditor/filters/FisheyeFilter.java
hotoeditor/filters/FlipFilter.java
hotoeditor/filters/GrainFilter.java
hotoeditor/filters/GrayscaleFilter.java
hotoeditor/filters/HighlightFilter.java
hotoeditor/filters/LomoishFilter.java
hotoeditor/filters/NegativeFilter.java
hotoeditor/filters/PosterizeFilter.java
hotoeditor/filters/RedEyeFilter.java
hotoeditor/filters/RotateFilter.java
hotoeditor/filters/SaturationFilter.java
hotoeditor/filters/SepiaFilter.java
hotoeditor/filters/ShadowFilter.java
hotoeditor/filters/SharpenFilter.java
hotoeditor/filters/StraightenFilter.java
hotoeditor/filters/TintFilter.java
hotoeditor/filters/VignetteFilter.java
c90a116a7fd65d41e8258dc7b9a14218649697e6 09-Aug-2012 Bobby Georgescu <georgescu@google.com> First gallery reskin iteration.

Change-Id: I2b79ca9f40346a777141562c9a4762d7a8b460f6
pp/PhotoPage.java
pp/SlideshowPage.java
i/AlbumLabelMaker.java
i/AlbumSetSlotRenderer.java
i/AlbumSlotRenderer.java
i/GLCanvas.java
i/GLCanvasImpl.java
95591d2a17036cbc610a9ab586d5e66b8036edd0 09-Aug-2012 Bobby Georgescu <georgescu@google.com> Merge "Hold WakeLock during MTP import" into gb-ub-photos-arches
38155c4f4dd6f0173337eb9f3fea54803192e229 08-Aug-2012 Owen Lin <owenlin@google.com> Rotate the texture in building PhotoFallbackEffect

bug: 6525127
Change-Id: Iba348450b62190a1a2149cf0d7f20f19625cb6cf
i/PhotoView.java
23ea2b53d9625471774dd219c36701b656c64616 07-Aug-2012 Earl Ou <shunhsingou@google.com> Fix ExifParser bug when APP0 exists in Jpeg file

Change-Id: If5843757e00bc12bc50003eef3d78b9c3cedf69e
xif/ExifParser.java
0ee84c4254d16b584e6f3bf11d6c658631c349c0 08-Aug-2012 Earl Ou <shunhsingou@google.com> Handle error when string length=0 in IfdParser

Change-Id: I3a51e85060f3acd5026555e5f8d21f8cb2e0641e
xif/IfdParser.java
ba50b9420e64731fd5aa8b1410e1f36457a1635a 08-Aug-2012 Bobby Georgescu <georgescu@google.com> Hold WakeLock during MTP import

Bug: 6680729
Bug: 6827858

Change-Id: Ida82db3288a429dacc5830b82ec6bbd954f75cf1
pp/ManageCachePage.java
pp/PhotoPage.java
i/ImportCompleteListener.java
i/MenuExecutor.java
ba04cb7a9c5e57a166f8057950711ec7b8da2ba4 07-Aug-2012 Owen Lin <owenlin@google.com> Guard the usage of MenuItem.setShowAsAction in MenuHelper.

bug: 6927642
Change-Id: I3907ac2f86d38c15b681185abee5906ce243339a
til/HelpUtils.java
6b06d7b738a31945d190fb44002f64540ae6c3ae 07-Aug-2012 Wu-Cheng Li <wuchengli@google.com> Merge "Move motion event related methods to class MotionEventHelper." into gb-ub-photos-arches
8fedc27c552424cc5d8e72783bd53f38538190e9 07-Aug-2012 Ahbong Chang <cwahbong@google.com> Move motion event related methods to class MotionEventHelper.

Bug: 6943189
Change-Id: I9084cc8ebb501a5b772ed4e00bd64a3b2e8bafb3
i/GLRootView.java
til/MotionEventHelper.java
778ec3597e00cd048224b2c393e2d925bfb27c57 06-Aug-2012 Yuli Huang <yuli@google.com> Do not show photo editor before api level 14.

bug:6927717
Change-Id: Iab0fddaa169e03b65dd0a987ee8b5c892f971000
pp/GalleryAppImpl.java
346622b46b955b898f1d9b6db559c834a6299b8b 06-Aug-2012 Earl Ou <shunhsingou@google.com> Add all ExifTag constant

Change-Id: I8a5309cdb1d216c80df9b88973a3b72a5cf9a80f
xif/ExifTag.java
8f2806d762ca4c4a91b4158e7693fd40050ef393 07-Aug-2012 Owen Lin <owenlin@android.com> Merge "Remove TYPE_SUB_IFD for next() in IfdParser" into gb-ub-photos-arches
6e2c8bb73cfcb4f0401231db1fa4af097e754300 07-Aug-2012 Owen Lin <owenlin@android.com> Merge "fix next ifd bug in ExifParser" into gb-ub-photos-arches
ec6da4a15e8db7093fd2d97432906f2da87f3cc7 07-Aug-2012 Owen Lin <owenlin@android.com> Merge "Fix bug when call next() after nextidf in exif parser" into gb-ub-photos-arches
24b08ee2f57fd58c72cc010ad6040f0a0fd363d9 03-Aug-2012 Earl Ou <shunhsingou@google.com> Remove TYPE_SUB_IFD for next() in IfdParser

We should not read the offset because there are
too many exception. Users should check the id of the tag
and decide how to read the block by themselves.

Change-Id: Ie3f162c5c6dc25f15107e193adc080c7b51112b5
xif/ExifTag.java
xif/IfdParser.java
8bf999c568660e7b27c9952d29bcf60ed3bf7739 02-Aug-2012 Earl Ou <shunhsingou@google.com> fix next ifd bug in ExifParser

Originally if we don't read value of tag we won't get 'NEXT_IFD'

Change-Id: I235977b3b482fbc4736c244d280c384c26df6483
xif/IfdParser.java
3ebec4bb830b61c365849972d0b7d4aa1bb91adb 01-Aug-2012 Earl Ou <shunhsingou@google.com> Fix bug when call next() after nextidf in exif parser

Change-Id: Ibb0204627418f8fa650ce32e798a768da7762d59
xif/IfdParser.java
accda65c07c02bdf63c13492d5cd7694bfd94833 03-Aug-2012 Doris Liu <tianliu@google.com> Merge "Add logging for monkey" into gb-ub-photos-arches
c8abaf283b5123fa1b0c69d8feac168337a7e0a4 03-Aug-2012 Wu-cheng Li <wuchengli@google.com> TargetApi of ShareActionProvider should be ICS.

bug:6706723
Change-Id: I8d82662c4bdd44f970cb93b9986208e5f4db3c31
pp/MovieActivity.java
eb8561c88dd966486001b0405f94aed43d8bfa52 03-Aug-2012 Doris Liu <tianliu@google.com> Add logging for monkey

Bug: 6495745

Change-Id: Ib24ba3dd6a887259c5e6083ca5eb270a0bd4e801
ata/MediaObject.java
3000f70d462f27ddf992a50b57db2ef9c8dcac15 28-Jul-2012 Mangesh Ghiware <mghiware@google.com> Show the correct image on a ACTION_VIEW

Bug: 6819100
Change-Id: I7c381c506fa627c3f285fb6857b77cdb770addb7
pp/PhotoDataAdapter.java
042a8366f79693ec3ac572afd25d877f48949a63 01-Aug-2012 Wu-cheng Li <wuchengli@google.com> Fix typo of datetaken field.

Change-Id: I3d53388696101178598910d0b73444988408cbc3
ata/BucketHelper.java
af0df741c51a2b571a10b7d16d46f251b7346660 01-Aug-2012 Earl Ou <shunhsingou@google.com> Merge "Add some constants for exif tag" into gb-ub-photos-arches
3697070673be6cafbed0aeb54b6127a67ca9ac8c 01-Aug-2012 Earl Ou <shunhsingou@google.com> Merge "Fix a bug in IfdParser" into gb-ub-photos-arches
90df352389eda7c964e6a43a0b752d27f16e02a7 31-Jul-2012 Owen Lin <owenlin@google.com> Don't use Files.getContentUri in previous API levels.

Change-Id: I4d096734d22c93b83b2bf8082450ad0d73ade837
ata/BucketHelper.java
ata/LocalAlbum.java
ata/LocalAlbumSet.java
ata/LocalMergeAlbum.java
4febde56c93bcc8662a56f2334718f1d1b1f6fff 01-Aug-2012 Owen Lin <owenlin@google.com> Merge "Remove /mtp from TOP_SET_PATH before HC." into gb-ub-photos-arches
d8e698db7180658b1747daf7c7582a705a94ef98 01-Aug-2012 Earl Ou <shunhsingou@google.com> Add some constants for exif tag

Change-Id: I236f8187668bb144f47214b7241a873223111f9e
xif/ExifTag.java
0d5f1bb5b6b2c1d0c3d26c8cae1b322f29d4508d 01-Aug-2012 Earl Ou <shunhsingou@google.com> Fix a bug in IfdParser

Originally if we call next after the last tag without read the value,
we will receive a wrong tag.

Change-Id: Ib154d112a568c593270ee6676d4954a7c26567f2
xif/IfdParser.java
b200e27b998df8856bc060a9f418e662864458b2 01-Aug-2012 Owen Lin <owenlin@google.com> Remove /mtp from TOP_SET_PATH before HC.

bug: 6913061
Change-Id: Iecdb6452035b83070502977265a3e0d526ea784c
ata/DataManager.java
6608d900c702972a19e0f9e8526add7a8b522fd3 01-Aug-2012 Chih-Chung Chang <chihchung@google.com> Merge "Handle null item in findIndexOfPathInCache." into gb-ub-photos-arches
0086dbabb383a9ba5e06a8b49e3e180bfa36a64b 01-Aug-2012 Chih-Chung Chang <chihchung@google.com> Handle null item in findIndexOfPathInCache.

Bug: 6708911
Change-Id: Ifd1e8342906a3c61d30448ea6b0085c37ccdeb03
pp/PhotoDataAdapter.java
fb5571987f2555b04731b6f3e1c479efc16d542a 19-Jul-2012 Wu-cheng Li <wuchengli@google.com> Do not use ShareActionProvider before API 14.

Use simple share intent before API 14.

bug:6706723

Change-Id: I47930f0b81c7c8c1943054964a093967a7704bf1
pp/GalleryActionBar.java
pp/MovieActivity.java
pp/PhotoPage.java
i/ActionModeHandler.java
i/MenuExecutor.java
abf0ea68634c1d21870c48297ab6898491e0c56f 31-Jul-2012 Chih-Chung Chang <chihchung@google.com> Manually transform the event coordinates on older platforms.

Change-Id: I070b27112ea028f2a1596dcdfa480537765174b9
i/GLRootView.java
34deadcda01cf4d33eade2590df226895b70243e 31-Jul-2012 Bobby Georgescu <georgescu@google.com> Merge "Fix bugs 6882711 and 6836814" into gb-ub-photos-arches
f7e86b3a54618d8b767d787661bcbb806abc3b42 31-Jul-2012 Ahbong Chang <cwahbong@google.com> Merge "Check api level before invoking setHomeButtonEnabled()." into gb-ub-photos-arches
35bdc6ef998d33e3ee980b823a5bb456add72dfe 31-Jul-2012 Owen Lin <owenlin@google.com> Merge "Fix some lint warnings in Gallery." into gb-ub-photos-arches
89e7975ade04cea9df6dff285fe1c74425e4df7f 31-Jul-2012 Ahbong Chang <cwahbong@google.com> Check api level before invoking setHomeButtonEnabled().

Bug: 6706785
Change-Id: I2ad4d4961705c38a4d1047732f45dc9c69580782
pp/GalleryActionBar.java
d61248536b0dc28ca9e5f84b20e63a4c96ac3ff3 30-Jul-2012 Bobby Georgescu <georgescu@google.com> Fix bugs 6882711 and 6836814

Bug: 6882711
Bug: 6836814

A number of issues surrounding the behavior after deleting
the last photo from the camera roll within the Camera app,
including occasional black screen & incorrectly persistent
action bar.

Change-Id: Ib5f41a78c613da90bb844aab2d40f45e314d3ee3
pp/PhotoDataAdapter.java
cc8e7ab7ae0912186beff20e7f042fd6c1e78b35 27-Jul-2012 Owen Lin <owenlin@google.com> Don't call Action.setLogo and Action.setHomeButtonEnabled in old API levels.

bug: 6706724
bug: 6706785

Change-Id: I09e48b8a042c5ce84442dddaf4e4bdfd1960ec4f
pp/GalleryActionBar.java
pp/MovieActivity.java
ed97d58f2028938aeb3e49c10ac598cc3e7a28c6 26-Jul-2012 Owen Lin <owenlin@google.com> Fix some lint warnings in Gallery.

1. Implement our own openPipeHelper
2. Add @TargetApi to TileImageViewAdapter

Change-Id: I74dca78c4c4f18e0f782afad02d5ba9b410a503e
rovider/GalleryProvider.java
i/TileImageViewAdapter.java
75a352ad80c698f8c0c3801b7e31b6795b93f955 30-Jul-2012 Ahbong Chang <cwahbong@google.com> Merge "Code clean up." into gb-ub-photos-arches
7408df8b744f725e28248dbf790a8241b7d002d8 30-Jul-2012 Earl Ou <shunhsingou@google.com> Merge "Low-level exif parser" into gb-ub-photos-arches
7817979db0c52ffeacb951625b1e821eba303285 30-Jul-2012 Ahbong Chang <cwahbong@google.com> Code clean up.

Remove unused imports.
Remove unused fields.
Remove unnecessary cast.
Add missing override annotations.

Change-Id: Idad2e587697a5015eb5363d7b71fab9de9cc8ffb
pp/AlbumDataLoader.java
pp/AlbumPage.java
pp/AlbumPicker.java
pp/AlbumSetDataLoader.java
pp/AppBridge.java
pp/CropImage.java
pp/EyePosition.java
pp/FilterUtils.java
pp/GalleryActionBar.java
pp/GalleryAppImpl.java
pp/ManageCachePage.java
pp/MovieControllerOverlay.java
pp/OrientationManager.java
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/PickerActivity.java
pp/SinglePhotoDataAdapter.java
pp/SlideshowDataAdapter.java
pp/SlideshowPage.java
ata/BitmapPool.java
ata/ClusterAlbum.java
ata/ClusterAlbumSet.java
ata/ComboAlbum.java
ata/ComboAlbumSet.java
ata/DataManager.java
ata/DownloadCache.java
ata/DownloadUtils.java
ata/Face.java
ata/FaceClustering.java
ata/FilterDeleteSet.java
ata/FilterSource.java
ata/FilterTypeSet.java
ata/LocalImage.java
ata/LocalMediaItem.java
ata/LocalSource.java
ata/LocationClustering.java
ata/MediaDetails.java
ata/MediaSet.java
ata/MtpClient.java
ata/MtpContext.java
ata/MtpImage.java
ata/MtpSource.java
ata/SizeClustering.java
ata/SnailAlbum.java
ata/SnailItem.java
ata/SnailSource.java
ata/TagClustering.java
ata/TimeClustering.java
ata/UriImage.java
adget/LocalPhotoSource.java
adget/MediaSetSource.java
adget/WidgetService.java
netimeinitializer/GalleryWidgetMigrator.java
i/ActionModeHandler.java
i/BasicTexture.java
i/BitmapScreenNail.java
i/CacheStorageUsageInfo.java
i/ColorTexture.java
i/CropView.java
i/DetailsAddressResolver.java
i/DialogDetailsView.java
i/EdgeEffect.java
i/EdgeView.java
i/ExtTexture.java
i/FlingScroller.java
i/GLCanvasImpl.java
i/GalleryEGLConfigChooser.java
i/GestureRecognizer.java
i/MenuExecutor.java
i/Paper.java
i/PhotoView.java
i/SurfaceTextureScreenNail.java
i/UndoBarView.java
i/UploadedTexture.java
til/GalleryUtils.java
til/MediaSetUtils.java
til/PriorityThreadFactory.java
til/Profile.java
til/ProfileData.java
til/ReverseGeocoder.java
til/ThreadPool.java
73e933f1f57002d2e593aa7b471811d8837f8767 24-Jul-2012 Earl Ou <shunhsingou@google.com> Low-level exif parser

Change-Id: I592184c79320d08a3cb871a63ea33742071876e3
xif/ExifInvalidFormatException.java
xif/ExifParser.java
xif/ExifTag.java
xif/IfdParser.java
xif/Rational.java
xif/TiffInputStream.java
995c4566bed7df1aa48ba7e1351f964efa73880b 20-Jul-2012 Michael Kolb <kolby@google.com> Use actual selection for album/photo details

Bug: 6533154

Change-Id: I21ce95d79567396840f08095b986ecc54263a295
pp/AlbumDataLoader.java
pp/AlbumPage.java
pp/AlbumSetDataLoader.java
pp/AlbumSetPage.java
pp/PhotoPage.java
i/DetailsHelper.java
i/DialogDetailsView.java
0348d8c50c98fe5befb661032f13615b1673bba3 26-Jul-2012 Owen Lin <owenlin@google.com> Merge "Add @TargetApi for all Mtp related code." into gb-ub-photos-arches
0b2016f5be20d5d9c5980af658cd67f07d8ede5f 26-Jul-2012 Bobby Georgescu <georgescu@google.com> Merge "Only give haptic feedback when enabled in system settings" into gb-ub-photos-arches
14ce29ab5608daaa3d0074cdfc9fc85988537ff2 25-Jul-2012 Bobby Georgescu <georgescu@google.com> Fix for monkey-generated NPE in PhotoView from bug 6848371

In other parts of the code, there are checks for getGLRoot
returning null, and one was missing here.

Bug: 6848371

Change-Id: I3a7a1e1ea9847a43f4791de84f5f70cc27d53a1a
i/PhotoView.java
11f14dc9e1d4d04b7c21b076445f3cb8c173753b 24-Jul-2012 Bobby Georgescu <georgescu@google.com> Only give haptic feedback when enabled in system settings

Bug: 6866688
Change-Id: I4e349fe666244ef5459dd591c8141768b24c910a
pp/ActivityState.java
pp/AlbumPage.java
pp/AlbumSetPage.java
d43ea8bb1b1afcb27c1c6c673c8ed2707bc70ff0 24-Jul-2012 Owen Lin <owenlin@google.com> Add @TargetApi for all Mtp related code.

These classes should not be called since the MtpSource won't be
registered to DataManager.

Change-Id: I3f88dc24f295af3d9e18218f56e6c30731c1e328
ata/MtpClient.java
ata/MtpContext.java
ata/MtpDevice.java
ata/MtpDeviceSet.java
ata/MtpImage.java
52dfb17e3c93b3762130ec8912c6e16c9dea0edc 24-Jul-2012 Owen Lin <owenlin@google.com> Use our own OverScroller for backward compatibility.

Change-Id: Ibcf48a638ab716116d1ce2ff8c2686741ca0a996
i/ScrollerHelper.java
44ef42f215d68ade8b63d18fede944c244a2a1dd 11-Jul-2012 Owen Lin <owenlin@google.com> Make CustomMenu compatible with API level 10.

bug: 6802855
Change-Id: I230c91bd9744935a181881131dcd2275ed89d819
i/ActionModeHandler.java
i/CustomMenu.java
i/PopupList.java
i/SelectionMenu.java
840ae396bac4ff8ff34e88c8d2a1773cb112a4b6 13-Jul-2012 Chih-Chung Chang <chihchung@google.com> Only use SurfaceTexture.release and setIconAttribute on newer platforms.

Bug: 6706784

Change-Id: Ic1bb2bb27c3184d791de566d88dbade039fb9d87
pp/AbstractGalleryActivity.java
i/SurfaceTextureScreenNail.java
b0774a3bfb24d8515fc3ddf152fabf82f0ff67e5 06-Jul-2012 Yuli Huang <yuli@google.com> Avoid using setSystemUiVisibility in old platforms.

bug:6785569

Change-Id: I0a19ab2818b6f34d530c5d65e781d3168533d44f
i/GLRootView.java
fe9989a9a58d5ef883099ef747625aca0232df35 05-Jul-2012 Owen Lin <owenlin@google.com> Don't test the EXTRA_LOCAL_ONLY before HC.

Change-Id: Idebb2aba994e38cf7eead795f1834ff98eaec27d
i/CustomMenu.java
til/GalleryUtils.java
88097d4175d44c4c08af4e8652df6dff458aeff1 04-Jul-2012 Owen Lin <owenlin@google.com> Use different back algorithm for Gallery's widget after JB.

Change-Id: I1c3c6eea4e5794555a36179b295b15d9dba6de74
adget/WidgetClickHandler.java
a2cb30b688131380cab763a1b4da25f15a9fa45a 04-Jul-2012 Owen Lin <owenlin@google.com> Don't show the shuffle and album widget for old platforms

Change-Id: Ide7074025aefe289bf6c71d623eac5100ab72932
adget/PhotoAppWidgetProvider.java
adget/WidgetConfigure.java
adget/WidgetService.java
b1eb01cd02d1e75e6b9c3e593f6ff34335e2ca8a 04-Jul-2012 Owen Lin <owenlin@google.com> Don't use invalidateOptionsMenu before API level 11.

Change-Id: If46d46e44797b2bd4f66235eca0954a55d0008cf
pp/AbstractGalleryActivity.java
pp/ActivityState.java
pp/Gallery.java
04ebde7418493debda790f3eae933b5f6c38e897 03-Jul-2012 Chih-Chung Chang <chihchung@google.com> Use MTP only if the MTP API is available.

Change-Id: I5c747d0da2905eb344c56dfab6333034dd5eecc3
ata/DataManager.java
742b888d9055cec7d63fccef8c74b1352f537160 04-Jul-2012 Hung-ying Tyan <tyanh@google.com> Merge "Add ExifTags to hold tag names that are not available in ExifInterface"
6b9ff6aa3da883ee4efd682b3c6c331cf49066e1 03-Jul-2012 Hung-ying Tyan <tyanh@google.com> Add ExifTags to hold tag names that are not available in ExifInterface

prior to API level 11.
Bug: 6775786

Change-Id: Iab564f577d9a0b87c8fb7b91eda6cabc12b5a11a
pp/CropImage.java
ata/MediaDetails.java
6772173d2a49b87a1d209f42fe52b5f830596f99 02-Jul-2012 Chih-Chung Chang <chihchung@google.com> Remove dependencies on APIs only exist on newer platforms.

Change-Id: I606a23863247454051dd183ddf6b77f6bc882685
pp/MoviePlayer.java
pp/PhotoPage.java
i/ActionModeHandler.java
i/PositionController.java
i/SurfaceTextureScreenNail.java
df4763cf8752fb1babc7244fc2be33ed87d3b072 28-Jun-2012 Owen Lin <owenlin@google.com> Don't reuse bitmap before HoneyComb.

Change-Id: I0df9bf0a8f43e28ed25b436d4c584dc3ceb43c1d
pp/AbstractGalleryActivity.java
pp/CropImage.java
pp/MoviePlayer.java
pp/Wallpaper.java
ata/BitmapPool.java
ata/DecodeUtils.java
ata/ImageCacheRequest.java
ata/LocalImage.java
ata/MediaItem.java
i/AlbumSetSlidingWindow.java
i/AlbumSlidingWindow.java
i/BitmapScreenNail.java
i/GLRootView.java
ca7d9bfb42c1d5037bcecdde30eb836755140b03 29-Jun-2012 The Android Open Source Project <initial-contribution@android.com> Avoid using View.SYSTEM_UI_FLAG_LOW_PROFILE.

Use View.STATUS_BAR_HIDDEN instead.

Bug:6706727
Change-Id: I0324a251b10eba11350f1813ee975d493bbcfafa
pp/MoviePlayer.java
i/GLRootView.java
7eb805de51f5dd9a5dfa98fa3b2fb90ba2582210 02-Jul-2012 Yuli Huang <yuli@google.com> Merge "Do not use NfcAdapter API in old platforms."
fc86994f86f8cfb31e151c9e730dc1e9dc7b3349 29-Jun-2012 Yuli Huang <yuli@google.com> Do not use NfcAdapter API in old platforms.

bug:6698904
Change-Id: I8cab312a212e4cba43187a73bc76d3f2164527a9
pp/PhotoPage.java
i/ActionModeHandler.java
a2cc443402773dbbe0491e6290e87c2f691a5a62 29-Jun-2012 Owen Lin <owenlin@google.com> Merge "Remove hardwired strings for no external storage."
c52ef1a238932267d7295c28dca403c74377f495 29-Jun-2012 Hung-ying Tyan <tyanh@google.com> Merge "Pass correct intent to IntentService in PackagesMonitor"
e494711fa0109bcb5b522457f21dd904f422b015 29-Jun-2012 Owen Lin <owenlin@google.com> Merge "Don't use Build.VERSION_CODES."
78a6a0f549e977489f84809f42e3fb45c1eac1e8 29-Jun-2012 Owen Lin <owenlin@google.com> Merge "Don't reuse bitmaps in BitmapRegionDecoder before JB."
59a38959ba90a0760e7850e72e03d69900d5ac63 28-Jun-2012 Hung-ying Tyan <tyanh@google.com> Pass correct intent to IntentService in PackagesMonitor

Bug: 6755040
Change-Id: I073f4acd026cfcae3e2f4759657324f48b7238c4
pp/PackagesMonitor.java
9d672ab4d15942cd8f8950692fa3e9764d5aa8b5 29-Jun-2012 Owen Lin <owenlin@google.com> Merge "Don't use Display.getSize()."
3a45725ad42324cd2db172fb082fe80772d94d3f 28-Jun-2012 Owen Lin <owenlin@google.com> Don't use Build.VERSION_CODES.

Since they won't be available on old platform.

bug: 6752318

Change-Id: I55a9e83dbf05b93c83c68cb31f6edcbc29793283
pp/CropImage.java
pp/MoviePlayer.java
pp/Wallpaper.java
ata/LocalImage.java
i/GLRootView.java
30aa92093126f00b46543ae3b5d1035a3270f240 27-Jun-2012 Owen Lin <owenlin@google.com> Don't reuse bitmaps in BitmapRegionDecoder before JB.

Change-Id: I8a2f520f98116af6861fa2cd1460e6f848bbb4e4
i/TileImageView.java
i/TileImageViewAdapter.java
a56270e9d7072be946569815712dea09b2544718 27-Jun-2012 Hung-ying Tyan <tyanh@google.com> Replace BroadcastReceiver.goAsync() with IntentService

to make Gallery run on older API.

Change-Id: I30dacb38eb4e70ed3f89135544d6c514d0379add
pp/PackagesMonitor.java
cccb63219fc92b7f6a6e322746f276e6f07c7dd0 27-Jun-2012 Owen Lin <owenlin@google.com> Don't use Display.getSize().

Change-Id: I9b5c9021bae2b58d2815a909c97104f215d4d2e8
pp/Wallpaper.java
til/GalleryUtils.java
5281c0b1fb73947d5808b9abab2d70266bc2dcdf 27-Jun-2012 Chih-Chung Chang <chihchung@google.com> am acd75301: am bb52543c: Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev

* commit 'acd753010dcf6d8079e4620722921694cb041dbf':
Show undo option for 3 seconds after the last picture is deleted.
acd753010dcf6d8079e4620722921694cb041dbf 27-Jun-2012 Chih-Chung Chang <chihchung@google.com> am bb52543c: Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev

* commit 'bb52543c6ba40749d7046f6ea9da4a8b30793f8d':
Show undo option for 3 seconds after the last picture is deleted.
bb52543c6ba40749d7046f6ea9da4a8b30793f8d 27-Jun-2012 Chih-Chung Chang <chihchung@google.com> Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev
429745b69f9113ecf64bf713ff5e040eda0d89cd 27-Jun-2012 Hung-ying Tyan <tyanh@google.com> am 52d51fff: am fc826a5f: Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev

* commit '52d51fff7affd82bc69b025d261ebf19b25728c2':
Migrate local-album gallery widgets from pre-JB.
52d51fff7affd82bc69b025d261ebf19b25728c2 27-Jun-2012 Hung-ying Tyan <tyanh@google.com> am fc826a5f: Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev

* commit 'fc826a5ff488e9e3b27d2a521518e0ae5346b9fe':
Migrate local-album gallery widgets from pre-JB.
fc826a5ff488e9e3b27d2a521518e0ae5346b9fe 27-Jun-2012 Hung-ying Tyan <tyanh@google.com> Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev
c370476adcf29f311ceec70a119792a0168781e9 27-Jun-2012 Chih-Chung Chang <chihchung@google.com> Show undo option for 3 seconds after the last picture is deleted.

Bug: 6742326
Change-Id: I5008c1984fff0a2affaeabf2a195cfcdc517ebc2
pp/PhotoPage.java
ata/FilterDeleteSet.java
40234dd934d0dac0a65c896d9d287d58bc10b198 26-Jun-2012 Hung-ying Tyan <tyanh@google.com> Migrate local-album gallery widgets from pre-JB.

The path of external storage is changed to /storage/sdcard0 in JB and the bucket
IDs in MediaStore are changed accordinly. The local-album gallery widget is
saved by its bucket ID so this needs to be migrated to new value as well.

Bug: 6720251
Change-Id: I58a3044f2f05d428a9524f7a8053259950d5128d
adget/PhotoAppWidgetProvider.java
adget/WidgetDatabaseHelper.java
netimeinitializer/GalleryWidgetMigrator.java
2cff26966184986441109053d351d522c9bcb643 26-Jun-2012 Chih-Chung Chang <chihchung@google.com> am 27a76801: am c7e89dae: Update thumbnail if a picture is deleted in background.

* commit '27a768018b18f45b9dd912bafd09dea64460f852':
Update thumbnail if a picture is deleted in background.
27a768018b18f45b9dd912bafd09dea64460f852 26-Jun-2012 Chih-Chung Chang <chihchung@google.com> am c7e89dae: Update thumbnail if a picture is deleted in background.

* commit 'c7e89daeb178a895de211c411d09a822de52e4e9':
Update thumbnail if a picture is deleted in background.
c7e89daeb178a895de211c411d09a822de52e4e9 26-Jun-2012 Chih-Chung Chang <chihchung@google.com> Update thumbnail if a picture is deleted in background.

Bug: 6712751
Change-Id: I17f56c9ff04441e51f28b3e3bec23b1ac308b70c
ata/DataManager.java
ata/LocalAlbum.java
ata/LocalImage.java
ata/LocalVideo.java
8c986ba35be4a40444b844b14b128ceaf7f5df0b 26-Jun-2012 Chih-Chung Chang <chihchung@google.com> am 64cebdd1: am 6118af9d: Fix the behavior of deleting the last picture.

* commit '64cebdd1eebd2c001e6680f247c6f741889ad989':
Fix the behavior of deleting the last picture.
64cebdd1eebd2c001e6680f247c6f741889ad989 26-Jun-2012 Chih-Chung Chang <chihchung@google.com> am 6118af9d: Fix the behavior of deleting the last picture.

* commit '6118af9ddad8acc050133154f8f60c842c7f9bfa':
Fix the behavior of deleting the last picture.
6118af9ddad8acc050133154f8f60c842c7f9bfa 22-Jun-2012 Chih-Chung Chang <chihchung@google.com> Fix the behavior of deleting the last picture.

Also fix the jank while deleting multiple pictures quickly.

Bug: 6713932, 6712555
Change-Id: I9d64d8bbdcd4ec0dc9a447a51d50f88ff27363b4
pp/PhotoPage.java
ata/FilterDeleteSet.java
i/PhotoView.java
9cd7480fb9f20999f69d760102f775eacebc790a 26-Jun-2012 Pin Ting <pinting@google.com> Merge "Use public OverScroller() instead of a hidden one.."
8b930828c7a33d668876972c22a515e9163592f7 20-Jun-2012 Pin Ting <pinting@google.com> Use public OverScroller() instead of a hidden one..

Bug:6698374
Change-Id: I3a97d0b4bbfb5e2a1e9f4a656d39db636defcdbd
i/PositionController.java
369d0e6b4ee4f034a418177516ea8a76a16953df 22-Jun-2012 Owen Lin <owenlin@google.com> Use another version of setRemoteViews for backward compatibility.

bug: 6706684
Change-Id: I6fd77845d64cfb9e6830c1eabdcb5c2e9a7df854
adget/PhotoAppWidgetProvider.java
b47927b7b43679e7315e6099e0a610760320d18d 21-Jun-2012 Owen Lin <owenlin@google.com> Use MediaColumns.WIDTH and MediaColumns.HEIGHT only when they are available.

bug:6698720

Change-Id: Iaabfd1d5fe16b5d89f564d688a78e773ad36c8bd
pp/CropImage.java
ata/LocalImage.java
fd3071dfc28b4caad583c77d7a4d9dad8fb86a3a 21-Jun-2012 Owen Lin <owenlin@google.com> Remove hardwired strings for no external storage.

bug: 6682495
Change-Id: I68652d6b01842a42907b953574d563cf98e65219
pp/AbstractGalleryActivity.java
7a5e1e771ae58241f3a2be36f23025f282032261 20-Jun-2012 Owen Lin <owenlin@google.com> Guard the use of SYSTEM_UI_FLAG_XXXX with TargetApi

bug: 6698718

Change-Id: I6962f0128ce2bd57658b7f3b77d2bc150eff1f60
pp/MovieActivity.java
pp/MoviePlayer.java
i/GLRootView.java
22a3633a5b84449a419ecb92479703725bdd6723 21-Jun-2012 Wu-cheng Li <wuchengli@google.com> Use View.setBackgroundDrawable instead of setBackground.

View.setBackground was added in API 16. Use setBackgroundDrawable
instead.

bug:6698428
Change-Id: I1346ba4c640ae98d76e333779b4620cdc48b6a3a
pp/MoviePlayer.java
18dafe5c81d5667e6d06fa43ed82a0cb5e3aa9e1 20-Jun-2012 Wei Huang <weih@google.com> am 254a6b42: am 82220026: Merge "Fade in/out the undo bar." into jb-dev

* commit '254a6b42372179bcc9cf6166639325d11411be77':
Fade in/out the undo bar.
254a6b42372179bcc9cf6166639325d11411be77 20-Jun-2012 Wei Huang <weih@google.com> am 82220026: Merge "Fade in/out the undo bar." into jb-dev

* commit '822200267879dfaaf77421007116e59c5bb372cd':
Fade in/out the undo bar.
517e1bd25305d4e82d101a8c06be0119dde2eab3 19-Jun-2012 Chih-Chung Chang <chihchung@google.com> Fade in/out the undo bar.

The fading out happens after 3 seconds or the user swipes away.

Bug: 6610348

Change-Id: Icd4dea7b0396f26556240adab93b9e645a9f1e58
pp/PhotoPage.java
i/PhotoView.java
i/UndoBarView.java
d0f79f64c0a7ec68ffcaa98992aae0af22a9cee1 20-Jun-2012 Owen Lin <owenlin@google.com> Move LongSparseArray into Gallery for unbundling.

Change-Id: Ifa0d06818a2d21bd8ddeabe808d792f39c31322f
i/TileImageView.java
382feb11b767600d6aed8ad97d08d9de7a8673e0 19-Jun-2012 Wei Huang <weih@google.com> am 885f729f: Merge "Make SystemUI always consists with the contrller overlay." into jb-dev

* commit '885f729fa16f9a25e688b23f1f9a94ab1bc591d5':
Make SystemUI always consists with the contrller overlay.
885f729fa16f9a25e688b23f1f9a94ab1bc591d5 19-Jun-2012 Wei Huang <weih@google.com> Merge "Make SystemUI always consists with the contrller overlay." into jb-dev
0b4e90974bb2f171ec3b684c10d8b9c4d97afbde 19-Jun-2012 Owen Lin <owenlin@google.com> Make SystemUI always consists with the contrller overlay.

Change-Id: I81f2a71fd38fc2588a9acb97b9d333978ffb5e48
fix: 6679875
pp/MoviePlayer.java
pp/TimeBar.java
078be806c9caa4c750e17d44851e075e8cf09ef2 19-Jun-2012 Wei Huang <weih@google.com> am d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." into jb-dev

* commit 'd937a2e931f222d2e60d9da007df4647b975eb7f':
Fix Gallery glitch due to ColorTexture.
d937a2e931f222d2e60d9da007df4647b975eb7f 19-Jun-2012 Wei Huang <weih@google.com> Merge "Fix Gallery glitch due to ColorTexture." into jb-dev
1cbde8f63a4862e814078da9b7cefce0c6291dab 19-Jun-2012 Owen Lin <owenlin@google.com> Fix Gallery glitch due to ColorTexture.

Change the initial value of mTextureTarget to GL_TEXTURE_2D,
since it is default enabled.

bug:6668616

Change-Id: I4bf475ca1a02fed3371e8223003a10e88ce8d519
i/GLCanvasImpl.java
f915fe3aae9b44d7cdc96633a1b6ebe10bbb431e 18-Jun-2012 Chih-Chung Chang <chihchung@google.com> am 2ce59cbd: Fix scaling gesture responsiveness.

* commit '2ce59cbd4368eaf0f30cfea28891bd47155182cb':
Fix scaling gesture responsiveness.
756359c0bb6aa1d97c48a621f6d0dda64c2ca055 18-Jun-2012 Chih-Chung Chang <chihchung@google.com> am 6b891c6a: Add swipe-to-delete gesture.

* commit '6b891c6a3739f8c49d42f9db6fc76cb92c7c5f25':
Add swipe-to-delete gesture.
2ce59cbd4368eaf0f30cfea28891bd47155182cb 18-Jun-2012 Chih-Chung Chang <chihchung@google.com> Fix scaling gesture responsiveness.

Bug: 6632011
Change-Id: I9cfeafa4365354a631565f8ee4a9b53df76d06e9
i/PhotoView.java
i/PositionController.java
6b891c6a3739f8c49d42f9db6fc76cb92c7c5f25 07-Jun-2012 Chih-Chung Chang <chihchung@google.com> Add swipe-to-delete gesture.

Change-Id: I992e59702f9dfff17da2f4464e48c9228d42b1b3
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/SinglePhotoDataAdapter.java
ata/FilterDeleteSet.java
ata/FilterSet.java
ata/FilterSource.java
ata/FilterTypeSet.java
ata/MtpSource.java
i/GLView.java
i/GestureRecognizer.java
i/MenuExecutor.java
i/PhotoView.java
i/PositionController.java
i/StringTexture.java
i/UndoBarView.java
e0279d33974a095b12abfe33f3e0be84b5e7b7d0 15-Jun-2012 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp

Change-Id: I4d8d85960b5f0289ee442278db39b8f8c445d73e
cf6f99e72089b61a8f495a3ae940d106f38e3377 14-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 8d340042: Merge "Gallery2: Check privative effects"

* commit '8d340042d2b79218b19f650803ea6a584c61f01f':
Gallery2: Check privative effects
a901f8861f9b62386ad9729d533db744964a8690 12-Jun-2012 Jorge Ruesga <j.ruesga.criado@gmail.com> Gallery2: Check privative effects

Gallery2 has 2 effects (FaceTan and Facelift) from the privative gapps.
If gapps is not present, Gallery2 gets into a FC when click on this effects.
This patch checks if the permission "com.google.android.media.effects" exists
and hide this 2 effects if permission not exists

Patch 2: Use EffectFactory.isEffectSupported to detect if filters exists
Patch 3: Make isPresent method from effect classes a static method
Patch 4: Change actions classes for static calling to effects classes

Change-Id: I8f6b59e57e504114835ab3283f65a72b4f6774a8
hotoeditor/EffectsBar.java
hotoeditor/actions/EffectAction.java
hotoeditor/actions/FaceTanAction.java
hotoeditor/actions/FaceliftAction.java
hotoeditor/filters/FaceTanFilter.java
hotoeditor/filters/FaceliftFilter.java
27d6bf937c3d9934fed171ea69aafaf90c9463e6 11-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am b62f354d: am 582c3bb9: Merge "Gallery2: Use ICS alert drawable"

* commit 'b62f354d4f890a20f6bec37eac83226f75a4a475':
Gallery2: Use ICS alert drawable
b62f354d4f890a20f6bec37eac83226f75a4a475 11-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 582c3bb9: Merge "Gallery2: Use ICS alert drawable"

* commit '582c3bb99cf58b55defa5f788d488c62f771b60e':
Gallery2: Use ICS alert drawable
132db75a1fa9b41d3000c6cb29bd3d90a7d8ef28 11-Jun-2012 Yuli Huang <yuli@google.com> Don't display loading text when loading album sets.

bug:6635606
Change-Id: I55f0dafd5ead8455ed8bee1f03c06ca03662ebbd
i/AlbumSetSlotRenderer.java
4b9c37d08dc78118de53c1f3349024164abf2512 30-May-2012 Owen Lin <owenlin@google.com> Check the offset of output rect when cropping image.

bug: 6568720
Change-Id: I36c98cab5830eaac15369ada1a1a988e10b0fbf4
pp/CropImage.java
pp/Wallpaper.java
25a9153565d0ecd760387499fce4ba10474175d2 04-Jun-2012 Wei Huang <weih@google.com> Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev
e5c8ed74768f16e4e82c46a31d5118788dbb3a57 31-May-2012 Ruei-sung Lin <rslin@google.com> Fix b/6590795 dejank photo effect slider

Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea
hotoeditor/FilterStack.java
5551dfa4c4e644737785c19f10b13304f94ef2fc 01-Jun-2012 Chih-Chung Chang <chihchung@google.com> Update the screen nail size even if screen nail is still the same one.

Because the rotation value may have changed.

Bug: 6594218
Change-Id: I8da2a3041da0e27e1b80723dab8a825a2350c2dd
i/PhotoView.java
23b602e709f1551acdb7cf2caaf5b7838b567d15 31-May-2012 Björn Lundén <blunden2@gmail.com> Gallery2: Use ICS alert drawable

Same bug here. It's using the old compability drawable
instead of the Holo theme one.

Change-Id: Ia84ce1d305ee63fc6bc1fdb407a91b3421842eb1
pp/AbstractGalleryActivity.java
d0781ecea9a9ad299c6466a81ef66ab78af9dee3 31-May-2012 Chih-Chung Chang <chihchung@google.com> Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings.

Bug: 6577802
Change-Id: I5c8eefbb154eedcf71e80e082261e38450105892
pp/OrientationManager.java
192b7f1ddf08e7bfa0c65dbf61edb81ebb5a0998 31-May-2012 Chih-Chung Chang <chihchung@google.com> Improve scale gesture snapback.

If the picture is zoomed-in, we want to keep the focus point stay in
the same position on screen, so we need to adjust the target mCurrentX
value.

Bug: 6563619
Change-Id: I87b23da99aced1490187e550bd43fad733122577
i/PositionController.java
f3f90752ca92372d61ca0ec22a9846261cfbcbde 31-May-2012 Chih-Chung Chang <chihchung@google.com> If the focused box was at minimal scale, we try to make it the
minimal scale under the new view size.

Bug: 6584425
Change-Id: I7dcc748cb3659a06f2ca4d8550d075fdda2949fa
i/PositionController.java
42e1fed4edd9ed1e326aab2f7969242c56812952 31-May-2012 Chih-Chung Chang <chihchung@google.com> Move to final position after view size change.

Bug: 6584188
Change-Id: If6ab23532bd7040701e358f9cdd813d2f6a71e5c
i/PhotoView.java
i/PositionController.java
28b4d3a8fd7a70647f9445752bf1a4e73b99f265 30-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Improve image size change handling." into jb-dev
9f44f35c211229bc0c5ca17823f5d7b6bb3583a1 30-May-2012 Chih-Chung Chang <chihchung@google.com> Improve image size change handling.

- When the camera relative frame is set, we delay the change for camera
rectange until the next setImageSize call. This avoids the unwanted
intermediate state if we change them separately.

- Don't draw other screennails when the camera is in full screen. This
avoids showing other screennails when the image size changes.

- When the aspect ratio of the image changes, we assume the view angle
of the longer side doesn't change (so the aspect ratio change is because
the view angle of the shorter side changes). This matches what camera
preview does.

Bug: 6566612

Change-Id: I7603416f31c96ba77c96cdc2a3d0b79f8921c491
i/PhotoView.java
i/PositionController.java
afb3d1d8f341620f6b69d47d52b515f53817aa91 28-May-2012 Yuli Huang <yuli@google.com> Keep screen on for user-initiated slideshow.

Change-Id: I3085398c663e2c38a31cfde5a07b23446bb7bd7f
b:6450305
pp/ActivityState.java
pp/Gallery.java
pp/SlideshowDream.java
pp/SlideshowPage.java
00bb8e439e33848d679a4404c203af9ed1a06a19 24-May-2012 Owen Lin <owenlin@google.com> Add back the background when we show the action bar

This change fix the following UI issues:

1. We add a black backgorund when ActionBar shows and remove it
when we hide the action bar.
2. Make the postion of video stable when opening
3. Prevent glitching when opening a video
4. Make it really full-screen.
5. Hide ControlOverlay at begining.

bug:6519765
bug:6491674

Change-Id: I3ab033642df2c4a158b99385b02e3e967eebeabd
pp/MovieActivity.java
pp/MovieControllerOverlay.java
pp/MoviePlayer.java
95c2aeab0bf398b45d8a9c562fd110d1e3756139 25-May-2012 Angus Kong <shkong@google.com> Force to stop scrolling in filmstrip mode.

bug:6554106
Change-Id: I4305ce7068a36e72a325996a88c1d227a2d2b20c
i/PositionController.java
4608195e1c3f29a15fb61a8f3cd0797af9dbc938 23-May-2012 Wei Huang <weih@google.com> Merge "Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:6519765" into jb-dev
2ea599aee03d431af770fb39e83d7a93a66b2ac0 23-May-2012 Yuli Huang <yuli@google.com> Merge "Back should progress through Gallery and return Home for widget intents." into jb-dev
835bc6835d42009999536f509ed1dd2f5359cf9b 23-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Remove the background in MovieActivity." into jb-dev
6673c21275772af55c9ae72cd78cbbe710edc023 23-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Put a black View in front of SurfaceView." into jb-dev
24525c28e4c8b4432831b4a2bdb3806017b7772b 22-May-2012 Ray Chen <raychen@google.com> Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode
b:6519765

Ensure SYSTEM_UI_FLAG_LAYOUT_STABLE and SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN is set in all states
so ActionBarOverlayLayout can response to fitSystemWindows and onSystemVisibilityChange correctly.

Change-Id: I41a33c9e7d21243bde6fa64e6cd1b709e7b04203
pp/MoviePlayer.java
54fe6202b6f7d233e7645c121321fe0f3d20fc8b 23-May-2012 Yuli Huang <yuli@google.com> Back should progress through Gallery and return Home for widget intents.

bug:6384492
Change-Id: I7ffb824568e400ff5724a29c1908c34a1e10235c
pp/Gallery.java
pp/PhotoPage.java
adget/WidgetClickHandler.java
5dd57a27b013e5019d727d8badb604f319222ddf 22-May-2012 Owen Lin <owenlin@google.com> Remove the background in MovieActivity.

This is a regression. We add the background for bug 6494653.
So we need to remove it in MovieActivity as well.

bug:6491674
Change-Id: I6fb692fa778a1200ffbed741ca0996cb7eeef32f
pp/MovieActivity.java
edada7ca2b7c70c5459cbe488c1a16cc186f2bf0 23-May-2012 Chih-Chung Chang <chihchung@google.com> Put a black View in front of SurfaceView.

This prevents SurfaceView from being transparent before the first draw.

Bug: 6507478
Change-Id: I2170f23d4c9844bfc3854d6120f5e72cc0d591ca
i/GLRootView.java
13188c884a93f6086cbf4e860fb6dfcbc44c6e13 23-May-2012 Wei Huang <weih@google.com> Merge "Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos" into jb-dev
96b012c84436c776fe515f7d70eb4f8f309ce38a 23-May-2012 Wei Huang <weih@google.com> Merge "Recycle textures when we don't need them." into jb-dev
e8c1e69f85efb8673d0606f3aca729a366038753 16-May-2012 Ray Chen <raychen@google.com> Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos

And removed sync error toast.

Bug: 6259517

Change-Id: Ib7b25176a6db290220661a2e98e4e031043201d9
pp/AlbumPage.java
pp/AlbumSetDataLoader.java
pp/AlbumSetPage.java
ata/ComboAlbumSet.java
ata/LocalAlbumSet.java
ata/MediaSet.java
ata/MtpDeviceSet.java
e6251df06f0b3c8f556043f8b725b4b19be7474d 22-May-2012 Chih-Chung Chang <chihchung@google.com> Unlock orientation only when action bar is needed.

Bug: 6482079
Change-Id: I75d96ca7957f80e9c52f35edf74127f82f194f63
pp/PhotoPage.java
i/PhotoView.java
i/PositionController.java
3535d67239b1b1e4ee038f39dece64545b78f2ed 22-May-2012 Owen Lin <owenlin@google.com> Recycle textures when we don't need them.

bug: 6307447
Change-Id: Id0c1abab54e1fbb75364dffda9f1f72d6b39310b
i/AlbumSetSlidingWindow.java
i/AlbumSetSlotRenderer.java
i/AlbumSlidingWindow.java
i/AlbumSlotRenderer.java
i/FadeOutTexture.java
i/FadeTexture.java
37c605949219b8bf54c165c34d6405f5f2989f50 18-May-2012 Owen Lin <owenlin@google.com> Add a new state uploading to UploadedTexture.

This state means the texture is being uploaded in background and should
not be drawn now to prevent janking.

Sometimes, we may lose GLContext and we will need to reupload
textures again. In this case, we would like to upload these texture in
foreground instead of using TextureUploader.
(for simplicity since this won't happen too often).

bug: 6519344
Change-Id: Ic5d7547c6a0eb4b044b79aa0eb4eb52397faac03
pp/AlbumPage.java
i/AlbumSetSlotRenderer.java
i/AlbumSlotRenderer.java
i/BasicTexture.java
i/ExtTexture.java
i/GLCanvasImpl.java
i/GLRootView.java
i/NinePatchTexture.java
i/PhotoFallbackEffect.java
i/PhotoView.java
i/RawTexture.java
i/TextureUploader.java
i/TileImageView.java
i/UploadedTexture.java
e919bcff63e898d53869725a979cdfd01ef92b08 22-May-2012 Chih-Chung Chang <chihchung@google.com> Hide status bar in lights out mode.

Bug: 6451200
Change-Id: I6ad5ffc203fd8e6be9191ba13a4a99eb716c4734
i/GLRootView.java
c2c0b01fbbf243eee1a11c33ba6dd1ce918a9ce5 18-May-2012 Owen Lin <owenlin@google.com> Reuse bitmap to prevent GC in TiledImageView.

bug:5948093
Change-Id: Iad89c5809bde0de5409752330f607aab153dceba
pp/PhotoDataAdapter.java
i/BitmapTileProvider.java
i/TileImageView.java
i/TileImageViewAdapter.java
i/UploadedTexture.java
49affdc4e274098a34e4eb2dbe4a89a750f1ba7f 22-May-2012 Owen Lin <owenlin@google.com> Limit the size of a ScreenNail.

bug:6528366
This bug was happened because we are trying to make a texture beyond the
max size allowed in GL.

Here is what we do in this CL:
1. Limit the size of a screen nail
2. Print warning message, if we try to allocate a texture beyond the size
3. Don't show fall-back animation if the image is not loaded yet.

Change-Id: I004b1138efd0eef7ba11aa89556f67743ca46745
pp/PhotoDataAdapter.java
i/BasicTexture.java
i/BitmapScreenNail.java
i/GLRootView.java
i/PhotoView.java
21c2e665fdc1d1af0c91ab9c104d13fb7dc2444e 03-May-2012 Ray Chen <raychen@google.com> Fix 6360834 Select All is shown in place of Deselect all option

The CL changes the SelectionManager's toggle method so it changes itself to
inverse selection mode when all items are already selected, and onSelectionModeChange
will be triggered so the listener can update the selection menu (Select all/Deselect all)
and ActionBar.

Change-Id: I9aa5507067415e52f6800c254ecb4d68e7395ffa
b: 6360834
pp/AlbumSetPage.java
pp/PhotoPage.java
i/ActionModeHandler.java
i/SelectionManager.java
3efc2b24e29f7591993c43ef2653332054203578 22-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Don't fire data change notification before the data is made consistent." into jb-dev
7a836b5ad59be5b122cbbacaa3a1882d4a791355 22-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Fix capture animation if we are far away from the camera preview." into jb-dev
d2f509734c5c75298c3fed0edf71d55cd71ad9ae 21-May-2012 Chih-Chung Chang <chihchung@google.com> Don't fire data change notification before the data is made consistent.

Bug: 6500467
Change-Id: Ia064461daba92bbf1172eae5d321bf5049de6d48
pp/PhotoDataAdapter.java
614fe145f539119084b4cf0b1d6892bfcded1a0b 21-May-2012 Wei Huang <weih@google.com> Merge "Fix the detail isn't updated for the selected thumbnail." into jb-dev
c4791b7721a8417be5be33a67c8ade6e82b03a2c 19-May-2012 Chih-Chung Chang <chihchung@google.com> Fix capture animation if we are far away from the camera preview.

Bug: 6481823
Change-Id: If2511c8dd08e0483cdc3139068ee190e2b08126d
i/PhotoView.java
i/PositionController.java
8e4eb7e6d69c2f22605ce96837c2b14d48d084b0 21-May-2012 Yuli Huang <yuli@google.com> Fix the detail isn't updated for the selected thumbnail.

bug:6521826
Change-Id: I1c07c10414ad45721b65583ed5f976c992d27698
pp/AlbumPage.java
pp/AlbumSetPage.java
a3871050845b4921379add2b126add3cfbab1109 16-May-2012 Ray Chen <raychen@google.com> Fix 6385004 When video playback in gallery is launched from another app, Up should cross back to Gallery, except when the logo-bitmap extra is set.

Change-Id: Id0c43872386cc0272bc76d37a9c866d5ffae700f
b: 6385004
pp/MovieActivity.java
pp/PhotoPage.java
c9f743a777cf5e5e91bad7810584be052db21eed 18-May-2012 Yuli Huang <yuli@google.com> Fix action-bar title for cropping wallpaper.

bug:6513495
Change-Id: I97b76c948d5c9fa0bb11f2fe89a0d10f490dbe14
pp/CropImage.java
ab82ed93f46a728018e7f1fdc3d0a877dc3d9171 18-May-2012 Chih-Chung Chang <chihchung@google.com> Remove camera icon in Gallery if there is no launcher icon.

Bug: 6516793
Change-Id: I7ec88065565bcafdd2534cd8c7fd8f2591743447
til/GalleryUtils.java
62c29e71e226ae31573ab883a18e30fdfcb2711b 18-May-2012 Chih-Chung Chang <chihchung@google.com> Handle null for the video resolution field in MediaProvider.

Bug: 6517317
Change-Id: Ic9bb769b3b8e8816bc76a4500c6a2770e69a4dc5
ata/LocalVideo.java
71cd89a38752bc22ae0ec2df965e4280b776623c 18-May-2012 Chih-Chung Chang <chihchung@google.com> Don't jump back to the camera preview if we started an activity.

Bug: 6429570
Change-Id: Ib25dfc4ade235b8c7d7d87c981671ef9308d128b
pp/PhotoPage.java
0b2486cff0c1b951c54325596256b986307f7f3a 18-May-2012 Chih-Chung Chang <chihchung@google.com> Use View.setSystemUiVisibility to enter/leave lights-out mode.

Bug: 6451200

Change-Id: I8e27b3e5eedfa2652f06dfc8f377c9cef8100160
pp/ActivityState.java
pp/PhotoPage.java
i/GLRoot.java
i/GLRootView.java
0f2db4b94d2824db2e5be748924cd51fcc8b9498 18-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Show gray tile for screennails not loaded yet." into jb-dev
f5ce6aeba448f418c99736465f7a02dacd7715bb 11-May-2012 Chih-Chung Chang <chihchung@google.com> Show gray tile for screennails not loaded yet.

Bug: 6452217
Change-Id: Ied9c2e2c91f4ffe218a73ba1a123df92a2aab98a
pp/PhotoDataAdapter.java
pp/SinglePhotoDataAdapter.java
ata/LocalImage.java
ata/LocalMediaItem.java
ata/LocalVideo.java
i/BitmapScreenNail.java
i/BitmapTileProvider.java
i/PhotoView.java
i/PositionController.java
i/TileImageView.java
i/TileImageViewAdapter.java
d759b7c1fc449f4f0ef91997738bbef1bbd96677 17-May-2012 Owen Lin <owenlin@google.com> Refresh the action bar timeout when button is clicked.

Also handle with the confirm dialog, we show the action bar
as long as the confirm dialog is shown. And we start to timeout
the action bar when the confirm dialog get dismissed.

bug: 6478646
Change-Id: I3f0e7e61b43b0dd2bb2b1e2b4444c8dcb5706e1a
pp/ManageCachePage.java
pp/PhotoPage.java
i/ImportCompleteListener.java
i/MenuExecutor.java
4b56917d18c35bec2f5e64f55c864163f0d518c9 17-May-2012 Owen Lin <owenlin@google.com> Merge "Fix a NPE found by Moneky." into jb-dev
8a626914e388a57c2378c86e82b24158d6098330 17-May-2012 Owen Lin <owenlin@google.com> Fix a NPE found by Moneky.

AlbumLabelMaker.mBitmapPool could be null if the setLabelWidth()
has never been called or called with width as 0.

bug:6510386

Change-Id: Idaaa0a1a7239271ba3ae3217e65029b382464c10
i/AlbumLabelMaker.java
43a80fd806247cb50e81bacda3ad21d210e9ae88 17-May-2012 Angus Kong <shkong@google.com> Support Panorama preview.

The panorama preview doesn't consider display rotation.

bug:6305152
Change-Id: I6389a74d3c0e64d8b6bc206e728d1088f04be225
pp/AppBridge.java
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/SinglePhotoDataAdapter.java
i/PhotoView.java
616a70fdb4473d2fbd7b70772a3a82b908aeae1e 07-May-2012 Owen Lin <owenlin@google.com> Add transition animation for tapping from PhotoPage.

bug:6383694
Change-Id: Ib457d6b636dafd3f8ef7340bfa85725f14d90bd0
pp/AbstractGalleryActivity.java
pp/ActivityState.java
pp/AlbumPage.java
pp/GalleryActivity.java
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/SinglePhotoDataAdapter.java
pp/StateManager.java
pp/TransitionStore.java
i/AlbumSlotRenderer.java
i/PhotoFallbackEffect.java
i/PhotoView.java
i/SlotView.java
7896b2ce915cbd180682e94e2fe3d246ff760763 16-May-2012 Owen Lin <owenlin@google.com> Set the window backgrond and remove it in onCreate().

To have better transistion when launching the app.

bug: 6494653
Change-Id: I0f28796d599931c676c99e8f19a9f34e05018570
pp/AbstractGalleryActivity.java
b4e38c9a5945b9651dca1b2b8fe6e0e2833c0fa6 17-May-2012 Ray Chen <raychen@google.com> Merge "Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053" into jb-dev
93ccc28d149fc8f92929e53c7d1ce1ef6c3c8dee 17-May-2012 Ray Chen <raychen@google.com> Merge "Fix 6479216 Playing a video should go full-screen first" into jb-dev
daf88feb0aab5806723b850d22a372cafe758239 17-May-2012 Ray Chen <raychen@google.com> Fix 6213053 Add Help entry point to Gallery (targeted for J release)
b: 6213053

Change-Id: Ib94a8bbdb3114a198b775025c5864a3d83cdd5ad
pp/AlbumSetPage.java
til/GalleryUtils.java
til/HelpUtils.java
5338d1959406e95a580858e418794e23e05c47e2 17-May-2012 Yuli Huang <yuli@google.com> Smooth opening animation by modifying interpolation curve.

bug:5367032
Change-Id: I15ad839ede723591f081be200c1c16a8a9a901d0
i/PositionController.java
bcfa1b79930e567c6a52235445c759d37041ed0c 17-May-2012 Yuli Huang <yuli@google.com> Merge "Fix card effect shown in opening animation." into jb-dev
253c5aec7692afdd7880fbd169d4b44d5679cbc0 17-May-2012 Chih-Chung Chang <chihchung@google.com> Handle layout change between pausing and resuming.

Bug: 6468414
Change-Id: Ib190b620bea5a60f12d6075beaeb3bcd10b87802
pp/PhotoPage.java
46f7f860ebae5a8f98e3a174a1c3d180d0cbc0ac 16-May-2012 Owen Lin <owenlin@google.com> Merge "Fix a dead lock while we freeze the screen." into jb-dev
79cf902f4cc602774e90bc2040f0029978becb61 16-May-2012 Owen Lin <owenlin@google.com> Fix a dead lock while we freeze the screen.

bug: 6504696
Change-Id: If960967142bb0df773ce075bf76f5726c37e1d27
pp/PhotoPage.java
i/GLRoot.java
i/GLRootView.java
be055bc0318828029a4bda0e31e9d8e3ce17ca4b 16-May-2012 Owen Lin <owenlin@google.com> Hide the share button if the shared URI is not "content:".

bug:6494818
Change-Id: I70a2997c07c19433cadee34fa348d27445bf2647
pp/MovieActivity.java
f320b8429dd5c68c117b8e9b1a36a435f4f4ff13 15-May-2012 Yuli Huang <yuli@google.com> Fix card effect shown in opening animation.

bug:6495753
Change-Id: I7a640c2dddef0b7c58e0b7d5a00cbc4aab6ec43d
i/PhotoView.java
i/PositionController.java
bd7c016d728853d38f98a3c6077b7bd9b08858b9 15-May-2012 Yuli Huang <yuli@google.com> Avoid black screen when PhotoPage just starts.

bug:5367032

Change-Id: I6bd56026ec32bcee972d69855966750b9a57cdf4
pp/PhotoPage.java
i/PhotoView.java
i/PositionController.java
f284d8f41ffa15cb7bf0167013700ed21f451fab 16-May-2012 Ray Chen <raychen@google.com> Merge "Fix 6470803 De-jank for video playback in fullscreen" into jb-dev
3349078ecd14bb462756c5c1a3a3b594d5b97cb9 16-May-2012 Ray Chen <raychen@google.com> Merge "Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev
9a033b07b8e0d9fe7419b7a0d876e9c7febf43c8 15-May-2012 Ray Chen <raychen@google.com> Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps

Per request, change the confirm dialog message to "Delete the selected item(s)?"

b: 6046544

Change-Id: I46f7fd42a9f9fbf2399aca78ed9b2e67a15acb65
pp/PhotoPage.java
i/ActionModeHandler.java
i/MenuExecutor.java
83f88ad1c72ae24acc5e78efc93c1e09e1c70c97 09-May-2012 Owen Lin <owenlin@google.com> Add animation for the paddings in SlotView.

bug:6383118
Change-Id: I034be207f73b027de448cef562a534f986d0cbe1
i/SlotView.java
392a29210937c16a9086450bcfb98d1c61b0d87e 14-May-2012 Ray Chen <raychen@google.com> Fix 6479216 Playing a video should go full-screen first

Change-Id: I7b1d2bd28531ec4fd4b65862122cf058ef69066e
b: 6479216
pp/MoviePlayer.java
43650c63eb751a367ff0d75af152d0b244c0e748 11-May-2012 Ray Chen <raychen@google.com> Fix 6470803 De-jank for video playback in fullscreen

b: 6470803

Change-Id: I91fd8430c34e84eac45c33070f0f571627e96820
pp/MovieActivity.java
pp/MovieControllerOverlay.java
6033e0754ee1e1270cef74e12e40a4f9f2408e91 11-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev
214993dc4abf87c386123af50e3c34184ba11cb6 11-May-2012 Chih-Chung Chang <chihchung@google.com> Better data change handling for PhotoDataAdapter and PhotoView.

Change-Id: I0f67d918b95000d10786d2035286e036346bfa4e
pp/PhotoDataAdapter.java
ata/LocalImage.java
i/PhotoView.java
da438c77120c0ec5a626f78c5dc48dc1c2b0ea26 11-May-2012 Owen Lin <owenlin@google.com> Merge "Make sure we won't upload recycled bitmap." into jb-dev
1ade1266d8e13830e3b07c1ebd8c95f4e859e129 10-May-2012 Chih-Chung Chang <chihchung@google.com> Add freeze/unfreeze for GLRootView.

Change-Id: Ieb78041fea22b064d176ea1318cf5883d5d4c94f
i/GLRoot.java
i/GLRootView.java
3b4a8aeb0353fa18a2b5267b3952a80a6c6d4d13 09-May-2012 Chih-Chung Chang <chihchung@google.com> Handle ScreenNail size change.

Bug: 6355399
Change-Id: Ice7560c12aa06cf8ac58cc3883f0888b5c6e71a5
pp/AppBridge.java
pp/PhotoPage.java
ata/SnailAlbum.java
ata/SnailItem.java
ata/SnailSource.java
i/PhotoView.java
de31f23381b248f3141242a8e4906023a949e898 09-May-2012 Owen Lin <owenlin@google.com> Make sure we won't upload recycled bitmap.

bug: 6465117
Change-Id: I97553ba9da0256cfedde3a5752224380b1a3ee6f
i/AlbumSetSlidingWindow.java
i/AlbumSlidingWindow.java
i/TextureUploader.java
78d5dac00fd19fdc34269aae7653f9f4839dc357 09-May-2012 Yuli Huang <yuli@google.com> Crop-image doesn't show its title in the action-bar.

bug:6464608
Change-Id: I7b463beaa96f5f475812ec4f0c3de1118a6d0895
pp/CropImage.java
2ef46ed28b28b355d7f3f1432c7b1196b832a859 08-May-2012 Chih-Chung Chang <chihchung@google.com> Better orientation change handling.

Bug 6451117: Preview location is wrong after rotating the device quickly
Bug 6444303: The preview location is wrong when camera is started upside down on tablet
Bug 6451710: Tap to focus broken in landscape

Change-Id: I12fd57d6618ec5521ccc6efcbf65de57ff2ea3d2
pp/AppBridge.java
pp/OrientationManager.java
pp/PhotoPage.java
i/GLRoot.java
i/GLRootView.java
i/GLView.java
i/OrientationSource.java
i/PhotoView.java
ec9a033559f34e5407387cb7d095aee27ddc337b 04-May-2012 Owen Lin <owenlin@google.com> Keep the last page if finish() is rejected.

bug: 6414642
Change-Id: I480edc43608c08088177113cb3607d517c91e9f6
pp/StateManager.java
625d51a1d6e8cbc5884fdcdddeebcd85454935da 07-May-2012 Yuli Huang <yuli@google.com> Fix back-button's behavior in Crop.

bug:6452504
Change-Id: Ic11dd58c613764e3e6cf7a35135678777e49a4ef
pp/CropImage.java
194feaf54ddf55455c22ddfd2812f8dc0ed9d25b 07-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Set default buffer size for SurfaceTexture." into jb-dev
4b69c5f52e8ef3209bc0b6889c4a6355614607ca 07-May-2012 Yuli Huang <yuli@google.com> Remove PhotoPage spinner shown in the action-bar.

Remove spinners shown for loading data out of view.
bug:5406790

Change-Id: Iffaf97937b86b869559a27f190941c1de263e422
pp/Gallery.java
pp/PhotoPage.java
pp/StateManager.java
til/GalleryUtils.java
til/SpinnerVisibilitySetter.java
21b251499eabca5bcd5c9dfeee11f57f2e5b6ad5 07-May-2012 Chih-Chung Chang <chihchung@google.com> Set default buffer size for SurfaceTexture.

This is needed for Panorama.

Change-Id: I452335cfec6357aef7b66ecac003a4b0ca0fd9fe
i/SurfaceTextureScreenNail.java
ba12eae90b5b1a80ee002aa0df8c5c5189c4faa3 06-May-2012 Chih-Chung Chang <chihchung@google.com> Add transition for card deck effect.

Bug 6442785: Controls disappear & preview surface gets warped after deleting just taken video
Bug 6399861: Filmstrip: Pinch-out animation in fullscreen photo > filmstrip should be metaphorically consistent with the stack of cards model
Bug 6429677: Gray shadow shows up when start

Change-Id: I408cf250e67b4def20f5f15621fe57d7845c90f9
pp/PhotoPage.java
i/PhotoView.java
i/PositionController.java
6575794a9c09f22d5721e212c093e0a2df376d0c 05-May-2012 Chih-Chung Chang <chihchung@google.com> Fix 6429662: Video snapshot doesn't work

Change-Id: I6414be7f00ee103b7047128fdc92e03ca87c7703
pp/AppBridge.java
pp/PhotoPage.java
i/PhotoView.java
d9355113da391f8bbddef1d2a2126ce6edc72291 05-May-2012 Chih-Chung Chang <chihchung@google.com> Put play video icon at the same place of the screennails.

Bug: 6412197
Change-Id: Idaae46c598035639907a85f726b763b80bd9572d
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/SinglePhotoDataAdapter.java
i/PhotoView.java
i/TileImageView.java
66ca848b2f58b813d366642088d274a1b7c4a90c 04-May-2012 Chih-Chung Chang <chihchung@google.com> Tapping on the camera icon no matter what should open camera.

Bug: 6437677
Change-Id: I41ead463652c11986825744465f181ca75674c60
pp/PhotoPage.java
4b24522afa79ccee3b021d57fcd475f476014585 05-May-2012 Martijn Coenen <maco@google.com> Merge "Add support for Beaming multiple pictures." into jb-dev
88cc2ca5f5596762a5546ec7426756f2036be455 05-May-2012 Yuli Huang <yuli@google.com> Fix a TODO by replacing a string.

Change-Id: I17216e0ca83a185842bc69151fcf8c5136e2b873
pp/PhotoPage.java
c2fcc7a681070e6c1d024ecf60b6a2a3e3f1a68b 03-May-2012 Yuli Huang <yuli@google.com> Don't show spinner to avoid janky transition.

bug:5406790
Change-Id: Ieea09f43d5230e1507c16001ec12b3ea6e3c3f0e
pp/AlbumPage.java
pp/AlbumSetPage.java
17ffedda6e3ed57b38afbb775594cf30d83fc652 03-May-2012 Chih-Chung Chang <chihchung@google.com> Fix 6399813: tapping on a photo that isn't in the middle of the screen doesn't select it.

Also make tapping while flinging stop the scroll instead of opening the item.

Change-Id: Iefef4738d7d74b29e4594ea3ae2cb1c91e0e17ab
i/PhotoView.java
i/PositionController.java
4cbf2b139b6588ed6f9c0cec1d9185c5b72fdea6 04-May-2012 Ray Chen <raychen@google.com> Merge "Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail" into jb-dev
609a25b98a576e788c3eff507bc162616d1e64bd 03-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Add camera icon for camera roll." into jb-dev
3ab1028ff9965615d6f90e5073c8d23775c51bb2 03-May-2012 Chih-Chung Chang <chihchung@google.com> Merge "Fix NPE in onFullScreenChanged message handler. Bug: 6430929" into jb-dev
402237b43fd853377e5dba4e048839ad23b99d72 03-May-2012 Chih-Chung Chang <chihchung@google.com> Add camera icon for camera roll.

Bug: 6411709
Change-Id: I2476dba7edb2b763f3b7727f0034fa300cf0287a
pp/AlbumPage.java
pp/AlbumSetPage.java
til/GalleryUtils.java
aeb3062e84ed28f0e25a73f511f287ae0a3e4294 03-May-2012 Chih-Chung Chang <chihchung@google.com> Fix NPE in onFullScreenChanged message handler.
Bug: 6430929

Also tweak the timing of showing action bar and the timing of unlock orientation.

Change-Id: I1af4703ccf99f5257e9724a20d0aa216d20e13c2
pp/OrientationManager.java
pp/PhotoPage.java
i/PhotoView.java
2f61a1c91f323ecd4ea5e385eb2b543517a23a0d 03-May-2012 Yuli Huang <yuli@google.com> Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.

Simplify the dialog options to confirm if the user wants to discard
unsaved edited photo, similar to MMS asking if the user wants to discard
the unsent message.

bug:6436477
Change-Id: Ic5af09a1ed46033a25b4ac42bf05b9739f6e8447
hotoeditor/ActionBar.java
hotoeditor/PhotoEditor.java
hotoeditor/YesCancelDialogBuilder.java
hotoeditor/YesNoCancelDialogBuilder.java
37531196bbecc15a8bf035381afeb61279a947ae 03-May-2012 Yuli Huang <yuli@google.com> Merge "Fix NPE because of concurrent access in both GL and main threads." into jb-dev
61f94714c3702115d2f89bb5f8829697be0c3680 02-May-2012 Chih-Chung Chang <chihchung@google.com> Show/hide action bar at the right time.

Bug: 6399476

Change-Id: I5046b2e73822ebadd94680f61d87db183b40b5c2
pp/PhotoPage.java
i/PhotoView.java
677584c7242d21ef2ca8adbedb5f9e3f016b54b3 02-May-2012 Yuli Huang <yuli@google.com> Fix NPE because of concurrent access in both GL and main threads.

bug:6411187
Change-Id: I811c83f49837ee921436fec0c6b1bf2de0156e0a
pp/GalleryActionBar.java
06c6401eededc2ec842ba4994a838c2ded0a666c 03-May-2012 Pin Ting <pinting@google.com> Turn on unlockOrientation to make onConfigurationChanged in camera work.

Bug:6304805
Change-Id: Ia5a8df4153a7ddc7847a8a3744a3537120edb143
pp/PhotoPage.java
33f8567dd5003e4bb342683f3768ab7552648b02 01-May-2012 Chih-Chung Chang <chihchung@google.com> Fix the Camera controls disappearing after zooming problem.

Bug: 6392682
Change-Id: I065c52b44c02f9314e58e82846cdf22e2d940eab
pp/PhotoPage.java
i/PhotoView.java
f50ce2b708c0c70930a346206fdd526f53ae6004 01-May-2012 Yuli Huang <yuli@google.com> Fix 'Edit' and 'Crop' behaviors.

1. Make Gallery show edited local photo after resuming, similar to how
it shows cropped local photo after resuming.
2. Fix inconsistency between cropping local/PWA photo.

bug:6168430
Change-Id: Ia350e0c67f05969ad42f56b9693c09c3b6433d3c
pp/PhotoDataAdapter.java
pp/PhotoPage.java
hotoeditor/PhotoEditor.java
i/MenuExecutor.java
edd4807d55c34683fdf87770559bd16a5f9163d7 02-May-2012 Owen Lin <owenlin@google.com> Merge "Change thumbnail's position only when it is invisible." into jb-dev
603f9090bed0908374eda827be2c08a7a1b8d8c2 02-May-2012 Owen Lin <owenlin@google.com> Merge "Fix a issue that we are trying upload a recycled tile." into jb-dev
0820262bea846c466706ab488d038747ddcdd747 02-May-2012 Owen Lin <owenlin@google.com> Merge "Add support to draw on texture." into jb-dev
c63554245d9a822a9fbe5aeda8612624434fd247 02-May-2012 Owen Lin <owenlin@google.com> Change thumbnail's position only when it is invisible.

bug:6393694
Change-Id: I33f41c3c894b4c6d28e0832cfd4badbfca3a4f64
pp/AlbumPage.java
8ac2e8630f33f4d5f65731dc56efa9bfb3570cd7 24-Apr-2012 Owen Lin <owenlin@google.com> Add support to draw on texture.

Change-Id: I95dd5d29352692b702503969e1ebe07bc91a8a73
i/GLCanvas.java
i/GLCanvasImpl.java
i/Raw2DTexture.java
i/RawTexture.java
5548396020eed79dde29f33fa68d4d593b9dd013 27-Apr-2012 Owen Lin <owenlin@google.com> Fix a issue that we are trying upload a recycled tile.

bug:5779992
Change-Id: I2503c87e9cea4e8b0ad5250b1508d06f44125779
i/TileImageView.java
6fc8d72ce0814a70c74be71fb9d0775b8d7ca768 02-May-2012 Ray Chen <raychen@google.com> Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail

RegionDecoder is run in a lower priority thread but it uses the same lock as setScreenNail while decoding, so a priority inversion causes this ANR.
The change tries to separate the lock so setScreenNail doesn't have to wait on the decoding process so the ANR could be avoided.

Change-Id: I02cc26fa0535adaa57cdcf94b819970e179311d1
b:6341866
i/TileImageViewAdapter.java
eea90e65dcfcd1c9b2c8cfcbb9b20855f380a72a 02-May-2012 Owen Lin <owenlin@google.com> Merge "Fix photo rotates incorrectly in crop image." into jb-dev
50213b692c09a0121d066d8e1101ec253898e934 30-Apr-2012 Wei Huang <weih@google.com> Merge "Don't enter film mode automatically when moving from camera preview to picture." into jb-dev
18958c51f1412d959d52500ceefc46f987d035f3 30-Apr-2012 Chih-Chung Chang <chihchung@google.com> Don't enter film mode automatically when moving from camera preview to picture.

Also don't follow the scaling touch once we decide to change film mode, this makes the animation smoother.

Change-Id: I45f97bd8c3cc90666370afeb1c18d21dfcc87c06
i/PhotoView.java
acac98ca45868dffc77efab154b07d3842879760 30-Apr-2012 Chih-Chung Chang <chihchung@google.com> Merge "Fix black screen when viewing Gmail image file attachment. Bug: 6415848" into jb-dev
b56ff734d0117cd5813cd2328edc57c4630ff1c3 30-Apr-2012 Chih-Chung Chang <chihchung@google.com> Fix black screen when viewing Gmail image file attachment.
Bug: 6415848

Change-Id: Iec369866be6b5546fbd8cb77eb95a29f92e00b84
i/PositionController.java
57263d33064e4fce39b88b54f73e425f66a550eb 30-Apr-2012 Wu-cheng Li <wuchengli@google.com> Fix crash when select all is pressed.

bug:6411186
Change-Id: Iaa71a320bc4d6d70aade41d5144f75ba6db36e6d
i/MenuExecutor.java
b1e9fd893d62adae1f92d29dfc08bc76f8764491 30-Apr-2012 Chih-Chung Chang <chihchung@google.com> Fix Back behavior in gallery grid and remove camera preview tile.

Bug: 6411801
Bug: 6411709

Change-Id: Iebd7db06d44d315ac67eb8c5133b86044fce30c4
pp/AlbumPage.java
pp/PhotoPage.java
b5dc542fbaeaf99bebdcf775ef0e034e89e88eae 30-Apr-2012 Wu-cheng Li <wuchengli@google.com> Do not show action bar on camera.

bug:6411406
Change-Id: I4fbb95c9913046b4d5b1cfa4ede10490d156ed3f
pp/PhotoPage.java
bd141b5a51c96f6fcaddfa547f0928ce69cf0755 26-Apr-2012 Chih-Chung Chang <chihchung@google.com> Support drawing in different orientation in Gallery.

Bug 6312994: Swipe UX: do not directly show the camera roll when camera starts
Bug 6313191: Swipe UX: Change swipe direction after the user rotated the device
Bug 6313192: Swiping UX: make Gallery display in rotated mode
Bug 6399447: Filmstrip: in Gallery, pressing Back from filmstrip doesn't perform the right animation
Bug 6399974: Filmstrip: when swiping from full-screen photo to filmstrip mode, camera view and the photo-roll don't align correctly
Bug 6400014: Swiping UX: in Camera portrait mode, tapping on the Thumbnail doesn't align camera view and the photo-roll correctly
Bug 6401075: Able to scroll through the gallery pics while capturing video.
Bug 6405087: Filmstrip does not change with orientation

Change-Id: I8c479d87800c63b7a95c199c0c1c3bc512d66d42
pp/AbstractGalleryActivity.java
pp/AlbumPage.java
pp/AppBridge.java
pp/CameraScreenNail.java
pp/GalleryActivity.java
pp/OrientationManager.java
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/SinglePhotoDataAdapter.java
i/GLRoot.java
i/GLRootView.java
i/GLView.java
i/PhotoView.java
i/PositionController.java
i/ScreenNailHolder.java
i/TileImageView.java
23a5e6f233f688f2e1ca2b10b5d1c615a263e83d 30-Apr-2012 Pin Ting <pinting@google.com> Merge "Remove unused code." into jb-dev
87aff90167434de623721ba6149603bb4c7b54a8 30-Apr-2012 Pin Ting <pinting@google.com> Remove unused code.

Change-Id: Icd68f286a8b97594495f56d6b4bfa2e785462f5d
pp/ManageCachePage.java
af4ab4faeeb640b285311a305ff128b33b964389 27-Apr-2012 Martijn Coenen <maco@google.com> Add support for Beaming multiple pictures.

Change-Id: I12bb82bb605813168a7870807390ce2cb37a9a15
i/ActionModeHandler.java
985e289d4ceed04351c300484d28299dcf915896 25-Apr-2012 Yuli Huang <yuli@google.com> Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE.

1. Save edited PWA photo in 'dowload', same as cropped images.
2. Fix Crop-image toast may show strings without i18n.
bug:6168430

Change-Id: Ic99a478e684597d3dc1a105c4f592dd98d8f227d
pp/CropImage.java
pp/PhotoPage.java
ata/MtpContext.java
hotoeditor/SaveCopyTask.java
til/BucketNames.java
til/MediaSetUtils.java
be6e69c8d57f63a96b14237b943ab5ae6343813e 27-Apr-2012 Owen Lin <owenlin@google.com> Fix photo rotates incorrectly in crop image.

bug:6399424
Change-Id: Icc0aca5e9abcd643f8e246211e37bd177bf8ff31
ata/UriSource.java
74976b1397fe34b212741bd92e30fa25aaec7ad8 26-Apr-2012 Wu-cheng Li <wuchengli@google.com> Do not use card effect for camera screen nail.

bug:6402571
Change-Id: I362e675ea4160b7b940e0da4bd018e0e8c7add57
i/PhotoView.java
788245711658188131ae2670e44fb6ca8ad5d53a 26-Apr-2012 Wu-cheng Li <wuchengli@google.com> Make sure action bar is hidden when camera starts.

bug:6402552

Change-Id: I2ec39e607a505490e431181eb40e259102b9a773
pp/PhotoPage.java
736cf74b170d32374c8b35dbe6a46d975258be87 24-Apr-2012 Wu-cheng Li <wuchengli@google.com> Hide action bar when camera screen nail is displayed.

bug:6363385
Change-Id: Ic37afa779339cfe5f66f0a40cbf4870ff1a6a0ee
pp/PhotoPage.java
08d886617e5eb6e8bc3d422972dedbfbea5ca564 25-Apr-2012 Chih-Chung Chang <chihchung@google.com> Merge "Remove scissor tests."
a11f19872b6059d97d31c047ac752354670e1267 25-Apr-2012 Ray Chen <raychen@google.com> Fix 6376466 After deleting photo, the next one will be shown too dark
b:6376466

Change-Id: I7328215c45995d6ae1813ed861da3ad826809461
i/PhotoView.java
57d3cb26a80cdf6b20b2185b02ebf07f3bc2592c 25-Apr-2012 Chih-Chung Chang <chihchung@google.com> Remove scissor tests.

Change-Id: I9f2c462a251e518ce5954dde0eb6e509734254c4
i/GLCanvasImpl.java
i/GLRootView.java
i/Raw2DTexture.java
21a412c93c9b0401b039f4eb86d4950752e5bb84 20-Apr-2012 Owen Lin <owenlin@google.com> Fix NPE in Gallery.

This happens if user set type in an intent. But we get a different type from
content resolver.

Change-Id: Iabafce7f7aaff23a7a9ee09e1d38ab50049abc88
fix: 6358473
pp/CropImage.java
pp/Gallery.java
pp/PhotoPage.java
ata/DataManager.java
ata/LocalSource.java
ata/MediaSource.java
ata/UriImage.java
ata/UriSource.java
160e6d776daab93610b3d12413ad9ff2dd867d8b 25-Apr-2012 Chih-Chung Chang <chihchung@google.com> Don't do capture animation if we don't have Camera ScreenNail.

Also make "Back" jump to first picture instead of the previous one.

Bug: 6388263

Change-Id: Idf78363cf3952bf66c6b0688e79d99c01956cd07
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/SinglePhotoDataAdapter.java
i/PhotoView.java
2c6173822a612597c79be41b126367ddfbb5d518 20-Apr-2012 Chih-Chung Chang <chihchung@google.com> Add capture animation in Gallery.

Change-Id: Ibf95cc64f37a4518377e64124af6606c4f14cdaa
pp/AbstractGalleryActivity.java
pp/Gallery.java
pp/PhotoPage.java
pp/PickerActivity.java
i/CaptureAnimation.java
i/PhotoView.java
i/PositionController.java
97d7d0f272d3f4619ded2bdc80ced457937be507 24-Apr-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add a method to disable toggle status bar."
b1db75c15ef546fef26ee7e34321f3087562a0f7 24-Apr-2012 Wu-cheng Li <wuchengli@google.com> Add a method to disable toggle status bar.

Camera does not show status bar in both landscape and
portrait.

bug:6378178

Change-Id: I80cead9c0e2ef0256288aafead6bd1a96cc93d7b
pp/AbstractGalleryActivity.java
b774b7e12c332d9369b70a09c9f103749e9ca774 24-Apr-2012 Yuli Huang <yuli@google.com> Merge "Add prominent highlights for touch feedback."
56248134ae583f850d5144da34be2f1608fa3e1c 24-Apr-2012 Angus Kong <shkong@google.com> Merge "Add Raw2DTexture."
ffc2a4a77f7164dd435d07c11a3df290c4b64079 11-Apr-2012 Angus Kong <shkong@google.com> Add Raw2DTexture.

Raw2DTexture is a wrapper of GL 2D texture. It also support copy other
texture's content into this texture.

bug:5988937

Change-Id: Ib4f6ff7ed2f6ea499517536366b511b7984a9b98
i/ExtTexture.java
i/GLId.java
i/Raw2DTexture.java
i/SurfaceTextureScreenNail.java
90fe70f11b0961e1e5ae353cdf563236a55f502d 24-Apr-2012 Yuli Huang <yuli@google.com> Add prominent highlights for touch feedback.

Mimic the system UI to fade out highlights on touch releases.
bug:6145331
bug:5379176

Change-Id: I44c9245a926b2c5eb46b28d494c6393ba7f0c30c
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/ManageCachePage.java
i/AbstractSlotRenderer.java
i/AlbumSetSlotRenderer.java
i/AlbumSlotRenderer.java
i/FadeInTexture.java
i/FadeOutTexture.java
i/FadeTexture.java
i/SlotView.java
67098d1a72fd04e2af06d3a5939cde28c65f70d9 05-Apr-2012 Ray Chen <raychen@google.com> Fix 6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps

This CL adds a confirm dialog to delete command and removes all confirm/cancel menu items from the actionbar.

b:6046544
Change-Id: I3afe7b59b4f6d1216e192a621621f7bf544e1919
pp/PhotoPage.java
i/ActionModeHandler.java
i/MenuExecutor.java
3fb40bd6f7431e84481d8bccad61299b5f21a2f9 23-Apr-2012 Ray Chen <raychen@google.com> Merge "Fix 6208468 21 ANR(s) in: com.google.android.gallery3d on crespo during monkey runs for JRM80 b:6208468"
56f23ee044053b07f8a15d123486c9bc4ac5f00c 23-Apr-2012 Ray Chen <raychen@google.com> Merge "Fix 6046987 The header on the contextual action bar when multiple photos are selected is very janky b:6046987"
686a36c8cec0389e7e3133862b56b34d7e74bc3d 20-Apr-2012 Owen Lin <owenlin@google.com> Merge "Fix a UI bug in rendering a rotated image."
6b677eb6dfb1cc51ca6dbe6ab43da2f6020fbf2c 20-Apr-2012 Ray Chen <raychen@google.com> Fix 6208468 21 ANR(s) in: com.google.android.gallery3d on crespo during monkey runs for JRM80
b:6208468

Both getDataManager and getImageCacheService use the same lock but the latter method is blocked on
RandomAccessFile's open syscall. The lock should be separated because they're independent and
getDataManager is very frequently used too.

Change-Id: I4d44cfc949f45a31c7200c8327115bc4b7fde60f
pp/GalleryAppImpl.java
c3b2d478f9032a8decf5c6254a238fc49e41b72c 19-Apr-2012 Chih-Chung Chang <chihchung@google.com> In filmstrip, show placeholders for pictures not loaded yet.

Change-Id: I037f1f054da4a3800045d5b89724341ac22272a5
pp/PhotoDataAdapter.java
pp/SinglePhotoDataAdapter.java
i/BitmapScreenNail.java
i/BitmapTileProvider.java
i/PhotoView.java
i/PositionController.java
i/ScreenNail.java
i/SurfaceTextureScreenNail.java
i/TileImageViewAdapter.java
add4514f5d39bc6c2156ebbf96e693669a9141a7 19-Apr-2012 Ray Chen <raychen@google.com> Fix 6046987 The header on the contextual action bar when multiple photos are selected is very janky
b:6046987

Change-Id: I86c79cf4d8995bfa0faab95ecd61e89879847630
i/CustomMenu.java
a25864674c3ce58bd8e013af9c1af7b8e3b0946d 19-Apr-2012 Owen Lin <owenlin@google.com> Fix a UI bug in rendering a rotated image.

Change-Id: I14f9f74c5d810dfbb56151722c7f604522fea938
i/AbstractSlotRenderer.java
fb1a15559bb2a0a1c8a41efd3e0420a2a2d70590 19-Apr-2012 Chih-Chung Chang <chihchung@google.com> Allow filmstrip to scroll before the screennail is loaded.

Change-Id: I9aa7405902c4bfb7e4946cfe4e1263314a958686
pp/PhotoDataAdapter.java
i/PhotoView.java
i/PositionController.java
099989b310d84fe13eff0cdf2902bb3fb0bcbd14 18-Apr-2012 Chih-Chung Chang <chihchung@google.com> Film strip should be accessible only when an image is its default state.

Change-Id: I4df0db809f6a3f8d28b4e7bbbcddc3fa19d35387
i/PhotoView.java
b8be1e0ad76b6abc0da7ead39f7a9811195d001e 17-Apr-2012 Chih-Chung Chang <chihchung@google.com> Add thumb pool the cache Bitmap used for thumbnails.

Change-Id: Ib710f2a6fc1aa86fe4abdd18d1fa7ac71396a3b4
pp/AbstractGalleryActivity.java
pp/CameraScreenNail.java
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/SinglePhotoDataAdapter.java
ata/BitmapPool.java
ata/DecodeUtils.java
ata/ImageCacheRequest.java
ata/MediaItem.java
i/AlbumLabelMaker.java
i/AlbumSetSlidingWindow.java
i/BitmapScreenNail.java
i/BitmapTileProvider.java
i/PhotoView.java
i/PositionController.java
i/ScreenNail.java
i/SurfaceTextureScreenNail.java
i/TileImageView.java
i/TileImageViewAdapter.java
2ae47200a8ac7a57eff925d287f7b48a2360d95c 18-Apr-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add page tap listener."
014d9586d8145a33f4e99eaad570587f6d650026 18-Apr-2012 Wu-cheng Li <wuchengli@google.com> Add page tap listener.

Camera needs this for touch focus and video snapshot.

bug:6313318

Change-Id: Ie0b8129160c2a79d4b20fab2173027cddfee7a79
pp/PhotoPage.java
1ff1afcbe2046fa239e4b0684f41f5ed41fe707c 18-Apr-2012 Owen Lin <owenlin@android.com> Merge "Slower scrolling for fling in filmstrip mode."
9ca9c3705c2176f1da98c573a9d765fc65b840ce 17-Apr-2012 Owen Lin <owenlin@google.com> Fix NPE in onContentDirty.

onContentDirty is suppose to be called in Main thread.

Change-Id: Ic6a0fba8abd8a3e17d400bcfc5b82d272b07bc41
ata/LocalAlbumSet.java
ata/MtpDeviceSet.java
48ba94ae713dbf57898cfa84ae69517da50cf7a0 17-Apr-2012 Owen Lin <owenlin@google.com> Fix NPE in SlotView.

This NPE is actually a concurrent issue. We shall lock renderring when we clean up
the slots' data. But it didn't, so it may access to null data.

Change-Id: I2a8abfbb77f83bd9a240477fa53216ce69b7774d
fix: 6302487
fix: 6308873
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/ManageCachePage.java
i/ActionModeHandler.java
i/SlotView.java
cd938f3f05975de73658dc2f2b6c632b7ee569a3 17-Apr-2012 Yuli Huang <yuli@google.com> Fix b/6318340: window range isn't updated when data size changes.

bug:6318340
Change-Id: I2098ddc75fe1a4422a20ab90f02a12c9be85c31e
i/AlbumSetSlidingWindow.java
i/AlbumSlidingWindow.java
e7d1767e30d01270bf67714b1902a316960952c0 16-Apr-2012 Ray Chen <raychen@google.com> Fix b/6213053 Add Help entry point to Gallery (targeted for J release)

b:6213053

Change-Id: Ib9d9c5e69f09d6c2fffb4e6ecb09b2c3ae700365
pp/AlbumSetPage.java
til/GalleryUtils.java
2ca50f8b4d102471f7fa2f0163d6fef131abdd19 17-Apr-2012 Owen Lin <owenlin@google.com> Merge "Fix a concurrent issue in reload()."
d848862c1dd0689df8df5d684476cfd3897557d6 16-Apr-2012 Chih-Chung Chang <chihchung@google.com> Slower scrolling for fling in filmstrip mode.

Also don't animate scale for the first image size.

Change-Id: I6a71c00e813bd203e9f454bc9a776eadec06fd78
i/PositionController.java
91adea8b4fc292b046b66c6501166fe7a151d253 16-Apr-2012 Owen Lin <owenlin@google.com> Fix a concurrent issue in reload().

We need to hold the DataManager.LOCK when calling reload.

Change-Id: If908c233bcd835effffc7750a7ef07f56a63136c
fix: 6315479
ata/LocalAlbumSet.java
ata/MtpDeviceSet.java
642561dd3177f9511c8bbeb90839066ecc451054 16-Apr-2012 Chih-Chung Chang <chihchung@google.com> Define max height/width for each picture in filmstrip mode.

Change-Id: I844a32f95237724a60a64afe5f746798886dcc2c
i/PositionController.java
aced34ca03fbd76b072dcdce26f4883ac4d1b25c 16-Apr-2012 Chih-Chung Chang <chihchung@google.com> Reduce padding between photos, from 96 pixels to 16 dp.

Change-Id: I62b0013da45b7d7495b34e9e4e1e791bac9c9c1f
i/PositionController.java
483203d37da239d9c455239791c1defe2acdfa37 14-Apr-2012 Martijn Coenen <maco@google.com> Merge "Use new Beam push API."
a41ed05ff2f71d2177b4f24f53acd848b46fc840 14-Apr-2012 Martijn Coenen <maco@google.com> Use new Beam push API.

Change-Id: I3e5a69832d1ac01759e37fbde2cf2c1926219445
pp/PhotoPage.java
cf06397b2bc65335fb97d5788f18cad4897126a2 12-Apr-2012 Owen Lin <owenlin@google.com> Fix ANR in PhotoPage.

This bugs happens because we open too many PhotoPage(s) (and onSingleTapUp is a delayed event).
However, each of the PhotoPage need a Thread to run tile decoder. When we close one of the
PhotoPage, it will wait the tile decoder to get finished first. However, the title decoder may
still waiting in the queue and never got a chance to run.

Change-Id: I113d1150729892edb4fe36bc5a1dc131db300476
fix: 6319833
pp/AlbumPage.java
pp/AlbumSetPage.java
96a9d9daa55fa5dc9bd73f3352d60942b06e67a0 12-Apr-2012 Yuli Huang <yuli@google.com> Fix SinglePhotoDataAdapter getScreenNail()

bug:6322259
Change-Id: I6cf5de88fc07e4b73b028faa3b2a063b4d47fd20
pp/SinglePhotoDataAdapter.java
311cf7a595e8d466fa427f15d86341271c002bf5 10-Apr-2012 Yuli Huang <yuli@google.com> Merge "Save edited photo in the source photo directory if applicable."
19baeb146fc2b589d5624d1a62b5b01d172c2ef3 10-Apr-2012 Chih-Chung Chang <chihchung@google.com> Merge "Add new filmstrip mode for PhotoView."
b7ec5534c7b539be2397c27cfa5e8b992974c12d 02-Apr-2012 Chih-Chung Chang <chihchung@google.com> Add new filmstrip mode for PhotoView.

Change-Id: I9da9896303ced8d63a3557d5e6e9bc06fb366cf5
pp/PhotoDataAdapter.java
pp/SinglePhotoDataAdapter.java
i/AnimationTime.java
i/BitmapScreenNail.java
i/EdgeView.java
i/GLRootView.java
i/PhotoView.java
i/PositionController.java
til/RangeArray.java
til/RangeBoolArray.java
til/RangeIntArray.java
03669482a3b290e06282579c6d6b90ac014b0dce 10-Apr-2012 Yuli Huang <yuli@google.com> Save edited photo in the source photo directory if applicable.

bug:6168430
Change-Id: I97d8cf1d286bc4d5d7c38ba5118b9a952f17b252
hotoeditor/BitmapUtils.java
hotoeditor/SaveCopyTask.java
cafd30f96355ad446943d60cd2595d08423944e2 09-Apr-2012 Owen Lin <owenlin@google.com> Add BytesBufferPool to prevent GC.

Change-Id: Ia8513ff380a60f102481cbf25650eca149b75064
pp/AbstractGalleryActivity.java
ata/BitmapPool.java
ata/BytesBufferPool.java
ata/ImageCacheRequest.java
ata/ImageCacheService.java
ata/MediaItem.java
i/AlbumLabelMaker.java
i/BitmapPool.java
i/TextureUploader.java
8ef6c55bdad9a3e835ce56bdc98681434b4ac5b3 09-Apr-2012 Owen Lin <owenlin@google.com> Prevent album's label get flashing when content changed.

Change-Id: I1b00b308af740ccab143a073643729ca880770f4
pp/AlbumSetDataLoader.java
i/AlbumLabelMaker.java
i/AlbumSetSlidingWindow.java
c3d8ac3b9504346dafc49e006b5f732dd1db21e8 06-Apr-2012 Owen Lin <owenlin@google.com> Refactor. Rename AlbumView to AlbumSlotRenderer.

Change-Id: I7d8d3586a910dac35975e4effa0d02528e2ccf98
pp/AlbumDataAdapter.java
pp/AlbumDataLoader.java
pp/AlbumPage.java
pp/AlbumSetDataAdapter.java
pp/AlbumSetDataLoader.java
pp/AlbumSetPage.java
pp/Config.java
pp/ManageCachePage.java
i/AlbumLabelMaker.java
i/AlbumSetSlidingWindow.java
i/AlbumSetSlotRenderer.java
i/AlbumSetView.java
i/AlbumSlidingWindow.java
i/AlbumSlotRenderer.java
i/AlbumView.java
i/ManageCacheDrawer.java
cd36bfc52cc4e7f4b667ba3c5e8eb950647ae9d1 04-Apr-2012 Owen Lin <owenlin@google.com> Draw less to improve performance.

Also adjust the upload order to upload nearby textures first.

Change-Id: I2d6a8807a14b4602882dd2e5c03030c356f49e47
i/AlbumLabelMaker.java
i/AlbumSetSlidingWindow.java
i/AlbumSetView.java
i/AlbumSlidingWindow.java
i/AlbumView.java
fc7efade75629450c0c160329fb42b3dbd5361f4 03-Apr-2012 Owen Lin <owenlin@google.com> Fix flashing in "Make available offline".

Change-Id: I84f0896c6038eb21d32e0d5fe0cafec5d339e6ec
i/FadeInTexture.java
i/GLCanvasImpl.java
31cac30e46a293f6d0901e22c6ab0d083cae7021 04-Apr-2012 Owen Lin <owenlin@google.com> Refactor. Merge SelectionDrawer with SlotRenderer.

Change-Id: Iaa50b2a78beb95fc83208a5f74cf612650cd8643
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/ManageCachePage.java
ata/DataSourceType.java
ata/Path.java
i/AbstractSlotRenderer.java
i/AlbumLabelMaker.java
i/AlbumSetSlidingWindow.java
i/AlbumSetView.java
i/AlbumView.java
i/GridDrawer.java
i/HighlightDrawer.java
i/IconDrawer.java
i/ManageCacheDrawer.java
i/SelectionDrawer.java
i/SelectionManager.java
d8fb81f601830385a2343d08ad5dd171e4c7bfe0 29-Mar-2012 Owen Lin <owenlin@google.com> Upload textures in background.

Change-Id: I365f7be9aaab793366884249cbb10e8b6f0ab0e6
pp/AbstractGalleryActivity.java
pp/AlbumDataAdapter.java
pp/AlbumSetDataAdapter.java
ata/ImageCacheRequest.java
ata/MediaItem.java
i/AlbumLabelMaker.java
i/AlbumSetSlidingWindow.java
i/AlbumSetView.java
i/AlbumSlidingWindow.java
i/AlbumView.java
i/BitmapPool.java
i/GLRoot.java
i/GLRootView.java
i/SlotView.java
i/TextureUploader.java
i/TileImageView.java
5e96a9f26b2a8745235a706df5352ae7fb872a93 05-Apr-2012 Owen Lin <owenlin@google.com> Merge "Make all drawing happens in background."
1a4bd273afe5dd11592f7625c2f19853b6f174e9 26-Mar-2012 Owen Lin <owenlin@google.com> Make all drawing happens in background.

Also move more rendering code to SlotRenderers (AlbumSetView and AlbumView).

Change-Id: I1d678711bfd3655a48bb4b99d8ca175e088bdffb
pp/AlbumSetDataAdapter.java
i/AbstractDisplayItem.java
i/AlbumLabelMaker.java
i/AlbumSetSlidingWindow.java
i/AlbumSetView.java
i/AlbumSlidingWindow.java
i/AlbumView.java
i/BitmapLoader.java
i/DisplayItem.java
i/GridDrawer.java
i/HighlightDrawer.java
i/IconDrawer.java
i/ManageCacheDrawer.java
i/SlotView.java
71632ac6c1596dd1fd477f95e268f96ad72ea572 04-Apr-2012 Owen Lin <owenlin@google.com> Fix NPE in Gallery.

bug: 6249248

Change-Id: I41851c6524163195f6296a15893d962e706b3449
pp/AlbumPage.java
pp/AlbumSetPage.java
33ef03776b7734717b16f6fc861b831fb1b1dfac 27-Mar-2012 Martijn Coenen <maco@google.com> Support for beaming a picture.

Change-Id: I73d69f164b455ffa90a495001190937025a56dc5
pp/PhotoPage.java
3957efd020f2e80d79cd3fed019f2883668a1c9e 03-Apr-2012 Wu-cheng Li <wuchengli@google.com> Fix OOM when switching between camera and camcorder.

- Camera activities extend AbstractGalleryActivity. So
onDestroy is moved from Gallery to AbstractGalleryActivity.
- Use WeakReference for values in the WeakHashMap of
SpinnerVisibilitySetter.

bug:5954389
Change-Id: Ib15f269bd4c54a4621bdff58e7ea16b44f8fb3e3
pp/AbstractGalleryActivity.java
pp/Gallery.java
til/SpinnerVisibilitySetter.java
98c2490a424da79beefbdd8a29fb90ab006c77b0 03-Apr-2012 Ray Chen <raychen@google.com> Fix b/3462852 [UI] When linking from Camera preview - App icon with 'Up' arrow should go to next level up

Change startActivity to switchState because not every MediaObject implements "getContentUri" which may
cause runtime exception.

Change-Id: I88be6e9e8f15ad17f4c7347b6dfc200c7682ce01
pp/AlbumPage.java
pp/PhotoPage.java
155389f89ec75d2d7d0b7ce1155028bfccdae177 03-Apr-2012 Yuli Huang <yuli@google.com> Merge "Fix b/5974240: Sliders may not be responsive to touches."
ed56097798bd587243962af29986a314174b60ac 02-Apr-2012 Yuli Huang <yuli@google.com> Fix b/5974240: Sliders may not be responsive to touches.

Add padding around sliders to increase its touchable areas.

Change-Id: I034e25804811b14ce6137c72472191dabd7bdef8
hotoeditor/actions/AbstractSeekBar.java
hotoeditor/actions/ColorSeekBar.java
hotoeditor/actions/EffectToolKit.java
921895ba0b3511aeba053bdc0c965f9d3f62eb51 02-Apr-2012 Chih-Chung Chang <chihchung@google.com> Remove FilmStripView.

Change-Id: I45cee8c32863cc65eba4c5e83e667e104cf24e42
pp/AlbumPage.java
pp/Config.java
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/SinglePhotoDataAdapter.java
i/AlbumSlidingWindow.java
i/AlbumView.java
i/FilmStripView.java
i/PhotoView.java
i/StripDrawer.java
49b137806386ff0c8cf5caba4bf7e0a9aab4b7b9 02-Apr-2012 Owen Lin <owenlin@google.com> Merge "Delete buffers and textures in GL."
ba7d106f7e4fcb0036e694449e6fc5b002526309 02-Apr-2012 Owen Lin <owenlin@google.com> Delete buffers and textures in GL.

Change-Id: I7cd6647c7da56040c040f43859ce8e440db7b498
i/GLCanvasImpl.java
i/GLId.java
2341c197b0becf99422e8ad305def77df6161714 23-Mar-2012 Owen Lin <owenlin@google.com> Remove Position and PositionRepository.

Also fix a regression introduced in previous change.

Change-Id: I534c8ca7838f3518856cf48878dd49beeb331562
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/PhotoPage.java
i/PositionProvider.java
i/PositionRepository.java
i/RelativePosition.java
i/SlotView.java
b29a27f475a2c449abdda8d4e03d30914feed8c6 22-Mar-2012 Chih-Chung Chang <chihchung@google.com> Use SurfaceTexture to show Camera preview.

Change-Id: I8bf63dfc5b969ecce51841378b093a650b6f91d8
pp/AlbumPage.java
pp/CameraScreenNail.java
pp/CameraView.java
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/ScreenNailBridge.java
ata/SnailSource.java
i/BasicTexture.java
i/BitmapScreenNail.java
i/BitmapTileProvider.java
i/ExtTexture.java
i/GLCanvas.java
i/GLCanvasImpl.java
i/GLId.java
i/NinePatchTexture.java
i/PhotoView.java
i/ScreenNail.java
i/ScreenNailHolder.java
i/SurfaceTextureScreenNail.java
i/TileImageView.java
i/UploadedTexture.java
79a981552fc364fae8bf62c8811cba05600f6bf5 29-Mar-2012 Ray Chen <raychen@google.com> Merge "Move getTypeString from PicasaAlbumSet to MediaObject."
d134e18e3c2d9614099d3b74e1a6a12159a1e81a 23-Mar-2012 Ray Chen <raychen@google.com> Move getTypeString from PicasaAlbumSet to MediaObject.

b/5344124

Change-Id: I28a43615ebec0aa84c3b16ac006def26f7b56162
ata/LocalAlbumSet.java
ata/MediaObject.java
14ecb55d726509cfc2cadcbfa786f508e979c0cb 29-Mar-2012 Chih-Chung Chang <chihchung@google.com> Merge "Patch 2 for master."
0c194f77419636a3086c1d8217f50a08bbfe91f5 28-Mar-2012 Owen Lin <owenlin@google.com> Merge "Refactor. Make the code simpler."
ed46d77c16cd80357f4a0feada2435dfba8104a6 26-Mar-2012 Yuli Huang <yuli@google.com> Fix b/6212093: Title wasn't updated for orientation changes.

Change-Id: I407cfb8f2bde5bab302045188f4f511bdcd2347a
b:6212093
pp/PhotoPage.java
534b12fd804610dd67b8109bc08ba76f31afb33e 21-Mar-2012 Chih-Chung Chang <chihchung@google.com> Patch 2 for master.

Change-Id: I8b7c9fd326c4f247a1f2129b1d64388a223d79e0
i/GestureRecognizer.java
i/PhotoView.java
i/PositionController.java
7260f6f74d465520e4497b23fe56f98abb0c15a2 22-Mar-2012 Owen Lin <owenlin@google.com> Refactor. Make the code simpler.

Change-Id: I2d3b7a1cfed17afcf6b7ee3e7bf1ca13ada8d9c3
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/ManageCachePage.java
i/AlbumSetSlidingWindow.java
i/AlbumSetView.java
i/AlbumSlidingWindow.java
i/AlbumView.java
i/DisplayItem.java
i/FilmStripView.java
i/Paper.java
i/RelativePosition.java
i/SlotView.java
7e3d6ee9f4a7e764cb66439f226c7fb66d4f2021 22-Mar-2012 Chih-Chung Chang <chihchung@google.com> Merge "New effect in photo browsing."
42c1892ab508a02ea957fe8796086362e163c123 21-Mar-2012 Chih-Chung Chang <chihchung@google.com> Patch 2 for MR1.

Change-Id: I39cc780e0ef49c4e0863a1a83e585e16f0a32425
i/PhotoView.java
i/PositionController.java
2100cf3b392556e0f084c59a31275e3ee8d5edcc 22-Mar-2012 Hung-ying Tyan <tyanh@google.com> Merge "Make PackagesMonitor go async"
bb0be068e9182278d30efd42cad5cf369ff93db4 21-Mar-2012 Hung-ying Tyan <tyanh@google.com> Make PackagesMonitor go async

to offload package event processing from main thread.

Bug: 6109890
Change-Id: I77e1fad9a4ac24020eed68d53ca7e1d253248890
pp/PackagesMonitor.java
cb4fb7c19f20405fb5e08513e6297dffce824118 21-Mar-2012 Chih-Chung Chang <chihchung@google.com> New effect in photo browsing.

Change-Id: I12ca70f56f5c874292a7a6f38f0518bbc855ed70
pp/PhotoDataAdapter.java
i/BitmapTileProvider.java
i/PhotoView.java
i/TileImageView.java
i/TileImageViewAdapter.java
i/UploadedTexture.java
1955a95dabfab2a8320a99984ab482ef48c10783 22-Mar-2012 Owen Lin <owenlin@google.com> Merge changes I1acef9fc,I53ddb3cd

* changes:
Make top level albums can be loaded concurrently.
Add log to debug loading time.
04ac045bf8da5082bbb0bdc9ea5f9c9b5b796ad0 20-Mar-2012 Yuli Huang <yuli@google.com> Fix incorrect initial position/scale of opening animations.

1. Initial position of opening animation isn't correctly offset if the
position repository isn't properly offset by the action bar height.
2. Initial scale of opening animation should match the thumbnail instead
of using a fixed value 240.
This CL is part of efforts to fix b:6016973.

Change-Id: I620705357ba7594d43685e47488928f9fc93d9f6
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/PhotoPage.java
i/PhotoView.java
i/PositionController.java
15b351a22d02e89d882fc9fe32b3f4c512080e0a 15-Mar-2012 Chih-Chung Chang <chihchung@google.com> Create a ScreenNail interface so we can add other types of screenails.
Add a new MediaItem type to contain a ScreenNail.

Change-Id: Ia303949f3013dd48ded204eaf9ec69a102b8503e
pp/CameraView.java
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/ScreenNailBridge.java
pp/SinglePhotoDataAdapter.java
ata/DataManager.java
ata/MediaItem.java
ata/SnailAlbum.java
ata/SnailItem.java
ata/SnailSource.java
i/BitmapScreenNail.java
i/BitmapTileProvider.java
i/PhotoView.java
i/ScreenNail.java
i/TileImageView.java
i/TileImageViewAdapter.java
4745319b4f5e1f5056502f20698eb5910d249333 20-Mar-2012 Chih-Chung Chang <chihchung@google.com> Patch for MR1.

Change-Id: I3f4bba2854257008eed95b8eacce598abdca3180
pp/PhotoDataAdapter.java
i/BitmapTileProvider.java
i/PhotoView.java
i/TileImageView.java
i/TileImageViewAdapter.java
i/UploadedTexture.java
aa6ac7f6ce0e1cab5b36e6bba97d2fec082f4759 16-Mar-2012 Owen Lin <owenlin@google.com> Make top level albums can be loaded concurrently.

Change-Id: I1acef9fc9a442c36ad1d9d0931b0defc6091bf33
fix: 5947962
ata/LocalAlbumSet.java
ata/MtpDeviceSet.java
c3b30370ce9665d4371f61f0224b7f262dd2c7ee 13-Mar-2012 Owen Lin <owenlin@google.com> Add log to debug loading time.

Change-Id: I53ddb3cdce7abe9de7c5bbd85c1adad474bdff2f
pp/AlbumSetDataAdapter.java
ata/LocalAlbumSet.java
8cab3e872dd95e55ba34fdb94269a0c5069e72ae 20-Mar-2012 Ray Chen <raychen@google.com> Fix b/6191707 Unable to set Custom wallpaper from Home

Change-Id: I130f74c94ebf5d93922807f7fee5ae7f189a15d4
pp/AbstractGalleryActivity.java
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/Gallery.java
pp/GalleryActionBar.java
pp/ManageCachePage.java
pp/PhotoPage.java
pp/PickerActivity.java
655f63f04638dfe31045eab1b6b4c39cc2db10db 16-Mar-2012 Ray Chen <raychen@google.com> Revert "bug #6176711: guard against null GalleryActionBar." and
fix DialogPicker's NPE issue while setting wallpaper.

Change-Id: I833ebfb04907d3a1378df98db51c96b490796a00
pp/AbstractGalleryActivity.java
pp/ActivityState.java
pp/AlbumPage.java
pp/Gallery.java
pp/PhotoPage.java
pp/PickerActivity.java
32f779384c64e4c1abad40bd0acc9bfe3ac900eb 16-Mar-2012 Owen Lin <owenlin@google.com> Merge "Fix a regression, we forget assigne a value to a member variable."
b8480e3dd6ad41f6622e9b39e79c17467eb17c6f 16-Mar-2012 Owen Lin <owenlin@google.com> Fix a regression, we forget assigne a value to a member variable.

Change-Id: I07b6654ddf73f4c92a75d81a3ec8f1075526f5fd
i/AlbumSlidingWindow.java
2a4306a4b3c019c50687473d931753a82912ac48 15-Mar-2012 Wei Huang <weih@google.com> bug #6176711: guard against null GalleryActionBar.

When entering Gallery app from WallPaper picker, the activity is DialogPicker, which doesn't initialize GalleryActionbar so getGalleryActionbar() returns null. Guard against using the null object.

I fixed the obvious NPE here, but Ray or Yuli should take a closer look, to see why this is broken.

Change-Id: Ic6923c388ea7b72ab402131fc3b039546509e340
pp/ActivityState.java
pp/AlbumPage.java
pp/PhotoPage.java
7b9c72a32694f180fbc7bf4652720db9d46e30f4 07-Mar-2012 Ray Chen <raychen@google.com> Fix 6039387 Wrong app icon shown when playing 'personal video' from Videos app

Change-Id: Idf5af5172d5d413e64712331e3e6331f13e1b95c
pp/MovieActivity.java
84c220f10a643927c8a2126de8a755d8d7f7ec9e 06-Mar-2012 Ray Chen <raychen@google.com> Fix 3462852 [UI] When linking from Camera preview - App icon with 'Up' arrow should go to next level up.

Some changes in this CL:

1. ActivityState can decide whether to enable home button and show up arrow
2. ActivityState can handle home_up event on its own
3. Support getContentUri in LocalAlbum (Image/Video Roll) and LocalMergeAlbum (Camera Roll)
4. Gallery supports view action for AlbumPage (Camera Roll)

Change-Id: I85a75cdce9cbc2a877651fdec34a0180ed8e785c
pp/ActivityState.java
pp/AlbumPage.java
pp/Gallery.java
pp/GalleryActionBar.java
pp/PhotoPage.java
pp/StateManager.java
ata/LocalAlbum.java
ata/LocalAlbumSet.java
ata/LocalMergeAlbum.java
ata/LocalSource.java
3a02809c97669a157cf45bfd61d45272110d4091 14-Mar-2012 Chih-Chung Chang <chihchung@google.com> Aggregate three gesture detectors.

Change-Id: I270cd7bdeb81d9a8ea5d3aa122f44074413e7616
i/GestureRecognizer.java
i/PhotoView.java
2b3ee0ea07246b859a5b75d8a6102a7cce7ec838 14-Mar-2012 Owen Lin <owenlin@google.com> Reorganize import for all files.

Change-Id: Ia9188bcde727e317e6a476caccaea562f0758b19
nim/Animation.java
pp/AlbumPicker.java
pp/Config.java
pp/DialogPicker.java
pp/EyePosition.java
pp/GalleryActionBar.java
pp/GalleryActivity.java
pp/GalleryApp.java
pp/GalleryAppImpl.java
pp/GalleryContext.java
pp/ManageCachePage.java
pp/MovieControllerOverlay.java
pp/PackagesMonitor.java
pp/PhotoDataAdapter.java
pp/PickerActivity.java
pp/SinglePhotoDataAdapter.java
pp/SlideshowDream.java
pp/SlideshowPage.java
pp/StateManager.java
pp/TimeBar.java
ata/ChangeNotifier.java
ata/ClusterAlbumSet.java
ata/ComboAlbum.java
ata/DataManager.java
ata/DownloadCache.java
ata/DownloadUtils.java
ata/Exif.java
ata/LocalAlbum.java
ata/LocalAlbumSet.java
ata/LocalMediaItem.java
ata/LocalVideo.java
ata/LocationClustering.java
ata/MediaDetails.java
ata/MediaSource.java
ata/MtpClient.java
ata/MtpContext.java
ata/MtpDevice.java
ata/MtpDeviceSet.java
ata/MtpImage.java
ata/SizeClustering.java
ata/TagClustering.java
ata/TimeClustering.java
ata/UriSource.java
adget/LocalPhotoSource.java
adget/MediaSetSource.java
adget/PhotoAppWidgetProvider.java
adget/WidgetClickHandler.java
adget/WidgetConfigure.java
adget/WidgetDatabaseHelper.java
adget/WidgetService.java
adget/WidgetSource.java
adget/WidgetTypeChooser.java
adget/WidgetUtils.java
rovider/GalleryProvider.java
i/ActionModeHandler.java
i/BitmapTexture.java
i/BitmapTileProvider.java
i/CacheStorageUsageInfo.java
i/CanvasTexture.java
i/CropView.java
i/CustomMenu.java
i/DetailsHelper.java
i/EdgeEffect.java
i/FadeInTexture.java
i/FilmStripView.java
i/FlingScroller.java
i/GLCanvasImpl.java
i/GLRootView.java
i/GLView.java
i/GridDrawer.java
i/HighlightDrawer.java
i/IconDrawer.java
i/ImportCompleteListener.java
i/ManageCacheDrawer.java
i/NinePatchTexture.java
i/Paper.java
i/PhotoView.java
i/PositionController.java
i/PositionRepository.java
i/ProgressSpinner.java
i/ResourceTexture.java
i/ScrollBarView.java
i/ScrollerHelper.java
i/SelectionDrawer.java
i/SlideshowView.java
i/StringTexture.java
i/StripDrawer.java
i/SynchronizedHandler.java
i/TileImageView.java
i/UploadedTexture.java
til/CacheManager.java
til/GalleryUtils.java
til/IdentityCache.java
til/MediaSetUtils.java
til/Profile.java
til/ProfileData.java
til/ReverseGeocoder.java
52cf405c5e6758aec1dd14b4b9e80909ffe72e76 14-Mar-2012 Owen Lin <owenlin@google.com> Merge "Reuse bitmap for all micro thumb images to prevent GC."
4bb5912e85f6d1bd8a6b78d6d52b4c4da7aeb740 07-Mar-2012 Owen Lin <owenlin@google.com> Reuse bitmap for all micro thumb images to prevent GC.

Change-Id: I27d3002e5bb745a597f52962fe24744c8329441c
pp/AbstractGalleryActivity.java
ata/DecodeUtils.java
ata/ImageCacheRequest.java
ata/ImageCacheService.java
ata/LocalImage.java
ata/LocalVideo.java
ata/MediaItem.java
ata/MtpImage.java
ata/UriImage.java
i/AbstractDisplayItem.java
i/AlbumSetSlidingWindow.java
i/AlbumSlidingWindow.java
i/BitmapPool.java
5cac6d5dd9688e85970ab001cd615f56ce5a0555 12-Mar-2012 Yuli Huang <yuli@google.com> Simplify PhotoEditor code.

1. Encapsulate spinner usages inside Toolbar.
2. Remove unnecessary static variable usages.

Change-Id: Iaec614c5322a50c1e2c0cfa9cec1971b85e32f8a
hotoeditor/EffectsBar.java
hotoeditor/PhotoEditor.java
hotoeditor/SpinnerProgressDialog.java
hotoeditor/Toolbar.java
fb55994c78d7b6af919d45ab015f5dc0a8665ac8 11-Mar-2012 Chih-Chung Chang <chihchung@google.com> Change id "root" to "movie_view_root" to avoid confusion.

There is also one id "root" in Camera.

Change-Id: Id6ebc5362f5ddceabe6dab6218de9b091454bde7
pp/MovieActivity.java
392352c673069715e74deecafdc7b65565f04a31 09-Mar-2012 Chih-Chung Chang <chihchung@google.com> Merge "Merge Camera into Gallery package."
63764789fdef4dfcdb3c0e1a9fa46b5d62312f07 08-Mar-2012 Chih-Chung Chang <chihchung@google.com> Merge Camera into Gallery package.

Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a
pp/GalleryAppImpl.java
8817fe8a5bbe65905e777230720293744f6a8cca 08-Mar-2012 Yuli Huang <yuli@google.com> Fix b/5948180: Photo is repositioned during being scaled.

Avoid repositioning photo to center vertically during scaling it.

Change-Id: Id9f2de6b2b1611419a0c03888cff49a5336b39df
i/PositionController.java
15b8ec53d9d79e25d08f53e5ab721dac9cedf16e 07-Mar-2012 Yuli Huang <yuli@google.com> Fix b/5948187: Add progress text for loading video.

Change-Id: If85a5db3c6128cf0c59b97dc44f51cdfc87d225b
pp/MovieControllerOverlay.java
d67ec74304219b3e70caae32fbfaadfb9c3c76f4 06-Mar-2012 Yuli Huang <yuli@google.com> Fix b/5885342: Multiple PhotoEditor activities cause exceptions.

Avoid using a static variable to keep tracking views across activities.

Change-Id: Ia53444502d476d37b64344e5aea5f58a06ee3b03
hotoeditor/EffectsBar.java
hotoeditor/PhotoEditor.java
hotoeditor/SpinnerProgressDialog.java
hotoeditor/Toolbar.java
cb05834cedb8223fc59456afcd62fa7448f2b3b8 02-Mar-2012 Chih-Chung Chang <chihchung@google.com> Use AnimationTime for animation caluclation.

Change-Id: I3af8334978c054ddbc2050a240f0d9c113a44012
i/AnimationTime.java
i/FadeInTexture.java
i/GLRootView.java
i/Paper.java
i/PositionController.java
d83f5f227315cccfe3c23db90c93b5fd7be20597 01-Mar-2012 Yuli Huang <yuli@google.com> Fix a wrong flag value.

Change-Id: I7450dc31bb307b19dcfd34ee7df83126df1d294e
pp/ActivityState.java
6068de20f4f19ca82ca01bef3b6dda796a79f724 01-Mar-2012 Yuli Huang <yuli@google.com> Fix b/6064909: Photo might not be snapped back correctly.

Photo might not be snapped back if the animation wasn't actually started
because of no position/scale changes.

Change-Id: I6b5e938bffd954b848cae04514a06d0427151025
i/PhotoView.java
i/PositionController.java
2ce3c3bfe08fff5aee58007cc8ba8f4a50861ae2 23-Feb-2012 Yuli Huang <yuli@google.com> Fix b/5624131: Panning enlarged photo switches images by mistake.

Avoid swiping images when panning to view vertically enlarged photo.

Change-Id: Ieb72cb8f38595fbedc927e8a0380fe31532ee434
i/PhotoView.java
i/PositionController.java
bf645b65f2799ed4a76676a39145c6510f71f055 29-Feb-2012 Ray Chen <raychen@google.com> Merge "Fix 5948189 BUG BASH: action bar flashes during multi-select"
301ea871a5f3b13adeae5ac1f0a36c86eff228e7 20-Feb-2012 Ray Chen <raychen@google.com> Fix 5948189 BUG BASH: action bar flashes during multi-select

This CL fixes the flashing by disabling MenuItem directly instead of setting null intent
to ShareActionProvider, so there won't be any "icons shrinking" effect that causes flashing.

The rest of the change is code refactoring. More comments are added and the final UI operations
are merged into one Runnable object.

Change-Id: I73843c1df6b7a9675176e1b3ae6a35cc1cb715fa
i/ActionModeHandler.java
fe1625c46f8258be4cd5e5e1ba69b584c1fe1a49 17-Feb-2012 Ray Chen <raychen@google.com> Fix 5948223 [bug bash] Albums text disappears when exiting gallery

Change-Id: Ib787184f747ff30afabc35b16b46950dc3b5b50c
pp/ActivityState.java
pp/AlbumSetPage.java
pp/GalleryActionBar.java
a9bd72c2efc7f7c26c60083d8f00380e60caf94e 16-Feb-2012 Ray Chen <raychen@google.com> Fix 5948410 BUG BASH: Temporarily title is displayed during gallery start

Change-Id: I88a67e3e9437124001be836239736a8275c1abf4
pp/ActivityState.java
7b83fb8e3a8978b33a6b9bfc56d85fe2c1a9cf06 22-Feb-2012 Chih-Chung Chang <chihchung@google.com> Remove unused code.

Change-Id: I167596ab023671651df298ddb2b80b7c782f4223
nim/AnimationSet.java
pp/AbstractGalleryActivity.java
pp/ActivityState.java
pp/AlbumDataAdapter.java
pp/AlbumPage.java
pp/AlbumSetDataAdapter.java
pp/AlbumSetPage.java
pp/ControllerOverlay.java
pp/FilterUtils.java
pp/GalleryActionBar.java
pp/GalleryActivity.java
pp/GalleryContext.java
pp/MovieControllerOverlay.java
ata/ChangeNotifier.java
ata/DataManager.java
ata/DecodeUtils.java
ata/DownloadCache.java
ata/DownloadUtils.java
ata/Face.java
ata/LocalVideo.java
ata/MediaDetails.java
ata/Path.java
rovider/GalleryProvider.java
i/AdaptiveBackground.java
i/AlbumSetView.java
i/AlbumSlidingWindow.java
i/BitmapTileProvider.java
i/BoxBlurFilter.java
i/Config.java
i/CustomMenu.java
i/DialogDetailsView.java
i/DrawableTexture.java
i/FilmStripView.java
i/GLCanvas.java
i/GLCanvasImpl.java
i/GLPaint.java
i/GLRoot.java
i/GLRootView.java
i/GLView.java
i/GalleryEGLConfigChooser.java
i/Icon.java
i/OnSelectedListener.java
i/Paper.java
i/RawTexture.java
i/ScrollBarView.java
i/SelectionManager.java
i/SlotView.java
i/StaticBackground.java
i/Texture.java
til/FutureTask.java
til/GalleryUtils.java
til/IdentityCache.java
til/IntArray.java
til/JobLimiter.java
til/LinkedNode.java
til/UpdateHelper.java
cfa105d3934c4dfa14f02b693bfa97c8d17d56a9 17-Feb-2012 Chih-Chung Chang <chihchung@google.com> Reduce memory allocation and make small improvements.

Change-Id: Iac3f302454119de6363cd5cfb158619e739b0536
pp/AlbumPage.java
i/AlbumSetSlidingWindow.java
i/AlbumSlidingWindow.java
i/DialogDetailsView.java
i/GLCanvas.java
i/GLCanvasImpl.java
7d19f7f4281f232b9dceee4a5df390c03e2bd16b 17-Feb-2012 Chih-Chung Chang <chihchung@google.com> Cache animation time value to reduce work and synchronize animation.

Change-Id: I00081bc6037c01dafc56cf017dcc1da448c1d106
i/AdaptiveBackground.java
i/AnimationTime.java
i/CropView.java
i/EdgeEffect.java
i/GLCanvas.java
i/GLCanvasImpl.java
i/GLRootView.java
i/GLView.java
i/ProgressSpinner.java
i/SlideshowView.java
i/SlotView.java
ff951a85c3c9015ef7ccd8902e69ce88360a0cb8 16-Feb-2012 Chih-Chung Chang <chihchung@google.com> Change from fillRect to clearBuffer for pure black background.

Change-Id: Ie3da19b377f3e7926ab37c5936ce48cbb3227f92
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/ManageCachePage.java
i/StaticBackground.java
3950038a697470bb8b7cd6798716aecd8285eb00 16-Feb-2012 Chih-Chung Chang <chihchung@google.com> Simplify the reference from textures to GLCanvas.

Change-Id: Ia64e60ec4b920b707148f7c2b9373ce484a52d9f
i/BasicTexture.java
i/GLRootView.java
i/NinePatchTexture.java
i/RawTexture.java
174cac8f92029fc2829c94f274e70793ae948931 16-Feb-2012 Chih-Chung Chang <chihchung@google.com> Make GLCanvas a bit faster.

(1) make a faster version of translate(x, y).
(2) make mapPoints() faster.
(3) avoid calling canvas.rotate() when it is not needed.

Change-Id: I364e2aa3fc9ee81c43f42f3af8b2d30a1241b482
i/GLCanvas.java
i/GLCanvasImpl.java
i/GLView.java
i/PhotoView.java
i/ProgressSpinner.java
i/SlideshowView.java
i/SlotView.java
i/TileImageView.java
95018d10aa68ecbea7ebce434733341a642510de 15-Feb-2012 Chih-Chung Chang <chihchung@google.com> Try to use less of "Long" to make the program faster.

Change-Id: I6adb870a8f2bca97318d0fbb6f42388aef4c19c1
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/PhotoPage.java
i/AbstractDisplayItem.java
i/AlbumSetSlidingWindow.java
i/DisplayItem.java
i/NinePatchTexture.java
i/PhotoView.java
i/PositionProvider.java
i/PositionRepository.java
i/TileImageView.java
eeda756e6efb58710916d614a4c79437df25e380 14-Feb-2012 Chih-Chung Chang <chihchung@google.com> Merge "Add profiling tools."
a431626bba8c6441fe0ee007e9d950b47f06ad96 14-Feb-2012 Yuli Huang <yuli@google.com> Merge "Fix b/5948042: Incorrect scrolling position after deleting pictures."
3d238a7a19b1010578709c63f86e12b2bce0e4fc 03-Feb-2012 Chih-Chung Chang <chihchung@google.com> Add profiling tools.

Change-Id: Ieab118ededaab5ef46408fac6fdb66b9fff4900e
i/GLRootView.java
til/Profile.java
til/ProfileData.java
7f10c1533e087b528f58294edaba18726e350103 13-Feb-2012 Chih-Chung Chang <chihchung@google.com> Merge "Use FloatMath instead of Math."
189e21a31f1c520b2802f734a53a37e5f3b455f4 13-Feb-2012 Yuli Huang <yuli@google.com> Fix b/5948042: Incorrect scrolling position after deleting pictures.

Scrolling position may not be updated correctly after deleting some
pictures.

Change-Id: I82de2cf1178ed1f97e48162a0e3bdf00a34d9bad
i/SlotView.java
fef6691d870711d8cdaf3ac14b24e5a7c6496b6f 11-Feb-2012 Pin Ting <pinting@google.com> Merge "Shows video filename read from OpenableColumns."
fd91413ab46e2960803a33652025aebe3e05f2d9 11-Feb-2012 Chih-Chung Chang <chihchung@google.com> Use FloatMath instead of Math.

Change-Id: I41661b231f6c034dbca6af26d5950eda6c5fc7da
pp/CropImage.java
pp/EyePosition.java
ata/LocationClustering.java
hotoeditor/RendererUtils.java
i/AlbumSetSlidingWindow.java
i/AlbumSlidingWindow.java
i/CropView.java
i/PositionController.java
i/StringTexture.java
i/TileImageView.java
4a9c58cb0029a4ea96c2ade614c265805d699179 11-Feb-2012 Chih-Chung Chang <chihchung@google.com> Merge "Revert "Use FloatMath instead of Math.""
3e7cfd9d20f9e9830dddac7288d4d12c8839fba0 11-Feb-2012 Chih-Chung Chang <chihchung@google.com> Revert "Use FloatMath instead of Math."

This reverts commit 6bb8b2eb8695c042798f0eb798032cd30d642a65
pp/CropImage.java
pp/EyePosition.java
ata/LocationClustering.java
hotoeditor/RendererUtils.java
i/AlbumSetSlidingWindow.java
i/AlbumSlidingWindow.java
i/CropView.java
i/PositionController.java
i/StringTexture.java
i/TileImageView.java
af4724e9fe7f0b6636c1c90219283c37acbee45b 11-Feb-2012 Chih-Chung Chang <chihchung@google.com> Merge "Use FloatMath instead of Math."
6bb8b2eb8695c042798f0eb798032cd30d642a65 11-Feb-2012 Chih-Chung Chang <chihchung@google.com> Use FloatMath instead of Math.

Change-Id: I26eb6a554f72c13ba2801ce35ef0cf2a1466a97b
pp/CropImage.java
pp/EyePosition.java
ata/LocationClustering.java
hotoeditor/RendererUtils.java
i/AlbumSetSlidingWindow.java
i/AlbumSlidingWindow.java
i/CropView.java
i/PositionController.java
i/StringTexture.java
i/TileImageView.java
4ba06f02e9182160ce155871cbd088919b0ac0c6 10-Feb-2012 Pin Ting <pinting@google.com> Shows video filename read from OpenableColumns.

bug:5796182
Change-Id: I92bc652d713bcc70b5a048f5948dc17e90a5e874
pp/Gallery.java
pp/MovieActivity.java
fbc235e42c17f8c06e6be753b0863ec2ee2539e7 10-Feb-2012 Yuli Huang <yuli@google.com> Merge "Fix b/5974541: Support up to 45 degrees for straighten."
49d11f8bace6432c5246d832966a3b15b7e54933 09-Feb-2012 Ray Chen <raychen@google.com> Merge "Fix indent."
5dfa1bb1f296d30ee4b05c3818a214bf154c81ad 09-Feb-2012 Yuli Huang <yuli@google.com> Fix b/5974541: Support up to 45 degrees for straighten.

Change-Id: I131a478c59f5619e801311d9872440b2c7014578
hotoeditor/filters/StraightenFilter.java
f948355db86dde8531088d49c69a4ac0a5d1231e 09-Feb-2012 Yuli Huang <yuli@google.com> Merge "Fix b/5974663: inconsistent transparency of disabled action buttons."
e4321efb533ebf1801f5dd738ec3e8efe426e3a2 09-Feb-2012 Pin Ting <pinting@google.com> Merge "Shows image filename read from OpenableColumns."
62b12225f5d244615845b222df0038db4776553f 09-Feb-2012 Yuli Huang <yuli@google.com> Fix b/5974663: inconsistent transparency of disabled action buttons.

1. Avoid gray out save-button again as disabled alpha is already applied
to all text buttons.
2. Reduce disabled alpha of image buttons to make them look consistent
with text buttons.

Change-Id: Ie76988db1424ce036470a754acd2e4501979dd1a
hotoeditor/ImageActionButton.java
hotoeditor/RestorableView.java
1d33c69510326298c524593a8fb5d65b571013dc 07-Feb-2012 Pin Ting <pinting@google.com> Shows image filename read from OpenableColumns.

bug:5796182
Change-Id: If43d2dd048ab003c1703bb1a466a19b6013cae85
pp/Gallery.java
fa011a292ea27fd6a885f980596e959ca83b9a4f 07-Feb-2012 Ray Chen <raychen@google.com> Fix indent.

Change-Id: I3e0c443ddfb2ebc777db7504c89ca1ffec119745
pp/AbstractGalleryActivity.java
a7b78e224b1808895ea2c3d42ae385526dea12aa 07-Feb-2012 Yuli Huang <yuli@google.com> Fix b/5840847: Always show 'Loading...' for corrupt pictures.

Change-Id: I040f6e4090dad3e73b86062ddefd9bb0be581bf5
pp/PhotoDataAdapter.java
i/PhotoView.java
acd15c734363293975b259168537ed811889fcdc 06-Feb-2012 Pin Ting <pinting@google.com> Merge "Shows status bar in gallery when in portrait view."
4d50f7373a6205e197ffc1b73cdc5ffcbeb79fca 03-Feb-2012 Pin Ting <pinting@google.com> Shows status bar in gallery when in portrait view.

bug: 5467810
Shows status bar in gallery, crop activity, picker activity when in
portrait view; hide status bar when in landscape view.

Change-Id: I17e2347f020db209ba0581a8e2f2aa19fcb4ceae
pp/AbstractGalleryActivity.java
585ae3d5deccc58e282c55b980ef31eb655537ee 03-Feb-2012 Ray Chen <raychen@google.com> Fix 5948229 [Bug Bash] The app icon is clickable in album set view

Change-Id: I563d2322fe5f1954ffaab7424b66d22722ed43a7
pp/ActivityState.java
ac7c72d8d8f7af477a74656603e0c27e01c25106 02-Feb-2012 Pin Ting <pinting@google.com> Merge "Shows video filename passed from other apps."
b333d7a407d108d3c6de4bf016d0d6f7854ef903 02-Feb-2012 Pin Ting <pinting@google.com> Merge "Shows image filename passed from other apps."
143594f5a26cf68520ca4712435739d2ada339a3 18-Jan-2012 Pin Ting <pinting@google.com> Shows video filename passed from other apps.

bug:5796182
Change-Id: I8de80b56105737ac38db117804b55a161150dbe9
pp/MovieActivity.java
186f8b21cdbe6881a1e7fd452e3ef32e1d81d90f 18-Jan-2012 Pin Ting <pinting@google.com> Shows image filename passed from other apps.

bug:5796182
This change will be followed up by a change to the class
android.content.Intent.
Change-Id: I3c607c535a4e90d867a98528118d1b6f10fa45cf
pp/Gallery.java
f12d64978030d8e35794ad0cd37c177f3c8674a7 01-Feb-2012 Chih-Chung Chang <chihchung@google.com> Localize the "fail to load image" toast message.

Bug 5875813.

Change-Id: Ia11a3e909f90e8178238c390728b407708fabf8e
pp/CropImage.java
39b453b3504e39c25fb0772fcb0ebb4216d36d52 17-Jan-2012 Chih-Chung Chang <chihchung@google.com> am a2b62468: am 8f568da3: Patch.

* commit 'a2b62468fcb23d80295fa25dba5551247204f34d':
Patch.
f31954e5b5f227b07fe377545fb05327d7e7ffe6 13-Jan-2012 Pin Ting <pinting@google.com> Fixes gallery crash due to attempt to open deleted photo.

bug:5630894
Change-Id: I540bf067561550def72ac513eed12dcd5a808a1a
ata/DataManager.java
8f568da373699781beb11cfa46a46c5871288353 04-Jan-2012 Chih-Chung Chang <chihchung@google.com> Patch.

Change-Id: I62fd65461e8989a1d5cf6bc353dfc4b61a2108c8
i/FlingScroller.java
i/PositionController.java
d05b0be120bb217b4f56add24a4b31bee92455b2 08-Jan-2012 Chih-Chung Chang <chihchung@google.com> Fix 5835642: Only finish the page when it's still active.

The original code can call finishState twice in a row with the calling
stack: finishState -> onPause -> clearLoadingBit -> finishState.

Change clearLoadingBit to call finishState only when it's currently active.

Change-Id: I537dbdd6ce26b26aeb565e243c4168229d4a70ef
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/StateManager.java
6f6230e40811effe0b0ca9ba023136b3b36130b7 13-Dec-2011 Owen Lin <owenlin@google.com> Support querying account and picasa id of a picasa image.

Change-Id: I7d24fb70b0a8a01c5d0fbdb6205c25d74d1996a6
fix: 5482269
rovider/GalleryProvider.java
6ff9167388b26ea67cad4497ddd2cf42e882b928 05-Dec-2011 Yuli Huang <yuli@google.com> Improve Doodle UI for ending Doodle effect.

As doodle-view was removed before the final doodle results are
produced by MFF and displayed, doodles drawn disappeared temporarily
when the user exits Doodle effect.

Change-Id: I72822ba840f41f509fe4e9a2e1022a5b40b14e6a
hotoeditor/actions/EffectAction.java
hotoeditor/actions/EffectToolKit.java
26c0354619d6229a937f4232e2c9744385c046ad 02-Dec-2011 Yuli Huang <yuli@google.com> Fix effect-label layout and a TODO.

1. Seekbar was wrongly placed below effect label because of the added
order.
2. Fix a TODO by refactoring EffectToolFactory to EffectToolKit.

Change-Id: I8d37c2c2b6d15f2af65d4e6b27116afe01df63c9
hotoeditor/EffectsBar.java
hotoeditor/actions/ColorTemperatureAction.java
hotoeditor/actions/CropAction.java
hotoeditor/actions/DoodleAction.java
hotoeditor/actions/EffectAction.java
hotoeditor/actions/EffectToolFactory.java
hotoeditor/actions/EffectToolKit.java
hotoeditor/actions/FaceTanAction.java
hotoeditor/actions/FaceliftAction.java
hotoeditor/actions/FillLightAction.java
hotoeditor/actions/FisheyeAction.java
hotoeditor/actions/FlipAction.java
hotoeditor/actions/GrainAction.java
hotoeditor/actions/HighlightAction.java
hotoeditor/actions/RedEyeAction.java
hotoeditor/actions/RotateAction.java
hotoeditor/actions/SaturationAction.java
hotoeditor/actions/ShadowAction.java
hotoeditor/actions/SharpenAction.java
hotoeditor/actions/StraightenAction.java
hotoeditor/actions/TintAction.java
hotoeditor/actions/VignetteAction.java
dc1b41c7f4226b24b8aa6b767b6c1edf77f87772 02-Dec-2011 Yuli Huang <yuli@google.com> Simplify EffectAction.

1. Make the whole effect item clickable instead of just the icon.
2. Rename interfaces/methods to improve readability.

Change-Id: I647a13dae88b4527b7baba85bb83b9bd15bbe997
hotoeditor/EffectsBar.java
hotoeditor/EffectsMenu.java
hotoeditor/actions/AutoFixAction.java
hotoeditor/actions/CrossProcessAction.java
hotoeditor/actions/DocumentaryAction.java
hotoeditor/actions/DuotoneAction.java
hotoeditor/actions/EffectAction.java
hotoeditor/actions/GrayscaleAction.java
hotoeditor/actions/LomoishAction.java
hotoeditor/actions/NegativeAction.java
hotoeditor/actions/PosterizeAction.java
hotoeditor/actions/SepiaAction.java
hotoeditor/actions/TintAction.java
1d9a19ddfcbedb6d52f93dd5e5fefe6a3a9dfc26 02-Dec-2011 Yuli Huang <yuli@google.com> Remove unnecessary code.

Revert BitmapUtils changes made in cl:122870 as crop/rotate is now done
in MFF.

Change-Id: I3733c9acf911c4f694dd21dd533b0dd07350acea
hotoeditor/BitmapUtils.java
203bb023e745d2ee36e9bf19a638a2a7c817da40 02-Dec-2011 Yuli Huang <yuli@google.com> Merge "Refactor to remove obsolete design and improve code consistency."
43072a9551c907236a9f0bb4e6506ef0bd5d6c03 01-Dec-2011 Daniel Sandler <dsandler@android.com> Remove dependency on support library. DO NOT MERGE.

Bug: 5689684
Change-Id: I95d1090b91302dc6686d36768721cca61e9d1249
pp/SlideshowDream.java
04085c3b17e4b6da6fb951e2cdbd35dfa153bb87 28-Nov-2011 Yuli Huang <yuli@google.com> Refactor to remove obsolete design and improve code consistency.

1. Remove isValid()/validate() in Filter; EffectAction would push
filters into the stack when being notified by notifyChanged().
2. Make RedEyeAction consistent with DoodleAction by ignoring
out-of-bounds operations.
3. Improve consistency by encapsulate effect-tool creation/removal in
one class (EffectToolFactory).
4. Minimize variable visibility in EffectAction subclasses.
5. Fix unfinished doodle lost when exiting Doodle effect by multi-touch.

Change-Id: I8d3b127c5fe8777eb45b7c5ae680f6a30a99635a
hotoeditor/EffectsBar.java
hotoeditor/actions/AutoFixAction.java
hotoeditor/actions/ColorTemperatureAction.java
hotoeditor/actions/CropAction.java
hotoeditor/actions/CrossProcessAction.java
hotoeditor/actions/DocumentaryAction.java
hotoeditor/actions/Doodle.java
hotoeditor/actions/DoodleAction.java
hotoeditor/actions/DoodleView.java
hotoeditor/actions/DuotoneAction.java
hotoeditor/actions/EffectAction.java
hotoeditor/actions/EffectToolFactory.java
hotoeditor/actions/FaceTanAction.java
hotoeditor/actions/FaceliftAction.java
hotoeditor/actions/FillLightAction.java
hotoeditor/actions/FisheyeAction.java
hotoeditor/actions/FlipAction.java
hotoeditor/actions/GrainAction.java
hotoeditor/actions/GrayscaleAction.java
hotoeditor/actions/HighlightAction.java
hotoeditor/actions/LomoishAction.java
hotoeditor/actions/NegativeAction.java
hotoeditor/actions/PosterizeAction.java
hotoeditor/actions/RedEyeAction.java
hotoeditor/actions/RotateAction.java
hotoeditor/actions/SaturationAction.java
hotoeditor/actions/SepiaAction.java
hotoeditor/actions/ShadowAction.java
hotoeditor/actions/SharpenAction.java
hotoeditor/actions/StraightenAction.java
hotoeditor/actions/TintAction.java
hotoeditor/actions/TouchView.java
hotoeditor/actions/VignetteAction.java
hotoeditor/filters/AbstractScaleFilter.java
hotoeditor/filters/CropFilter.java
hotoeditor/filters/CrossProcessFilter.java
hotoeditor/filters/DocumentaryFilter.java
hotoeditor/filters/DoodleFilter.java
hotoeditor/filters/DuotoneFilter.java
hotoeditor/filters/Filter.java
hotoeditor/filters/FlipFilter.java
hotoeditor/filters/GrayscaleFilter.java
hotoeditor/filters/LomoishFilter.java
hotoeditor/filters/NegativeFilter.java
hotoeditor/filters/PosterizeFilter.java
hotoeditor/filters/RedEyeFilter.java
hotoeditor/filters/RotateFilter.java
hotoeditor/filters/SepiaFilter.java
hotoeditor/filters/StraightenFilter.java
hotoeditor/filters/TintFilter.java
fa860f3772f4b69a837add25de76dbe06daa8b3f 30-Nov-2011 Chih-Chung Chang <chihchung@google.com> am 764482c4: Merge "Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1

* commit '764482c4ebffc9c3cac21fcd8707811e981cd092':
Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
e11e36e2aefa19e99e40c78992e86764a75528c3 30-Nov-2011 Chih-Chung Chang <chihchung@google.com> am 002a3fec: Fix 5686493: Crash when try to click any thumbnail

* commit '002a3fece284f713537fad4523ee963d257350e9':
Fix 5686493: Crash when try to click any thumbnail
046d036a24f624b8d30203a0e44a5fe761052c46 30-Nov-2011 Daniel Sandler <dsandler@android.com> am 45fa6771: Merge "Improve screen on/off logic in slideshow." into ics-mr1

* commit '45fa677140112f725df3765be56edc715c226aa5':
Improve screen on/off logic in slideshow.
764482c4ebffc9c3cac21fcd8707811e981cd092 30-Nov-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1
d091538f6949cca1c73213cea0b9fdf28c878046 30-Nov-2011 Chih-Chung Chang <chihchung@google.com> Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)

Change-Id: Ia994264fb2c11fbc971840c8a103bbe9fa6ee7f7
pp/PackagesMonitor.java
002a3fece284f713537fad4523ee963d257350e9 30-Nov-2011 Chih-Chung Chang <chihchung@google.com> Fix 5686493: Crash when try to click any thumbnail

Change-Id: Ia109333c3a207ca2a60889c2731f6c11737b5592
pp/ActivityState.java
45fa677140112f725df3765be56edc715c226aa5 30-Nov-2011 Daniel Sandler <dsandler@android.com> Merge "Improve screen on/off logic in slideshow." into ics-mr1
59029d5c2fa6330a42d2bb8ab395f3a6c966e962 29-Nov-2011 Wei Huang <weih@google.com> am 622c2b2c: Merge "Show a dialog to require updating PlusOne." into ics-mr1

* commit '622c2b2c7721008e7851d0af3d89d3fc545ceaf6':
Show a dialog to require updating PlusOne.
622c2b2c7721008e7851d0af3d89d3fc545ceaf6 29-Nov-2011 Wei Huang <weih@google.com> Merge "Show a dialog to require updating PlusOne." into ics-mr1
1b1e13c2587312da8ff775c62a9b1dc7c2717e54 29-Nov-2011 Chih-Chung Chang <chihchung@google.com> am fc8c503d: Fix 5661035: Accepts bluetooth keys while playing a video from gallery.

* commit 'fc8c503d1351c6ee62d233a944f2bd5220e64a55':
Fix 5661035: Accepts bluetooth keys while playing a video from gallery.
8e6fd7cee5467824cd96b4127ccc755c70bd4ea3 28-Nov-2011 Daniel Sandler <dsandler@android.com> Improve screen on/off logic in slideshow.

When used as a screensaver or otherwise, the slideshow
should not keep the screen on if the device is not plugged
in. It should also allow the screen to lock while the
slideshow is playing (otherwise a device left in this state
may be left unsecured for long periods by accident).
Additionally, when used as a screensaver, it must dismiss
the keyguard in order to be shown on a secured device.

Bug: 5660833
Change-Id: I1bafc50127aaa7ae2b67235d30736faa606c5ac1
pp/ActivityState.java
pp/SlideshowPage.java
fc8c503d1351c6ee62d233a944f2bd5220e64a55 29-Nov-2011 Chih-Chung Chang <chihchung@google.com> Fix 5661035: Accepts bluetooth keys while playing a video from gallery.

Change-Id: I8174b1a97baad563d8bbd685b9aab3a8ca428ead
pp/MovieActivity.java
pp/MoviePlayer.java
fe49be45412f8d0f68343662318e73822da486c8 24-Nov-2011 Owen Lin <owenlin@google.com> Show a dialog to require updating PlusOne.

Change-Id: I1ff4f5eca90ade49b0785324b9319ef0b7d751ca
fix: 5608342
pp/AlbumDataAdapter.java
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/Gallery.java
ata/ComboAlbum.java
ata/ComboAlbumSet.java
ata/MediaSet.java
a13f36841cc2f6ed7f8c467ae7ff48cb57076f1d 21-Nov-2011 Chih-Chung Chang <chihchung@google.com> am 8cbc7c4e: Merge "Fix 5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1

* commit '8cbc7c4eedb204e3ad9fa1cb8a7a1b21f7464c74':
Fix 5637927: NPE while trying to do slide show for gmail image attachment
8cbc7c4eedb204e3ad9fa1cb8a7a1b21f7464c74 21-Nov-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1
6ce002de51161bfd10abf86c59fd05d12c696153 19-Nov-2011 Ray Chen <raychen@google.com> am 00b5f3c6: Fix 5635260 Albums view goes blank after changing view option and returning to albums view

* commit '00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa':
Fix 5635260 Albums view goes blank after changing view option and returning to albums view
dd96bde27b4961e36059ede00060ae8a91096e81 18-Nov-2011 Wei Huang <weih@google.com> am 71a296c2: Merge "Make sure startAnimation won\'t be called after onPause." into ics-mr1

* commit '71a296c27389fefa9361adada41715ae4623af32':
Make sure startAnimation won't be called after onPause.
2066200f8fd0a2ed5b97e53115eb5de6b56320e1 18-Nov-2011 Chih-Chung Chang <chihchung@google.com> Fix 5637927: NPE while trying to do slide show for gmail image attachment

Change-Id: If30aa9798a030a5b97c7ff626f91187d7da93ab5
pp/PhotoPage.java
00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa 18-Nov-2011 Ray Chen <raychen@google.com> Fix 5635260 Albums view goes blank after changing view option and returning to albums view

Change-Id: I1fd9776f050d16fc3abb723cc17b1cf07bd2f948
pp/AlbumSetPage.java
pp/GalleryActionBar.java
71a296c27389fefa9361adada41715ae4623af32 18-Nov-2011 Wei Huang <weih@google.com> Merge "Make sure startAnimation won't be called after onPause." into ics-mr1
8bc5bebba780ca4a322b466b06fc909331697cf4 17-Nov-2011 Owen Lin <owenlin@google.com> Make sure startAnimation won't be called after onPause.

Change-Id: I6c5238394b2ad64e22fbcb250ecd1534da7e8d03
fix: 5629252
pp/PhotoPage.java
i/SlotView.java
4aaaeb8625547db8432cb3a489e771ad4f2dd12e 16-Nov-2011 Ray Chen <raychen@google.com> am d7401652: Fix 5611147 attachments (picture) can\'t be viewed after they\'re saved

* commit 'd74016524fa899747411240daa453e5ca9cac219':
Fix 5611147 attachments (picture) can't be viewed after they're saved
d74016524fa899747411240daa453e5ca9cac219 16-Nov-2011 Ray Chen <raychen@google.com> Fix 5611147 attachments (picture) can't be viewed after they're saved

Change-Id: I0de0b8c176e1c3f838e81e3549c6795613b90069
ata/MediaItem.java
ata/UriImage.java
ba5be9d3bc76b0f67220db5524e3511e4989b51d 15-Nov-2011 Wei Huang <weih@google.com> am bfbd7bb4: Merge "Fix 5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1

* commit 'bfbd7bb47582be2a636eadffb041a698c52817f6':
Fix 5481444 Face clustering should use PWA profile shot instead of random photo
76cc7711837f5c2cb1c5908179b3f8a8f3fdb28c 15-Nov-2011 Yuli Huang <yuli@google.com> am c5d42ff7: Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1

* commit 'c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b':
Fix b/5517002 by dismissing running progress dialog in onPause().
bfbd7bb47582be2a636eadffb041a698c52817f6 15-Nov-2011 Wei Huang <weih@google.com> Merge "Fix 5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1
af201bdc9a915ee3aa7057710733abcf6dfc99a6 15-Nov-2011 Owen Lin <owenlin@google.com> am c903fd67: Fix the memory leak by WeakHashMap.

* commit 'c903fd67c26d652f9dbd5cb321b64d1601357985':
Fix the memory leak by WeakHashMap.
c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b 15-Nov-2011 Yuli Huang <yuli@google.com> Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1
3235a3e842c52e472da5b2da18971ef259e92149 14-Nov-2011 Yuli Huang <yuli@google.com> Fix b/5517002 by dismissing running progress dialog in onPause().

Change-Id: I524f876e53776c38bc850120a2d7b7e6381ca33a
hotoeditor/EffectsBar.java
hotoeditor/PhotoEditor.java
hotoeditor/SpinnerProgressDialog.java
c903fd67c26d652f9dbd5cb321b64d1601357985 13-Nov-2011 Owen Lin <owenlin@google.com> Fix the memory leak by WeakHashMap.

fix: 5601885

Also simplify the code.

Change-Id: I97cdf00d84fa093ad7032e85ec7c31c3365e2447
til/SpinnerVisibilitySetter.java
3e348145db32983d098a2f6a1baecf19312ac3cd 11-Nov-2011 Ray Chen <raychen@google.com> am c9af80a1: Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1

* commit 'c9af80a1e46106b93271903753d36682b480479c':
Fix 5213252 [UI] Updated action bar layouts and action orders
04a9a44fb85263c4590ca68f92adff6f9da360e9 03-Nov-2011 Ray Chen <raychen@google.com> Fix 5481444 Face clustering should use PWA profile shot instead of random photo

Change-Id: Ie4e3f9ae19431ab5b36d216cd7f4c626de503bbf
ata/ClusterAlbum.java
ata/ClusterAlbumSet.java
ata/Clustering.java
ata/Face.java
ata/FaceClustering.java
ata/LocalImage.java
ata/MediaItem.java
fa0af6939e716e8ad07ca9200fbe665d165aefda 11-Nov-2011 Owen Lin <owenlin@google.com> resolved conflicts for merge of 64d592c0 to master

Change-Id: Iae4a66e37fcb852c4b105fe732c6597b638b2059
c9af80a1e46106b93271903753d36682b480479c 11-Nov-2011 Ray Chen <raychen@google.com> Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1
4001b59bc073c674bffa10b32d9c53654888ce37 11-Nov-2011 Owen Lin <owenlin@google.com> am d80bb597: Merge "Show control overlay when earphone is unplugged" into ics-mr1

* commit 'd80bb5974b0ec43ca1755aff4287fc7815504058':
Show control overlay when earphone is unplugged
a6e4e6a8709cd3c0ba4f594015e4a9e50ab2b282 11-Nov-2011 Yuli Huang <yuli@google.com> am e193bc40: Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1

* commit 'e193bc40110b0606806c864234e95141be6bd312':
Fix b/5518211 by disabling effects when photo cannot be loaded.
aa6bce7d890ce47eb4cae2fef45ea307661bfd07 11-Nov-2011 Chih-Chung Chang <chihchung@google.com> am b86c6aa0: Fix 5548567: Don\'t play video immediately.

* commit 'b86c6aa085a66ffee2a178f4b5e2426cc67ca90b':
Fix 5548567: Don't play video immediately.
64d592c0573766162498bf16933bd8699b8fa77f 11-Nov-2011 Owen Lin <owenlin@google.com> Merge "Request sync when opening Gallery/Album." into ics-mr1
d80bb5974b0ec43ca1755aff4287fc7815504058 11-Nov-2011 Owen Lin <owenlin@google.com> Merge "Show control overlay when earphone is unplugged" into ics-mr1
aea077a5767d28fcdade440825239adfbfb8f45a 10-Nov-2011 Owen Lin <owenlin@google.com> Show control overlay when earphone is unplugged

Change-Id: I3e259e66d318010a3f9e9b47b561a09b2db2b6a5
fix: 5563251
pp/MoviePlayer.java
e193bc40110b0606806c864234e95141be6bd312 11-Nov-2011 Yuli Huang <yuli@google.com> Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1
fbdd338d83596ba545a8a7c8105d2ad7b5df56e6 08-Nov-2011 Owen Lin <owenlin@google.com> Request sync when opening Gallery/Album.

fix: 5519437

Change-Id: I0fb60415e3a92a677ca72ee8e0b95ae57e802152
pp/AlbumPage.java
pp/AlbumSetPage.java
99a1082122e040ff07fa2c044efd6d42c2450a75 10-Nov-2011 Chih-Chung Chang <chihchung@google.com> am af92c510: Merge "Fix 5585254: Make system UI enter "low profile mode" while playing." into ics-mr1

* commit 'af92c5100158fe39cca21abb76ca685bfe106eeb':
Fix 5585254: Make system UI enter "low profile mode" while playing.
b86c6aa085a66ffee2a178f4b5e2426cc67ca90b 10-Nov-2011 Chih-Chung Chang <chihchung@google.com> Fix 5548567: Don't play video immediately.

Change-Id: I30e9ebf7461e12250e1ef240c157e7f59b1ce2a1
pp/AlbumPage.java
108667b88ed4046556e967fcb9541fa9efd7c606 09-Nov-2011 Ray Chen <raychen@google.com> Fix 5213252 [UI] Updated action bar layouts and action orders

Change-Id: I798a86ed1f6883af1ea3cd3e9c67a6603d0273cc
pp/AbstractGalleryActivity.java
f963bc2a7c86512e0414132f39702a124298edcf 10-Nov-2011 Yuli Huang <yuli@google.com> Fix b/5518211 by disabling effects when photo cannot be loaded.

Change-Id: I9e5ae9cfaf9bee52cd63a0e77a3b083e47b59335
hotoeditor/EffectsBar.java
hotoeditor/PhotoEditor.java
hotoeditor/SpinnerProgressDialog.java
30ba9e029978705598b4cf2427b5d21a4c608e53 10-Nov-2011 Ray Chen <raychen@google.com> Merge "Fix 5453262 No pictures / Videos available in Gallery message not displayed"
26c6002bd211cf85b1049bcb6b26006a1496ac36 10-Nov-2011 Yuli Huang <yuli@google.com> am 8cfe549a: Fix b/5587210: Add file extension to display-name.

* commit '8cfe549a3c6e50653ce50cedf90e8463d641987d':
Fix b/5587210: Add file extension to display-name.
af92c5100158fe39cca21abb76ca685bfe106eeb 10-Nov-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5585254: Make system UI enter "low profile mode" while playing." into ics-mr1
5ba2576ddcc315822100bdd904ea42a6bebce9e3 10-Nov-2011 Yuli Huang <yuli@google.com> am 90b7a7a1: Fix b/5510870 by persisting states of save/share buttons.

* commit '90b7a7a1fed287cab3500acdfaf4e82ec0a59dec':
Fix b/5510870 by persisting states of save/share buttons.
8cfe549a3c6e50653ce50cedf90e8463d641987d 09-Nov-2011 Yuli Huang <yuli@google.com> Fix b/5587210: Add file extension to display-name.

Change-Id: I7c3522f2532bbce688ee8d4d0403f7314baca481
hotoeditor/SaveCopyTask.java
19df0dc8551b9f363a5592ec07e8e4485ffc92b7 09-Nov-2011 Yuli Huang <yuli@google.com> am 738e82e1: Fix b/5510870 by saving/restoring Activity states.

* commit '738e82e163f90e1fe7aeef8bd153dc7763631f30':
Fix b/5510870 by saving/restoring Activity states.
5383c573055927dfd856c3f360671d1887a971d5 09-Nov-2011 Chih-Chung Chang <chihchung@google.com> Fix 5585254: Make system UI enter "low profile mode" while playing.

Change-Id: I91f680871b7a965f6776cb017dcd825a587e5054
pp/MoviePlayer.java
90b7a7a1fed287cab3500acdfaf4e82ec0a59dec 09-Nov-2011 Yuli Huang <yuli@google.com> Fix b/5510870 by persisting states of save/share buttons.

Change-Id: Ida5c2868199b75a1a710ee5b92e0e3dffd71cec6
hotoeditor/FilterStack.java
hotoeditor/PhotoEditor.java
3b26a14acaa3f3206815123e02b18a4144cfec8c 09-Nov-2011 Ray Chen <raychen@google.com> Fix 5453262 No pictures / Videos available in Gallery message not displayed

Change-Id: Ib6c8691e4206f9d6a07a7587d22a67c1a21bc5a5
pp/AlbumSetPage.java
1ece82dacd5f2a527bb89a637d860332d27c78df 08-Nov-2011 Yuli Huang <yuli@google.com> am 13105e73: Merge "Add face tanning effect to gallery" into ics-mr1

* commit '13105e73298f7ed0031232d48a7cf43ac4c0d21f':
Add face tanning effect to gallery
738e82e163f90e1fe7aeef8bd153dc7763631f30 04-Nov-2011 Yuli Huang <yuli@google.com> Fix b/5510870 by saving/restoring Activity states.

1. Filters implement Parcelable for saving/restoring states.
2. Extract Doodle for making doodling paths parcelable.

Change-Id: Ice8e6e068891da8a8f9251e62d95ea755fa99933
hotoeditor/FilterStack.java
hotoeditor/PhotoEditor.java
hotoeditor/actions/ColorTemperatureAction.java
hotoeditor/actions/Doodle.java
hotoeditor/actions/DoodleAction.java
hotoeditor/actions/DoodlePaint.java
hotoeditor/actions/DoodleView.java
hotoeditor/actions/FillLightAction.java
hotoeditor/actions/HighlightAction.java
hotoeditor/actions/SaturationAction.java
hotoeditor/actions/ShadowAction.java
hotoeditor/actions/SharpenAction.java
hotoeditor/filters/AbstractScaleFilter.java
hotoeditor/filters/AutoFixFilter.java
hotoeditor/filters/ColorTemperatureFilter.java
hotoeditor/filters/CropFilter.java
hotoeditor/filters/CrossProcessFilter.java
hotoeditor/filters/DocumentaryFilter.java
hotoeditor/filters/DoodleFilter.java
hotoeditor/filters/DuotoneFilter.java
hotoeditor/filters/FaceTanFilter.java
hotoeditor/filters/FaceliftFilter.java
hotoeditor/filters/FillLightFilter.java
hotoeditor/filters/Filter.java
hotoeditor/filters/FilterCreator.java
hotoeditor/filters/FisheyeFilter.java
hotoeditor/filters/FlipFilter.java
hotoeditor/filters/GrainFilter.java
hotoeditor/filters/GrayscaleFilter.java
hotoeditor/filters/HighlightFilter.java
hotoeditor/filters/LomoishFilter.java
hotoeditor/filters/NegativeFilter.java
hotoeditor/filters/PosterizeFilter.java
hotoeditor/filters/RedEyeFilter.java
hotoeditor/filters/RotateFilter.java
hotoeditor/filters/SaturationFilter.java
hotoeditor/filters/SepiaFilter.java
hotoeditor/filters/ShadowFilter.java
hotoeditor/filters/SharpenFilter.java
hotoeditor/filters/StraightenFilter.java
hotoeditor/filters/TintFilter.java
hotoeditor/filters/VignetteFilter.java
13105e73298f7ed0031232d48a7cf43ac4c0d21f 08-Nov-2011 Yuli Huang <yuli@google.com> Merge "Add face tanning effect to gallery" into ics-mr1
ebcdca0c0d2a98705600f5bcc736d64e96a906e7 07-Nov-2011 Chih-Chung Chang <chihchung@google.com> am d6985f9b: Fix 5457600: In UriImage, read exif to determine orientation.

* commit 'd6985f9ba58c11c29760f28be07ebd229a9b7a39':
Fix 5457600: In UriImage, read exif to determine orientation.
d6985f9ba58c11c29760f28be07ebd229a9b7a39 24-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5457600: In UriImage, read exif to determine orientation.

Change-Id: Iacc5c52747a4ed4dd8f6cab48ce784aff907525b
ata/Exif.java
ata/UriImage.java
i/AbstractDisplayItem.java
08e2b473e93199241e432fc28cc8b8af242019cb 14-Oct-2011 Ruei-sung Lin <rslin@google.com> Add face tanning effect to gallery

bug: 5453164

Change-Id: I259e80325854b9e4a2d2c93db74b306b8e15535c
hotoeditor/actions/FaceTanAction.java
hotoeditor/filters/FaceTanFilter.java
07b88daac3a120fdbbf893b3da4a0a27ebf00aaa 03-Nov-2011 Wei Huang <weih@google.com> am 529f5341: Merge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1

* commit '529f53415f34835a32105a73a23f7aa94c5a7e16':
Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B.
529f53415f34835a32105a73a23f7aa94c5a7e16 03-Nov-2011 Wei Huang <weih@google.com> Merge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1
9c6cc3247c5d22d70c716ac5627f0d53222779fa 03-Nov-2011 Chih-Chung Chang <chihchung@google.com> am cc2f8c4e: Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1

* commit 'cc2f8c4e24a9cd8fcf99e960f0148a57128b6133':
Fix 5543077: Gallery UI tweaks.
cc2f8c4e24a9cd8fcf99e960f0148a57128b6133 03-Nov-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1
acfc53ba3422e1c78e3c78c47b3fe94681126037 03-Nov-2011 Chih-Chung Chang <chihchung@google.com> am 1a9b69fb: Merge "3252698: Make drawing target 60fps." into ics-mr1

* commit '1a9b69fbc17263e00aa138dde0c52b37fab6766b':
3252698: Make drawing target 60fps.
1a9b69fbc17263e00aa138dde0c52b37fab6766b 03-Nov-2011 Chih-Chung Chang <chihchung@google.com> Merge "3252698: Make drawing target 60fps." into ics-mr1
47c476d3102e15ec4c8307d424adf6c54982d5f3 03-Nov-2011 Chih-Chung Chang <chihchung@google.com> Fix 5543077: Gallery UI tweaks.

Change-Id: I0b85b37ba851628acd0853e4de0985b494606487
i/ManageCacheDrawer.java
e2f9aaf5fa564decd9ad9a1e95ac48c6d9e5d447 03-Nov-2011 Ray Chen <raychen@google.com> am eda8303b: Merge "Fix 5511057 Action bar UI is broken when sorting within an album" into ics-mr1

* commit 'eda8303bebf12f60edf15a2abbc08b99a7c35eef':
Fix 5511057 Action bar UI is broken when sorting within an album
eda8303bebf12f60edf15a2abbc08b99a7c35eef 03-Nov-2011 Ray Chen <raychen@google.com> Merge "Fix 5511057 Action bar UI is broken when sorting within an album" into ics-mr1
506200619672fa8221b98d50efbe77c777fae3e9 03-Nov-2011 Ray Chen <raychen@google.com> Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B.

Change-Id: Ia3de43eae5d96c9f1674dd1ccb01dc004612bda9
pp/SlideshowPage.java
6849ca0eb9c29c7e57c77bfede6363cbdfbea892 02-Nov-2011 Chih-Chung Chang <chihchung@google.com> 3252698: Make drawing target 60fps.

Change-Id: I5dbff93713422e49378b8e215cac8b7f749ef38a
i/GLRootView.java
5673af6e9f89a910ad7a0f562c2ded098203c1cf 03-Nov-2011 Owen Lin <owenlin@google.com> am a98d3c4d: Merge "Add cover image to MediaSet." into ics-mr1

* commit 'a98d3c4dbed84296496f5f710bd1289d735581d5':
Add cover image to MediaSet.
a98d3c4dbed84296496f5f710bd1289d735581d5 03-Nov-2011 Owen Lin <owenlin@google.com> Merge "Add cover image to MediaSet." into ics-mr1
a368e458166dd853c8df956e6b4f8b3f38d3183d 02-Nov-2011 Ray Chen <raychen@google.com> am c0c13c38: Merge "Fix 5471518 Playing slide show from any picture doesn\'t start from the current picture which is unexpected IRL17 Crespo" into ics-mr1

* commit 'c0c13c38c8e4e86689f4989ca268f71cbb46bff0':
Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo
ed4f65b58d6214e6fe552c027a8a702196c20327 02-Nov-2011 Chih-Chung Chang <chihchung@google.com> am 6fb1ddf5: Merge "Fix 5533861: Correct the thumbnail area hit testing calculation." into ics-mr1

* commit '6fb1ddf56809a3eedfc36cb4c2ea56e0010bbaba':
Fix 5533861: Correct the thumbnail area hit testing calculation.
c0c13c38c8e4e86689f4989ca268f71cbb46bff0 02-Nov-2011 Ray Chen <raychen@google.com> Merge "Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo" into ics-mr1
9b68d53adfeb3a52c50375834e7f8b75b52eed8b 02-Nov-2011 Ray Chen <raychen@google.com> Merge "Fix 5453262 No pictures / Videos available in Gallery message not displayed"
9ce0381a975f65ec7794a2d3436b0424d0030f39 27-Oct-2011 Owen Lin <owenlin@google.com> Add cover image to MediaSet.

fix: 5519437
So that subclass can has its own definition on albums' cover.

Change-Id: Idf2f89933291bedf02054b9488acffe4bd68b1b3
pp/AlbumSetDataAdapter.java
ata/MediaSet.java
003328e9d121b31fec76e3599300931bb356e1bd 31-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5533861: Correct the thumbnail area hit testing calculation.

Change-Id: I3a9229497c955628cb49c42c0ee02c41eaadd705
i/SlotView.java
604f053d040782159b61d3b74ee533bc2c0ccdd0 21-Oct-2011 Ray Chen <raychen@google.com> Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo

Change-Id: I2ed78cee2f6257254794a7724897845c43a3e0a5
pp/PhotoPage.java
pp/SlideshowDataAdapter.java
pp/SlideshowPage.java
9c21268fa8d394cca6cab78dd023a52e0b147a6e 26-Oct-2011 Ray Chen <raychen@google.com> Fix 5511057 Action bar UI is broken when sorting within an album

Change-Id: I1b2d22b2fae8b20f03a761696ba1e2c5665d282b
pp/AlbumSetPage.java
8d79d7aef57ab2a6fd3fa878baf8609905abdff4 27-Oct-2011 Chih-Chung Chang <chihchung@google.com> am 25a329cf: Fix 5516359: Not able to share video to YouTube when the video is playing.

* commit '25a329cfd7e055dd7c8ce69532aefe9a69ee4d75':
Fix 5516359: Not able to share video to YouTube when the video is playing.
25a329cfd7e055dd7c8ce69532aefe9a69ee4d75 27-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5516359: Not able to share video to YouTube when the video is playing.

YouTube needs a content URI to share.

Change-Id: I7088c11d9d5a0b97bbb6de4ca72d4cc097f9a03c
ata/LocalVideo.java
d0817e2d5027e71a99c8e0e9186c261f414d821c 26-Oct-2011 Yuli Huang <yuli@google.com> am b1ac0614: am f66bd12b: Fix b/5501285 by ensuring bitmap in ARGB8888 format.

* commit 'b1ac0614afa725aa1bd759fb681d853983b2f1fb':
Fix b/5501285 by ensuring bitmap in ARGB8888 format.
b1ac0614afa725aa1bd759fb681d853983b2f1fb 26-Oct-2011 Yuli Huang <yuli@google.com> am f66bd12b: Fix b/5501285 by ensuring bitmap in ARGB8888 format.

* commit 'f66bd12b33e0d590e192a3551e9affc55eef9a48':
Fix b/5501285 by ensuring bitmap in ARGB8888 format.
f66bd12b33e0d590e192a3551e9affc55eef9a48 26-Oct-2011 Yuli Huang <yuli@google.com> Fix b/5501285 by ensuring bitmap in ARGB8888 format.

Change-Id: I48ece547543207ba92276962fc6131859f615313
hotoeditor/BitmapUtils.java
a425add4954b722e3913005c9045325a163a0c6b 26-Oct-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 4083882: When scrolling repeatedly, the Gallery jumps."
80d8fe095a0c5c5a8d0690752e1989ebfa7ecbb9 25-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 4083882: When scrolling repeatedly, the Gallery jumps.

Change-Id: I1d69330c54d94e3f8917fa8e502cb5c244628a15
i/ScrollerHelper.java
6caf221c4888f8632e8eb5b60b145bfca3557b3a 24-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5454748: Localize hardcoded folder names.

Change-Id: I91586d6f707a0352be6be524e848bd2c2dacab7e
ata/LocalAlbum.java
til/MediaSetUtils.java
4d635443afff910611ffa84ff8f84d5eff5e33fa 21-Oct-2011 Ray Chen <raychen@google.com> Fix 5453262 No pictures / Videos available in Gallery message not displayed

Change-Id: Ia4c03d4f4a89ebaa2534720d8a679243fbf81d52
pp/AlbumSetPage.java
2dc016ea45e354b8d96f7571a90c98d1188dc445 20-Oct-2011 Yuli Huang <yuli@google.com> am 7b62f488: Fix b/5401109.

* commit '7b62f4889a95406a00a4a5f25ef15f01322607eb':
Fix b/5401109.
7b62f4889a95406a00a4a5f25ef15f01322607eb 20-Oct-2011 Yuli Huang <yuli@google.com> Fix b/5401109.

1. Add FlipView similar to existing RotateView.
2. Add flipPhoto() similar to existing rotatePhoto() in PhotoView, and
add setRenderToFlip() in RendererUtils.
3. Make FlipAction use FlipView/PhotoView similar to how RotateAction
uses RotateView/PhotoView.

Change-Id: I5642266adbc248c0b8eda48ddc29558ae9cbd21e
hotoeditor/PhotoView.java
hotoeditor/RendererUtils.java
hotoeditor/actions/EffectToolFactory.java
hotoeditor/actions/FlipAction.java
hotoeditor/actions/FlipView.java
hotoeditor/actions/RotateAction.java
hotoeditor/actions/RotateView.java
hotoeditor/actions/StraightenAction.java
dba62bd578151ed135f7455cb26dd8126d0926f3 20-Oct-2011 Owen Lin <owenlin@google.com> am a77f6c46: Fix the issue that cropping wrong region for protrait image.

* commit 'a77f6c46815195c8a2a39c9539163ea3e8683b5d':
Fix the issue that cropping wrong region for protrait image.
a77f6c46815195c8a2a39c9539163ea3e8683b5d 19-Oct-2011 Owen Lin <owenlin@google.com> Fix the issue that cropping wrong region for protrait image.

Change-Id: Iea7a3874eb7170f8cae943c00cf92669a92b0ae2
fix: 5470203
pp/CropImage.java
a67a9bc86f1e1029fd69724480ab7e15e766f1f8 19-Oct-2011 Ray Chen <raychen@google.com> am c0ba0936: Fix 5418759 User should be able to view only the preview of that attached

* commit 'c0ba0936bac7d56b92a409380c4d378ed2c272b0':
Fix 5418759 User should be able to view only the preview of that attached
c0ba0936bac7d56b92a409380c4d378ed2c272b0 19-Oct-2011 Ray Chen <raychen@google.com> Fix 5418759 User should be able to view only the preview of that attached

Change-Id: Ie3eb2583f7753fc38db3d59aca544a95112010c7
pp/Gallery.java
e2c46afe6fb2ae2424f8440fc1af374b894a91a5 19-Oct-2011 Wei Huang <weih@google.com> am 6172a060: Merge "Fix a IllegalArgumentException in Gallery 0 not in (0, 0)" into ics-mr0

* commit '6172a060689e424ad089594abd5ef1761f6f2ed3':
Fix a IllegalArgumentException in Gallery 0 not in (0, 0)
6172a060689e424ad089594abd5ef1761f6f2ed3 19-Oct-2011 Wei Huang <weih@google.com> Merge "Fix a IllegalArgumentException in Gallery 0 not in (0, 0)" into ics-mr0
655a9133b682752a9611bd1d1c6709eda1dedc1f 19-Oct-2011 Chih-Chung Chang <chihchung@google.com> am d82ac818: Merge "Fix 5424444: Add code to save cropped image for non-local, non-picasa cases." into ics-mr0

* commit 'd82ac818b88f0755d0515b282445ac1752976140':
Fix 5424444: Add code to save cropped image for non-local, non-picasa cases.
fbfa73361299c5a2284a5aaae8c2b824fd493cd9 19-Oct-2011 Chih-Chung Chang <chihchung@google.com> am bd47a5c6: Fix 5352588: Accept view intent without URI.

* commit 'bd47a5c6bcdcb127adb13c454fec00d4989c50b6':
Fix 5352588: Accept view intent without URI.
ec3e885cfd25d02b3d140258e0c439811c5bd9b6 19-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5424444: Add code to save cropped image for non-local, non-picasa cases.

Change-Id: Ib9f780f71fc9c50fa68a03ebb49f1bd007ca333d
pp/CropImage.java
bd47a5c6bcdcb127adb13c454fec00d4989c50b6 18-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5352588: Accept view intent without URI.

Change-Id: I719fd853b66c05c4fdbe70ff97993b9487997694
pp/Gallery.java
til/GalleryUtils.java
7204500d76ecb297df6df81509ce9258f8e50038 18-Oct-2011 Yuli Huang <yuli@google.com> am 07a3b570: Merge "Fix b/5403449." into ics-mr0

* commit '07a3b57049665faf56f2c65b3310143a4ef464e7':
Fix b/5403449.
07a3b57049665faf56f2c65b3310143a4ef464e7 18-Oct-2011 Yuli Huang <yuli@google.com> Merge "Fix b/5403449." into ics-mr0
7414809287319140eca0bb89e691141f198eb171 18-Oct-2011 Wei Huang <weih@google.com> am 40ac84e6: Merge "Fix NPE while flipping through pictures." into ics-mr0

* commit '40ac84e663e89a25540751075db1ff597124de66':
Fix NPE while flipping through pictures.
f9c4464d8aa366e9c7dc91493fcd8bfe2084277a 18-Oct-2011 Chih-Chung Chang <chihchung@google.com> am 209a9163: Fix 5393669: New Player Control UI.

* commit '209a9163d4e8cee0bfe162ae598ef40e6051479c':
Fix 5393669: New Player Control UI.
40ac84e663e89a25540751075db1ff597124de66 18-Oct-2011 Wei Huang <weih@google.com> Merge "Fix NPE while flipping through pictures." into ics-mr0
dd46fe623b16ba14c70a539b7599cc75c7799612 18-Oct-2011 Owen Lin <owenlin@google.com> Fix a IllegalArgumentException in Gallery 0 not in (0, 0)

fix: 5379253

We add a hack to prevent flush out cached data. But the hack will leave
the content window in an invalid values.

Change-Id: I3ed1527b9ee9023b07ca44cafc27510ef9f08d59
i/AlbumSetSlidingWindow.java
i/AlbumSetView.java
i/AlbumSlidingWindow.java
i/AlbumView.java
1b2cfc142830875991dd190f163ad14af66d9e11 18-Oct-2011 Owen Lin <owenlin@google.com> Fix NPE while flipping through pictures.

Add a DECODE_FAIL state to Tile's lifecycle.

fix: 5376092

Change-Id: I26ff946d5435f12a6ee84c80f07255cf8327ef32
i/TileImageView.java
i/TileImageViewAdapter.java
b5c54b675f6216659b04904661e39dc1b84cb403 17-Oct-2011 Yuli Huang <yuli@google.com> Fix b/5403449.

1. Extract code that recreates/restores ActionBar as RestorableView, and
make both ActionBar and EffectsMenu extend RestorableView.
2. Fix effects-menu buttons too close to each other.
3. Remove effects-menu buttons' highlight animations to look more
responsive.

Change-Id: I68e5bdcde702e611ccced5e169852c0e58a949fc
hotoeditor/ActionBar.java
hotoeditor/EffectsBar.java
hotoeditor/EffectsMenu.java
hotoeditor/PhotoEditor.java
hotoeditor/RestorableView.java
209a9163d4e8cee0bfe162ae598ef40e6051479c 14-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5393669: New Player Control UI.

Change-Id: I1aa310eee3b7715dbefea6b2f24e6f32481db49c
pp/ControllerOverlay.java
pp/MovieActivity.java
pp/MovieControllerOverlay.java
pp/MoviePlayer.java
pp/TimeBar.java
5d393ac4b272131104b1ffe9a04e84022e63c0f0 14-Oct-2011 Chih-Chung Chang <chihchung@google.com> am b289d441: Fix 5398768: Add requestCreateBitmapRegionDecoder for InputStream.

* commit 'b289d441eb5af97ac8716479831b1a2c5fe2e878':
Fix 5398768: Add requestCreateBitmapRegionDecoder for InputStream.
b289d441eb5af97ac8716479831b1a2c5fe2e878 14-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5398768: Add requestCreateBitmapRegionDecoder for InputStream.

Change-Id: Ied273ffbabc134fdd930e6415fc175a6221eb662
ata/DecodeUtils.java
8c4db782ebc7b8132b474844589936f547b09368 13-Oct-2011 Yuli Huang <yuli@google.com> am 85bc435c: Fix UI.

* commit '85bc435c06ace72f5da72475e9b03b0ada9455e0':
Fix UI.
85bc435c06ace72f5da72475e9b03b0ada9455e0 13-Oct-2011 Yuli Huang <yuli@google.com> Fix UI.

1. Replace slider assets on tablets.
2. Add face-tan effect icon.
3. Change orange color to blue color in straighten effect to be
consistent with crop effect.

Change-Id: I073dea539d68d2a3d7782a520daa911879bc41cd
hotoeditor/actions/CropView.java
hotoeditor/actions/RotateView.java
9170edf4071e0ef4a64e9af579a1e711447cfcfc 06-Oct-2011 Ray Chen <raychen@google.com> Fix 5417248 Gallery shows Details for the same video no matter which is selected

Change-Id: If221ac3d22adfd3a47d98923dab5c4c1e5ca263d
pp/AlbumPage.java
9eaa4fc0a3d5a60e46016269339ecffc8ac320d3 13-Oct-2011 Chih-Chung Chang <chihchung@google.com> am 532d93ca: Fix 5254974: Add EdgeEffect for PhotoView.

* commit '532d93caddc91a7aa33ca113adbc0b8255d498eb':
Fix 5254974: Add EdgeEffect for PhotoView.
de10b42515a230df7cc324ad66dd863ad0f93e3d 13-Oct-2011 Ray Chen <raychen@google.com> Merge "Fix 5434523 No affordance in Gallery to share a video other than long-press in album view"
532d93caddc91a7aa33ca113adbc0b8255d498eb 12-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5254974: Add EdgeEffect for PhotoView.

Change-Id: Ib9ea8fff14a932e8ec25c3f272fe0539776bb062
i/EdgeEffect.java
i/EdgeView.java
i/FilmStripView.java
i/FlingScroller.java
i/GLCanvasImpl.java
i/PhotoView.java
i/PositionController.java
1de36a558a9ccb5ce798a9a0adb68601ba6e1a08 13-Oct-2011 Ray Chen <raychen@google.com> Merge "Fix 5413911 Gallery app does not recognize that no files are selected for delete"
da86dd40880feee9167de5899b2144e4bc826425 12-Oct-2011 Yuli Huang <yuli@google.com> am eb83d83d: Fix b/5392171 and b/5389281.

* commit 'eb83d83d8ce6e5b7ff7a99a5da738f251bae0f21':
Fix b/5392171 and b/5389281.
eb83d83d8ce6e5b7ff7a99a5da738f251bae0f21 11-Oct-2011 Yuli Huang <yuli@google.com> Fix b/5392171 and b/5389281.

1. Fix b/5392171 by moving effect context creation into Filter to make
sure it'd be created when needed.
2. Revise the fix for b/5389281 by clearing surface background even
there's no photo.

Change-Id: I212a552291c7df28b75a909bf6560634ba061e9f
hotoeditor/FilterStack.java
hotoeditor/PhotoView.java
hotoeditor/RendererUtils.java
hotoeditor/filters/Filter.java
7721c70a25e2984940ed6d2044ba74df59f1f08f 11-Oct-2011 Wei Huang <weih@google.com> Merge "Fix 5421152 [UI] Selecting "Posts - <username>" as an album for Gallery widget fails"
26f894d2785b7e0ada5f86f45e7ed6f055829b46 11-Oct-2011 Yuli Huang <yuli@google.com> Merge "Fix b/5433856 and b/5433907."
ad790f2e24837eca6cc6e2b3622f32b3a750c74b 11-Oct-2011 Ray Chen <raychen@google.com> Fix 5421152 [UI] Selecting "Posts - <username>" as an album for Gallery widget fails

Change-Id: I32722ad2d5f83bb180baceeb887f1cf216eaf692
ata/ComboAlbum.java
377b06525ef4e6028919a57383278e0fd07de1ea 10-Oct-2011 Ray Chen <raychen@google.com> Fix 5199444 In crop interface, check button and X button should be switched
Fix 5424781 Two "Tick mark" and "OK" option shows together in crop picture screen in Crespo IRL06.
Fix some other UI issues. (HOME_UP)

Change-Id: Idfa5a258af17b22f13a238cee63a43f3abff776b
pp/CropImage.java
e6e4beb069778fafd053552287e36304df5626eb 11-Oct-2011 Ray Chen <raychen@google.com> Fix 5434523 No affordance in Gallery to share a video other than long-press in album view

Change-Id: I99361fa209ee5ba4200ccb8c1708f649c04519c2
pp/MovieActivity.java
e0e82f1de7396645244e475e1423e2f5fe518630 09-Oct-2011 Yuli Huang <yuli@google.com> Fix b/5433856 and b/5433907.

1. Make PhotoView restore rotation after the device awakes or
the orientation changes.
2. Avoid outputting top filter until the active effect requests its
output to fix incorrect Crop/Rotate/Doodle effects after device awakes.
3. Speed up rotation speed by removing queued outdated rotation.

Change-Id: I5b82ccfe4e27ad5f1d2505bdd7a7540e0a77b55d
hotoeditor/FilterStack.java
hotoeditor/Photo.java
hotoeditor/PhotoView.java
hotoeditor/actions/RotateAction.java
57cbaa1ef40d2215c6400f5ae4af3a09e67abb2d 30-Sep-2011 Hung-ying Tyan <tyanh@google.com> Request sync when there's no mediaItem in a mediaSet.

This is to fix the problem where media items haven't been sync'ed when the album
set or album is viewed for the first time.

+ Add MediaSet.SyncListener.
+ Make AlbumPage and AlbumSetPage implement SyncListener.
+ Implement requestSync() for ComboAlbum and ComboAlbumSet.
+ add ActivityState.isDestroyed(). This also fixes the problem where
StateManager.finishState() may be called twice.

Bug: 5337899
Change-Id: I25364c3ac25721a2650701c5d7931bfb6daa9303
pp/ActivityState.java
pp/AlbumDataAdapter.java
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/StateManager.java
ata/ComboAlbum.java
ata/ComboAlbumSet.java
ata/MediaSet.java
ccc57bf8ea5daf90ddcab779fb80ff4b005f5d92 07-Oct-2011 Ray Chen <raychen@google.com> Merge "Fix 5343229 Location displayed as co-ordinates in details of picture captured from camera"
ce6c184be522a99661c5279a403a1f1f3dfcb8f0 07-Oct-2011 Ray Chen <raychen@google.com> Merge "Fix 5250813 Use new standardized no account screen on first launch"
0c1f2c80818a0326fa55e6f709b49584ceab60b1 05-Oct-2011 Ray Chen <raychen@google.com> Fix 5413911 Gallery app does not recognize that no files are selected for delete

Change-Id: I90efb3d7676a0810025dd37890c1251725a48223
i/ActionModeHandler.java
i/MenuExecutor.java
f2ff1ad51c57308f282473f7b9e47c454172bfca 06-Oct-2011 Yuli Huang <yuli@google.com> Replace slider assets and fix save-share-button height.

1. Use the same slider asset for both fill-light and highlights.
2. Update slider assets and dimensions.
3. Fix save-share-button height didn't fill action-bar.

Change-Id: I6b3a735c8f745084b89b1d6a035c7ed9bd4ff287
hotoeditor/actions/EffectToolFactory.java
hotoeditor/actions/FillLightAction.java
hotoeditor/actions/HighlightAction.java
7051cc97f1098ff9c23ed02e0b6fe2088c8d1e98 06-Oct-2011 Yuli Huang <yuli@google.com> Merge "Fix b/5413887 and b/5389281."
b5bc8833b142985652a0438ae7d64ff5477b590e 04-Oct-2011 Ray Chen <raychen@google.com> Fix 5343229 Location displayed as co-ordinates in details of picture captured from camera

Change-Id: I223b69a3e10fe85a4622cf33110414cd14624f36
i/DetailsAddressResolver.java
i/DialogDetailsView.java
dbf4ba12afba115888493caa34937643257e2bb1 04-Oct-2011 Ray Chen <raychen@google.com> Fix 5250813 Use new standardized no account screen on first launch

This CL also fixes a bug in AlbumSetDataAdapter's ReloadTask, which
causes empty screen after pause/resume.

Change-Id: I7991d40a790384105ccb3021e1e51ba3e5ec8635
pp/AlbumSetDataAdapter.java
pp/AlbumSetPage.java
pp/Gallery.java
i/AlbumSetSlidingWindow.java
i/AlbumSetView.java
i/SlotView.java
d19dcdd76f07cf3c390a7645420dd76f8f45a3f7 05-Oct-2011 Wei Huang <weih@google.com> Merge "Use merged album as the default parent set for an local media."
f2b749843e726866e4c3da77f000257a9add1144 05-Oct-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5319007: Add fling to PhotoView."
b3aab90bb37aa9cc60be32e05678ee55d6575ee8 03-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5319007: Add fling to PhotoView.

Change-Id: Iacda65fbe1fcb3ad245ad99e0b062606ca6792b9
i/FlingScroller.java
i/PhotoView.java
i/PositionController.java
9819424cbf0c21b50f4fefdd3472f543eec48d18 05-Oct-2011 Owen Lin <owenlin@google.com> Use merged album as the default parent set for an local media.

Change-Id: I36062cc1ea06ec9d2eb05e74157f4a071484a8a7
fix: 5141166
ata/LocalSource.java
c7e39d12860adf99a12c6b47e9aaa9d7ae098307 05-Oct-2011 Yuli Huang <yuli@google.com> Fix b/5413887 and b/5389281.

1. Fix b/5413887 by releasing MFF effects as well as release
MFF effect-context.
2. Fix b/5389281 by removing photoView.setPhoto(null).

Change-Id: I1b848f6c87b03ba2539432fd6d6f13f4ac3a2907
hotoeditor/FilterStack.java
hotoeditor/filters/AutoFixFilter.java
hotoeditor/filters/ColorTemperatureFilter.java
hotoeditor/filters/CropFilter.java
hotoeditor/filters/CrossProcessFilter.java
hotoeditor/filters/DocumentaryFilter.java
hotoeditor/filters/DoodleFilter.java
hotoeditor/filters/DuotoneFilter.java
hotoeditor/filters/FaceliftFilter.java
hotoeditor/filters/FillLightFilter.java
hotoeditor/filters/Filter.java
hotoeditor/filters/FisheyeFilter.java
hotoeditor/filters/FlipFilter.java
hotoeditor/filters/GrainFilter.java
hotoeditor/filters/GrayscaleFilter.java
hotoeditor/filters/HighlightFilter.java
hotoeditor/filters/LomoishFilter.java
hotoeditor/filters/NegativeFilter.java
hotoeditor/filters/PosterizeFilter.java
hotoeditor/filters/RedEyeFilter.java
hotoeditor/filters/RotateFilter.java
hotoeditor/filters/SaturationFilter.java
hotoeditor/filters/SepiaFilter.java
hotoeditor/filters/ShadowFilter.java
hotoeditor/filters/SharpenFilter.java
hotoeditor/filters/StraightenFilter.java
hotoeditor/filters/TintFilter.java
hotoeditor/filters/VignetteFilter.java
915d58379336d1c19df77f26336d82def95968de 04-Oct-2011 Yuli Huang <yuli@google.com> Fix b/5032231: Allow share in Photo Editor.

Change-Id: I5fd48243df76fd0c2617c92d7f73936172bf6c47
hotoeditor/ActionBar.java
hotoeditor/PhotoEditor.java
1d536ee817b887da443f296d4360046bdf190c79 04-Oct-2011 Yuli Huang <yuli@google.com> Fix b/5375999: replace effect thumbnails.

1. Replace Doodle/Facelift thumbnails.
2. Adjust effect label margins.
3. Remove unused imports from FaceliftFilter.java.

Change-Id: I9e5f162721455ace62bb30d90301a9c70ff95fdc
hotoeditor/filters/FaceliftFilter.java
676170e619ad59ea97d04e0edcd62b1500304845 30-Sep-2011 Chih-Chung Chang <chihchung@google.com> Simplify some calculation and add more comments.

Change-Id: I0fcb2e48ba88dc957c5454de09059a265c3dbec1
i/PhotoView.java
i/PositionController.java
20cb268c47ce382859c6b3245e71a73e05a629d4 03-Oct-2011 Evan Millar <emillar@google.com> Remove the "Gallery" title from the AlbumSet page.

bug:5239335
Change-Id: Iebe624fe8829cf6f905872caa958ebdc76aaa349
pp/AlbumSetPage.java
fbd9b9f3ad927f2757807abc562dd2f6d3bea126 03-Oct-2011 Evan Millar <emillar@google.com> Merge "Get rid of "flashies" in the action bar."
854b83378e9e69f54a64ecf56259a3b68fefa7a6 03-Oct-2011 Evan Millar <emillar@google.com> Merge "Various UI fixes in Gallery"
486c2ee153d7dad30d80e17fc8c2dd5133b86fb2 03-Oct-2011 Evan Millar <emillar@google.com> Get rid of "flashies" in the action bar.

-Filter out short spinner events. All spinner events that last <1sec are
now ignored. We also enforce a minimum delay time of 2 sec.
-Mark the share and delete menu items as visible="false" by default to
get rid of the quick display/removal of them under scenarios where they
are ultimately removed.

bug:5398336
Change-Id: I0620532f3ab59d9fde46123620eb781a87445b54
til/GalleryUtils.java
til/SpinnerVisibilitySetter.java
ae70ae473dcd674d61c9e6a79afcf57f825f7302 30-Sep-2011 Yuli Huang <yuli@google.com> Fix b/5317371 to make action-bar consistent with framework CAB.

1. Refactor to decouple ActionBar from FilterStackListener and
ActionBarListener to avoid FilterStack/Toolbar depending on ActionBar.
2. Recreate the action-bar on configuration changes and restore button
status and behaviors from the old action-bar.
3. Use framework CAB styles/dimensions to have consistent look and feel.

Change-Id: Ib7be0e0b8135f5f86af65b320f09b3d691464f54
hotoeditor/ActionBar.java
hotoeditor/FilterStack.java
hotoeditor/LoadScreennailTask.java
hotoeditor/PhotoEditor.java
hotoeditor/SaveCopyTask.java
hotoeditor/Toolbar.java
hotoeditor/ToolbarIdleHandler.java
hotoeditor/YesNoCancelDialogBuilder.java
a29127be09f74782dee7d6c18cf6dd50728652aa 30-Sep-2011 Evan Millar <emillar@google.com> Various UI fixes in Gallery

-New assets for grid and strip selection borders.
-Fix spacing in details dialog.
-New scrollbar asset in the strip view.
-Deleted unused ScrollView.java and GlDetailsView.java

bug:5327238
Change-Id: I147b8f8069f42e345110f7ae86c47d331551f089
i/DetailsHelper.java
i/DialogDetailsView.java
i/GLDetailsView.java
i/ScrollBarView.java
i/ScrollView.java
i/StripDrawer.java
d37ff2eef80634dabd2f37ecfe6993ae56efb2d4 19-Sep-2011 Ruei-sung Lin <rslin@google.com> facelift in gallery

Change-Id: I7cb67c3d977d8b23957586bb5ad1dada096ef07b
hotoeditor/actions/FaceliftAction.java
hotoeditor/filters/FaceliftFilter.java
99b1e2bde5a31a729cb4cd536e7064443caef2d8 30-Sep-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5336726: sort local albums by reverse chronological order."
4bdd71bcde93e6f942e2a947a10ee32f63b37828 29-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5336726: sort local albums by reverse chronological order.

Change-Id: I3a04286bea7f43d5f3542b37eddbb4a0801e94f5
ata/LocalAlbumSet.java
2c3c51758a514893280a9ce320f2b280c325897b 29-Sep-2011 Owen Lin <owenlin@google.com> Rotate the image according to FullImageRotation.

Change-Id: I2c1285aa50b71e0efdbe3c4c50264e42c7b9ab97
fix: 5389974
pp/CropImage.java
6c1f01e21406a05dc7d3258001aa901bd8628a79 29-Sep-2011 Chih-Chung Chang <chihchung@google.com> Small UI tweak: only show fade-in animation when the bitmap
has not been available for rendering before.

Change-Id: I57df7911c5afa7aa2eec910d0e21679ed978ddad
i/AlbumSetSlidingWindow.java
i/AlbumSlidingWindow.java
1dee1c625e02138c3f230d951aed7feb6c924080 27-Sep-2011 Michael Jurka <mikejurka@google.com> Change gallery crop interface to be consistent with widget resizing

- Always show the resize controls when you're not touching the UI
- Change the resize controls to the holo style

Change-Id: Ia32235d6d82196a24b26fc78b9e9e1e3fb1f5250
hotoeditor/actions/CropView.java
i/CropView.java
9cf9756e53c883ea3829b106aead60045754b610 28-Sep-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5384679: Back button doesn't work in Video Player"
fbcc99ce6124d486cc9b3b57e67b700357fd0e65 28-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5384679: Back button doesn't work in Video Player

Change-Id: Idde8778fc5643ef21fd4ad39ffbaa3c9e0c7d147
pp/MoviePlayer.java
1a9982e33095c6fd664b5fc4f3e0856bd6326155 28-Sep-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5158468: Hide system bar when no play control is shown."
8176012eeb96bb167ef7c7ba2d02f82b646766f0 27-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5158468: Hide system bar when no play control is shown.

Change-Id: Iada70c39440f19eec1cb00088531719bc1bb8328
pp/MovieActivity.java
pp/MoviePlayer.java
2f5b778e9a5814084e1d5ff191fd02b0149ef568 28-Sep-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5367072: Add thumbnail fade-in animation."
da071d27a1435cce080b5c609d0d833555e5a175 27-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5367072: Add thumbnail fade-in animation.

Change-Id: I1101721c703d6dcb98f11178d54d65446f74ce06
i/AlbumSetSlidingWindow.java
i/AlbumSlidingWindow.java
i/DisplayItem.java
i/FadeInTexture.java
i/GridDrawer.java
i/HighlightDrawer.java
i/IconDrawer.java
i/ManageCacheDrawer.java
i/SelectionDrawer.java
i/SlotView.java
i/StripDrawer.java
i/Texture.java
31fa619bc23f75cd0f2999d4c9a37080ba1b87da 28-Sep-2011 Ray Chen <raychen@google.com> Merge "Fix 5341761 gallery vibrate on confirm delete"
11d854178adcb84563c2b2e4ebe84c26b71ac693 27-Sep-2011 Yuli Huang <yuli@google.com> am fef5b986: Fix b/5287869 (and b/5369640).

* commit 'fef5b9860f0a88fc673af2187938956ebd0ade75':
Fix b/5287869 (and b/5369640).
fef5b9860f0a88fc673af2187938956ebd0ade75 27-Sep-2011 Yuli Huang <yuli@google.com> Fix b/5287869 (and b/5369640).

Images from some app (MMS) may not have columns that PhotoEditor tries
to query, for example: the orientation. Just ignore the absent columns.

Change-Id: I1cda4e32241d9be7819453ede225388c7535c18c
hotoeditor/BitmapUtils.java
hotoeditor/SaveCopyTask.java
1f4e6d14bba7290ea0268fbde28ffc664d4f7004 27-Sep-2011 Ray Chen <raychen@google.com> Fix 5341761 gallery vibrate on confirm delete

Change-Id: I819855f28246c91324ea86ab9e0ac1ec1c19783c
pp/AlbumPage.java
pp/AlbumSetPage.java
i/SelectionManager.java
d4a046c2e1d6aece78a9a503d22eb5aca2243e33 27-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5299746: Update panorama thumbnail overlay.

Change-Id: Ide3e592ad5f697acc6b2ebc2a092044803b82d7b
i/IconDrawer.java
ec4125492f17130f65e49160a17bd437e01128a7 26-Sep-2011 Chih-Chung Chang <chihchung@google.com> Move out PositionController from PhotoView.

Change-Id: Id1088ffbd67ff5e986fdf16f70ba24f1537d10ab
i/PhotoView.java
i/PositionController.java
9025dba35881391c24bdaa88d1ec84d15d722f65 13-Sep-2011 Owen Lin <owenlin@google.com> (DO NOT MERGE)

Add a hard limit on the size of the widget images.

There is a limit on the size of the data transfered by binder.
For now, we just add a hard limit (360 pixel) to ensure the widget's image
can be passed by binder.

Also adjust the size of widget to make it looks better.

Fix a bug in DecodeUtils which cause OOM for a image in size 12200x1920.
In that case, we should generate a screen nail of size 640x101 instead of
4066x640.

Change-Id: Ie42805d9e9e579b063fc99f5130ec433d695b8c9
fix: 5273271
ata/DecodeUtils.java
adget/WidgetConfigure.java
77dcf07756dcf918c56afb0a8f7605577a7ce8e0 26-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5223982: Add animation when scrolling hits the edge.

Change-Id: I3c5191af3fe44ba835ae9b22755613a933065bcd
i/Paper.java
i/ScrollerHelper.java
i/SlotView.java
53eae8b02d2c29534ca74bc5feb2a2d8d7747d08 23-Sep-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5349519: The Select photo/video activity should use action bar."
02e689987f4af3b16b19352b1745478cca964d76 23-Sep-2011 Owen Lin <owenlin@google.com> Fix crop never returns

fix: 5359106

We should return true if the save is successfully.
Also make it more robust even with exceptions.

Change-Id: I4d06b625177d4d479c89a7de1bcdf6f6f301a3da
pp/CropImage.java
3bbf133d949d2b51cce8db22dc0a2be64920c76c 23-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5349519: The Select photo/video activity should use action bar.

Change-Id: Ib537926c780fff6edd60d54c3d28740988d6221b
pp/AlbumPicker.java
pp/DialogPicker.java
pp/PickerActivity.java
1a088db165c138f57d9445ca0b7e50fe90d3ad1d 22-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5223982: Adding one pixel transparent border around the texture.

This avoids the jigged edge around the thumbnails when they are rotated.

Change-Id: Ib2c5a75d1aa69a2f024e003a45111a8af4537f67
i/AlbumSetSlidingWindow.java
i/AlbumSlidingWindow.java
i/BasicTexture.java
i/BitmapTexture.java
i/GLCanvasImpl.java
i/GridDrawer.java
i/HighlightDrawer.java
i/IconDrawer.java
i/SlotView.java
i/UploadedTexture.java
658773fe7151ceacd32c3d853e48086d7ffd2cad 21-Sep-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5229466: Add "up" button to MovieActivity"
4c3719904adf7138cb0686629e341fc9e2b073c8 21-Sep-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5299746: Tweak layout and icons"
bb7d7b94c0454d9549b2c5da2977dcd49c1a3be5 21-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5229466: Add "up" button to MovieActivity

Change-Id: I5d71bec7a7b09553c12afdd753cd77a73ace2c44
pp/MovieActivity.java
fafa06467fd79a1cf525b861ae0372db0b85bf09 21-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5299746: Tweak layout and icons

Change-Id: I36d050fb2459ca559b74be1112b4ac6a8566dc1e
pp/Config.java
pp/ManageCachePage.java
i/ManageCacheDrawer.java
e07d82c4e813b0ea5fd00b76bf9f97e442109593 21-Sep-2011 Yuli Huang <yuli@google.com> Merge "Fix tile-size to sync with the fix in factory branch."
992286cae8c88693228d21a12b9a514c3d932558 20-Sep-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5224359: query width and height from media provider."
b951e3d8b3ef582aa4655384148c00912dd3e75c 20-Sep-2011 Yuli Huang <yuli@google.com> Fix tile-size to sync with the fix in factory branch.

Change-Id: I208529a688d44c439dbf0c4d30e4d99e0631fc08
hotoeditor/filters/Filter.java
cac63ebeb6848920b37ee883ddc22f3e5d1e1d61 20-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5224359: query width and height from media provider.

Change-Id: Ib7a560822a1d1fdc2be8c572d4d9319f908f7c16
ata/LocalImage.java
ata/LocalVideo.java
4a827582bbe6a3c5f1fab0e43ad021c15983474e 20-Sep-2011 Owen Lin <owenlin@google.com> Merge "Lock rendering when switching state."
1ede99728efe8bc622cdafc9d9416bce97d7da50 15-Sep-2011 Ruei-sung Lin <rslin@google.com> parameter change to match api

Cherry-pick to fix b/5339529.

Change-Id: Id84274e60c0feb8019f3418bd1f1feed0542ca51
hotoeditor/filters/DoodleFilter.java
hotoeditor/filters/FillLightFilter.java
hotoeditor/filters/GrainFilter.java
hotoeditor/filters/RotateFilter.java
hotoeditor/filters/VignetteFilter.java
d3a9464bd4983158d20dd79de656ae5daf4070ee 20-Sep-2011 Owen Lin <owenlin@google.com> Merge "Pause the playback of video if the activity is resumed after 3 mins."
bc2154199aee16762e3758ad0cfed685323d9a9f 19-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5299746: New UI layout, part 2.

- Replace various icons and add xhdpi/sw600dp-mdpi versions of them.
- When user press on the thumbnails, show a color overlay on it.
- For a wide (w/h > 2) picture, add panorama overlay on it.
- Align photo count label position when there is no icon for it.
- Adjust offline page layout.

Change-Id: I327d25806e99843bfa05d3ca0e9be5a8f9375595
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/Config.java
pp/ManageCachePage.java
ata/LocalImage.java
ata/LocalVideo.java
ata/MediaItem.java
ata/MtpImage.java
ata/UriImage.java
i/AlbumSetSlidingWindow.java
i/AlbumSetView.java
i/AlbumSlidingWindow.java
i/FilmStripView.java
i/GridDrawer.java
i/HighlightDrawer.java
i/IconDrawer.java
i/ManageCacheDrawer.java
i/SelectionDrawer.java
i/SelectionManager.java
i/SlotView.java
i/StripDrawer.java
til/GalleryUtils.java
3264f438f6787adcb875b2611b5c20c0b833ec5e 19-Sep-2011 Ray Chen <raychen@google.com> Fix 5329642 Gallery crashes when viewing Details on certain photos

AddressResolvingListener (mAdapter) is not set until constructor returns, so NPE is thrown
if the resolving happens really fast. This CL uses 'this' instead of mAdapter.

Change-Id: Ifce0ea92a3eb5c794a73cf0e89a236ff3d948c18
i/DialogDetailsView.java
540e4698824654232f300992ed8c03b20c9d5946 14-Sep-2011 Owen Lin <owenlin@google.com> Pause the playback of video if the activity is resumed after 3 mins.

fix: 5260232

Also keep the current playback position when the activity is resumed.
Originally, we use the bookmark to keep the position. However, the bookmark
will be ignored if

1.) The video duration is less than 2 mins, 2.) The video
is just started (with 30sec), or 3.) The video is approching the end.

I think resume should not limited by the above rules. And we did get some
reports on this. (We mark them as WORK AS INTENTDED).

Change-Id: Ib9ac359d7ccb6a0278777b0892f0821e16bbb745
pp/MovieActivity.java
pp/MoviePlayer.java
5ccc96ac39f9513f13977de4419d814112c23ab8 15-Sep-2011 Owen Lin <owenlin@google.com> Lock rendering when switching state.

fix: 5126875

Change-Id: I118660b80cc5dfa8913865e303ed48f23e1c0705
pp/GalleryActionBar.java
6c8d0fd879242f78a0c1a7daf4c037043663a49f 19-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5337270: Thumbnail is not generated for large GIF images.

Change-Id: I8e2e8cafb01b2289f59b28b7e2eadae3dc5c0c50
ata/DecodeUtils.java
5da31f8fd85d7c1e33133473bd1fbc5e3a240f2d 13-Sep-2011 Owen Lin <owenlin@google.com> Add a hard limit on the size of the widget images.

There is a limit on the size of the data transfered by binder.
For now, we just add a hard limit (360 pixel) to ensure the widget's image
can be passed by binder.

Also adjust the size of widget to make it looks better.

Fix a bug in DecodeUtils which cause OOM for a image in size 12200x1920.
In that case, we should generate a screen nail of size 640x101 instead of
4066x640.

Change-Id: Ia8227d8e5368471fe7af94bf164d67017aa321fa
fix: 5273271
ata/DecodeUtils.java
adget/WidgetConfigure.java
d2ee3f2ac4bf9faed16b8007efe8daf6ef4edcac 19-Sep-2011 Ray Chen <raychen@google.com> Merge "Fix 5329642 Gallery crashes when viewing Details on certain photos"
aa55bf692ec8472a401a3117ab2d4a72abe48ccf 19-Sep-2011 Ray Chen <raychen@google.com> Merge "Fix 5331012 [UI] No dropdown label when entering multi-select modes via menu > Select item(s) / group(s) / album(s)"
924a510c32087410cd8e922a915c0486feb6790d 19-Sep-2011 Ray Chen <raychen@google.com> Fix 5329642 Gallery crashes when viewing Details on certain photos

AddressResolvingListener (mAdapter) is not set until constructor returns, so NPE is thrown
if the resolving happens really fast. This CL uses 'this' instead of mAdapter.

Change-Id: Ifce0ea92a3eb5c794a73cf0e89a236ff3d948c18
i/DialogDetailsView.java
acbab5b17f393e57f7466e5459fed41f518e2864 19-Sep-2011 Ray Chen <raychen@google.com> Merge "Fix 5291553 Not able to share downloaded image file"
9b54e8c645d14748b7dd75e25b4db9e97e3415a9 18-Sep-2011 Ray Chen <raychen@google.com> Fix 5331012 [UI] No dropdown label when entering multi-select modes via menu > Select item(s) / group(s) / album(s)

Change-Id: Ie46432dd136447942011f3565ab7a6406c461887
pp/AlbumPage.java
i/ActionModeHandler.java
b5f8d908c5dd287052cd49eddaf1f82d858cca03 13-Sep-2011 Ray Chen <raychen@google.com> Fix 5239335 ICS Gallery: convert tabs at Gallery home to drop down

Change-Id: I7503f724dbf16034513a6d8d6b0cb0425166a365
pp/AlbumSetPage.java
pp/GalleryActionBar.java
e7117abd9e9b3d5d9616c5387c4ad6402d4a1a58 16-Sep-2011 Chih-Chung Chang <chihchung@google.com> Merge "New UI for Gallery."
cf46a3abc26aac7cdb6b6993aeade053304b71d9 14-Sep-2011 Ray Chen <raychen@google.com> Fix 5291553 Not able to share downloaded image file

Change-Id: I8e57b04e0231c592cc0dfe8a4f31e585510e753c
pp/PhotoPage.java
9201679ed1c485767f2e334aa618bd733024af03 14-Sep-2011 Chih-Chung Chang <chihchung@google.com> New UI for Gallery.

Change-Id: I5f243c00ebac55a9b333a9e13d0cc9c371a85005
pp/AlbumPage.java
pp/AlbumSetDataAdapter.java
pp/AlbumSetPage.java
pp/Config.java
pp/ManageCachePage.java
i/AlbumSetSlidingWindow.java
i/AlbumSetView.java
i/AlbumSlidingWindow.java
i/AlbumView.java
i/DisplayItem.java
i/FilmStripView.java
i/GLDetailsView.java
i/GridDrawer.java
i/HighlightDrawer.java
i/IconDrawer.java
i/ManageCacheDrawer.java
i/MultiLineTexture.java
i/SelectionDrawer.java
i/SlotView.java
i/StringTexture.java
i/StripDrawer.java
cc1621240b297bf0790ba7e375615693220b596c 16-Sep-2011 Ray Chen <raychen@google.com> Merge "Fix 5290260 Unable to rotate left or right to album from Gallery"
deff258ea4e5723b351739418919251ae1048e46 14-Sep-2011 Ray Chen <raychen@google.com> Fix 5290260 Unable to rotate left or right to album from Gallery

Separate menu operation and sharing options to different methods so
execution side is consistent with menu options.

Change-Id: Ia0105b333035051e33e9563fb2186cf1a29bc225
i/ActionModeHandler.java
31aaaa38a75be3b36236ae745d15887d1246a2c5 15-Sep-2011 Ruei-sung Lin <rslin@google.com> parameter change to match api

Change-Id: Ia6df0c3a52ee7c6a499a7088a800a2ea9ada1294
hotoeditor/filters/DoodleFilter.java
hotoeditor/filters/FillLightFilter.java
hotoeditor/filters/Filter.java
hotoeditor/filters/GrainFilter.java
hotoeditor/filters/RotateFilter.java
hotoeditor/filters/VignetteFilter.java
1753ac9e74621f86f92a53115d23362534f08105 15-Sep-2011 Marius Renn <renn@google.com> Update for compatibility with Effects API naming change.

Part of bugfix 5287103.

NOTE: This will fix the build, but temporarily break the Doodle effect
on the photo editor. Will check in fixes later.

Change-Id: I4a0e1696965c296ac9388c2ee9c49c0bdcaaf5a1
hotoeditor/filters/DoodleFilter.java
d3ec7831835a9f656ff72b05a5b3bc01a8c56a4a 14-Sep-2011 Ray Chen <raychen@google.com> Merge "Fix 5288270 PTP camera gallery launch, prompts the user to "select all" instead if "Deselect all""
765dcecfb188b48705939c8b8ffb332ea4c07d2d 14-Sep-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5196286: Crash if the last clustered album is deleted."
e3c968f892585490b938ea2bcef81f8dca4a81f8 10-Sep-2011 Ray Chen <raychen@google.com> Fix 5288270 PTP camera gallery launch, prompts the user to "select all" instead if "Deselect all"

Change-Id: I80bcb347d3d2384e3fd18d2692ab459e0d39e86f
i/ActionModeHandler.java
i/SelectionManager.java
7cf4777f2d6691b5490b7e8df76d154ea5fd8bf7 14-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5196286: Crash if the last clustered album is deleted.

Change-Id: I5e451d3cebd61c31465cba56aebe66cc3a999e2d
pp/AlbumSetDataAdapter.java
a55d51cfa1165bf6233c1b0c713cd2571860c691 14-Sep-2011 Yuli Huang <yuli@google.com> Merge "Fix b/5182741: Add 'Edit' title in the action-bar."
3ff75bc0cc30d621a4c213364efcd62c1f8c5180 14-Sep-2011 Owen Lin <owenlin@google.com> Merge "Use different UIs for phone's portrait mode in manage offline page."
8cb3c51b16dc4aa9aea1a252eb59d6b5cbb33af3 14-Sep-2011 Yuli Huang <yuli@google.com> Fix b/5182741: Add 'Edit' title in the action-bar.

Change-Id: I3964bfcb23818f2f3f8364475f74b401f7eed097
hotoeditor/ActionBar.java
2b40d7c0857117f6276886b9c67bca596886d88c 14-Sep-2011 Owen Lin <owenlin@google.com> Merge "Fix picasa images rotate incorrectly."
8e565703e8d482421714383a8ad40a67929ce2da 09-Sep-2011 Owen Lin <owenlin@google.com> Use different UIs for phone's portrait mode in manage offline page.

fix: 5100503

The original UI design is not suitable for phone's portait mode. I move the
UIs from GL view to android View to get better support.

Change-Id: Ice5f536129f66b51cdaf4db1be750be7bc072c7f
pp/AbstractGalleryActivity.java
pp/ActivityState.java
pp/ManageCachePage.java
pp/StateManager.java
i/CacheBarView.java
i/CacheStorageUsageInfo.java
i/Label.java
i/ProgressBar.java
i/TextButton.java
3a54b9ae67eb7b38f19ea0bdeeef26efc0a1afa1 13-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5280798: Click on filmstrip during swiping causes crash.

After swiping animation finishes we move to the previous
picture. But if during the animation the user clicks the first
thumbnail on the filmstrip, we will have no previous picture
to move to.

Now disallow clicking on the filmstrip during the swiping animation.

Change-Id: Ie910c346cbf35543fedb6812b04c8e78faab0d0f
pp/PhotoPage.java
pp/SinglePhotoDataAdapter.java
i/FilmStripView.java
i/PhotoView.java
6af98c9e0f4125d658b10303a01adef6a5a9e8f1 13-Sep-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5058723: Don't show screennails of videos in slide show"
2cd8cc06b813cd8d55010f91b78e30e096b2681f 13-Sep-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5284804: Kill 3D tilt effect based on device rotation."
78979fc21d1e1111a504cc07ae6b0e0bc4d61447 09-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5058723: Don't show screennails of videos in slide show

Change-Id: I25c3ee3f1ae69c9c54c1e579a6469ee20f1774be
pp/SlideshowDataAdapter.java
pp/SlideshowPage.java
fd06154c0d51fd8686ffec3955e54f5c18e87da0 13-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5284804: Kill 3D tilt effect based on device rotation.

Change-Id: Ic8a81d591e42fc97b6ca8eca2b6c66cd90f74cdc
pp/EyePosition.java
6a12ad70df5da5052a8381e2cdda79e6a314cee9 12-Sep-2011 Yuli Huang <yuli@google.com> Fix b/4643148: Make PhotoEditor integrated into Gallery.

1. Move PhotoEditor code/resources into Gallery for single apk.
2. Change PhotoEditor package to com.android.gallery3d.photoeditor.
3. Rename PhotoEditor resources to avoid mess up Gallery resources.
4. Move Doodle effect from fix-effects to color-effects.
5. Update PhotoEditor bottom action-bar background.

Change-Id: I1a2f7d27d89a14fe6a0435575b993ed8b75e6bf4
hotoeditor/ActionBar.java
hotoeditor/BitmapUtils.java
hotoeditor/EffectsBar.java
hotoeditor/FilterStack.java
hotoeditor/LoadScreennailTask.java
hotoeditor/OnDoneBitmapCallback.java
hotoeditor/OnDoneCallback.java
hotoeditor/Photo.java
hotoeditor/PhotoEditor.java
hotoeditor/PhotoView.java
hotoeditor/RendererUtils.java
hotoeditor/SaveCopyTask.java
hotoeditor/SpinnerProgressDialog.java
hotoeditor/Toolbar.java
hotoeditor/ToolbarIdleHandler.java
hotoeditor/actions/AbstractSeekBar.java
hotoeditor/actions/AutoFixAction.java
hotoeditor/actions/ColorSeekBar.java
hotoeditor/actions/ColorTemperatureAction.java
hotoeditor/actions/CropAction.java
hotoeditor/actions/CropView.java
hotoeditor/actions/CrossProcessAction.java
hotoeditor/actions/DocumentaryAction.java
hotoeditor/actions/DoodleAction.java
hotoeditor/actions/DoodlePaint.java
hotoeditor/actions/DoodleView.java
hotoeditor/actions/DuotoneAction.java
hotoeditor/actions/EffectAction.java
hotoeditor/actions/EffectToolFactory.java
hotoeditor/actions/FillLightAction.java
hotoeditor/actions/FisheyeAction.java
hotoeditor/actions/FlipAction.java
hotoeditor/actions/FullscreenToolView.java
hotoeditor/actions/GrainAction.java
hotoeditor/actions/GrayscaleAction.java
hotoeditor/actions/HighlightAction.java
hotoeditor/actions/LomoishAction.java
hotoeditor/actions/NegativeAction.java
hotoeditor/actions/PosterizeAction.java
hotoeditor/actions/RedEyeAction.java
hotoeditor/actions/RotateAction.java
hotoeditor/actions/RotateView.java
hotoeditor/actions/SaturationAction.java
hotoeditor/actions/ScaleSeekBar.java
hotoeditor/actions/SepiaAction.java
hotoeditor/actions/ShadowAction.java
hotoeditor/actions/SharpenAction.java
hotoeditor/actions/StraightenAction.java
hotoeditor/actions/TintAction.java
hotoeditor/actions/TouchView.java
hotoeditor/actions/VignetteAction.java
hotoeditor/filters/AutoFixFilter.java
hotoeditor/filters/ColorTemperatureFilter.java
hotoeditor/filters/CropFilter.java
hotoeditor/filters/CrossProcessFilter.java
hotoeditor/filters/DocumentaryFilter.java
hotoeditor/filters/DoodleFilter.java
hotoeditor/filters/DuotoneFilter.java
hotoeditor/filters/FillLightFilter.java
hotoeditor/filters/Filter.java
hotoeditor/filters/FisheyeFilter.java
hotoeditor/filters/FlipFilter.java
hotoeditor/filters/GrainFilter.java
hotoeditor/filters/GrayscaleFilter.java
hotoeditor/filters/HighlightFilter.java
hotoeditor/filters/LomoishFilter.java
hotoeditor/filters/NegativeFilter.java
hotoeditor/filters/PosterizeFilter.java
hotoeditor/filters/RedEyeFilter.java
hotoeditor/filters/RotateFilter.java
hotoeditor/filters/SaturationFilter.java
hotoeditor/filters/SepiaFilter.java
hotoeditor/filters/ShadowFilter.java
hotoeditor/filters/SharpenFilter.java
hotoeditor/filters/StraightenFilter.java
hotoeditor/filters/TintFilter.java
hotoeditor/filters/VignetteFilter.java
22493b29c32142f2588c623f5c78e9167352dddc 11-Sep-2011 Owen Lin <owenlin@google.com> Fix picasa images rotate incorrectly.

fix: 5268469

Change-Id: I58fc4a6d4a10c2952040eedee5936efa949b66e2
pp/PhotoDataAdapter.java
ata/MediaItem.java
03266b7f1b163f6729910743da3bd1dda2b60cfa 09-Sep-2011 Owen Lin <owenlin@google.com> Merge "Revert "bug #5252975: guard against null bitmap object, don't NPE.""
27ad8403dbdd74481514851fe98c5da73198d911 09-Sep-2011 Ray Chen <raychen@google.com> Merge "Fix 5267234 com.google.android.gallery3d: java.lang.IllegalArgumentException: The stateview to be finished is not at the top of the stack:"
eab374bafe5237a77698c4135c92eb26faedfa2b 09-Sep-2011 Ray Chen <raychen@google.com> Fix 5267234 com.google.android.gallery3d: java.lang.IllegalArgumentException:
The stateview to be finished is not at the top of the stack:

setNavigationMode triggers recursive tabs onSelected events.

Change-Id: Id9f58b4a73c4d7836b62e33e2f9b3676ba3f95c2
pp/GalleryActionBar.java
2785956f8f5654966a41e20f482f4af3057eea3f 08-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5263604: View not attached to window manager.

We need to make sure the dialog is dismissed before onDestroy
is finished so we still have the window. (We do it in onPause.)

Change-Id: I896583a67e117c9e4c5a1312541d67efa01295bf
pp/PhotoPage.java
8fdb6f6ba7244decea7938d4781664a2e5ede97a 07-Sep-2011 Owen Lin <owenlin@google.com> Merge "Copy exif data for cropped image."
abf2790337692007d5aa0f844e8f6d6f96d0de97 02-Sep-2011 Owen Lin <owenlin@google.com> Copy exif data for cropped image.

fix: 5248023

Change-Id: I2f59bfd96ca7533195f7019cc76080579dff8d1e
pp/CropImage.java
til/GalleryUtils.java
e7327d0566b182c522ca6dfa8e04c649d8f631a0 06-Sep-2011 Owen Lin <owenlin@google.com> Fix a no-thumbnail error message.

This happens if we cancel the first image reqest and then resend another
in a very short time. We may got an null image for the first request and
think this is a invalid bitmap.

Change-Id: I9ab62a658c281ef3d197474a5db50579e560f1bd
pp/PhotoDataAdapter.java
ea0feffc18ed2d0086d5fc4c57353f9e81154099 06-Sep-2011 Owen Lin <owenlin@google.com> Revert "bug #5252975: guard against null bitmap object, don't NPE."

This reverts commit 7012ebe1c85e538c572e23d4cb98cad88699c782.

We would like to know the crash as soon as possible.
bug: 5252975
ata/ImageCacheRequest.java
113bfc77c4468411da9ae1290553c3be89f8df9a 30-Aug-2011 Owen Lin <owenlin@google.com> Improve the performance of Reviewing a photo.

fix: 5144370

There is two componenet in the photo page. One is the large photo and the
other is the thumbnail strip. They idenpendently load their own data and images.

This change fixes several issues here:

1. Prevent sending to many jobs to ThreadPool and block others.
In a worse case, if the thumbnail strip send image requests first,
it may block the ThreadPool very long.
2. Improve the performance of extracting thumbnails from local files.
Now we try to extract the thumbnails from EXIF data first.

Change-Id: I45100d4daa025efb479f47c4f105de2b4731b498
pp/PhotoDataAdapter.java
pp/PhotoPage.java
ata/DecodeUtils.java
ata/LocalImage.java
i/AlbumSlidingWindow.java
i/FilmStripView.java
i/GLView.java
til/JobLimiter.java
7012ebe1c85e538c572e23d4cb98cad88699c782 02-Sep-2011 Wei Huang <weih@google.com> bug #5252975: guard against null bitmap object, don't NPE.

- check for null Bitmap object before using.

Change-Id: I99d85916dae45128d67be084860d66dd89ec2f95
ata/ImageCacheRequest.java
6180b2e50dd6f4df2de8d208bd4e7329e43120ce 02-Sep-2011 Ray Chen <raychen@google.com> Merge "Fix a few monkey issues: 5157713 and 5157712 Add debugging message for 5192628."
b2b451802fca3d81aaaa68b68c71e928015bbe34 31-Aug-2011 Ray Chen <raychen@google.com> Fix a few monkey issues: 5157713 and 5157712
Add debugging message for 5192628.

Change-Id: I257cabf1a93be256ed84aeaf3c9a871ecc5b1171
i/MenuExecutor.java
i/TileImageView.java
e9ae772f3400d53d24ce3d2834bd5866de599406 30-Aug-2011 Ray Chen <raychen@google.com> Debugging 5166199. Add log messages for analysis.

Change-Id: I1786e540b5bf19460dcca06acd8a77c9287593f8
pp/AlbumSetPage.java
pp/GalleryActionBar.java
pp/ManageCachePage.java
267e152714d75bb6378ee2ffffa90ca4343ca829 30-Aug-2011 Ray Chen <raychen@google.com> Fix 5188208 [UI] Remove action bar title in Photo/Video view for portrait phone

Change-Id: I20fba5894e46536f6972bc812d7f2aa5f52840b5
pp/PhotoPage.java
dcb265c9d08029bbb8fd77d3514482d10db53a3c 29-Aug-2011 Ray Chen <raychen@google.com> Fix 5189197: NPE in MovieActivity

Change-Id: I58f9e2c0840b4d752c2f795451ed4bc8212bb1ce
pp/MovieActivity.java
a79bbef0ffe0b99cb8d0e5dcedd3082abc61559c 30-Aug-2011 Wei Huang <weih@google.com> bug #5234237: fix NPE in Gallery

- mActivity.getGalleryActionBar() can return null, check for null before using it.

Change-Id: Ib84d5d56e51e6098adee9323c5e8d5c78f9a76e8
pp/AlbumSetPage.java
1a3ad3641eaee86b0401695b52959a44b1f63b1d 30-Aug-2011 Wei Huang <weih@google.com> Merge "Fix 4975579 PTP: Unable to load the thumbnails while connected to camera"
6cf807453fb58ccd4cc513ff187b306c7090e67c 28-Aug-2011 Owen Lin <owenlin@google.com> Fix several issues in Gallery2.

fix: 5189318 - use transparent background for tabs
fix: 5174277 - menu mailfunctioned after slideshow (a hack):
fix: 5153387 - wrong tab is selected in album set page

Change-Id: I68092039e566b5f7409ae509f65b227b06da16bb
pp/ActivityState.java
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/GalleryActionBar.java
pp/PhotoPage.java
adget/WidgetDatabaseHelper.java
8da5fdfe8f8d15aa688e504afd3ede2555de8bde 29-Aug-2011 Ray Chen <raychen@google.com> Fix 4975579 PTP: Unable to load the thumbnails while connected to camera

There's a deadlock in threadpool. The fix has been verified.

Change-Id: I000527f55fc2a3777bd4bb06817a9967b2f50488
ata/MtpImage.java
i/ActionModeHandler.java
5007a96dea76c9f3871b97579b51853029c115a0 29-Aug-2011 Owen Lin <owenlin@google.com> Make sure the sides of a backup image are less than 1024.

fix: 5117367

In this case(5117367), the original backup image would be 2325x1029,
which exceeds the limit of an texture and thus shows a blank image.

Change-Id: I3176e191c68199308fe3770c10ee0ae2d310c96a
pp/SinglePhotoDataAdapter.java
7815efda6c0632dd80424ee9aca5cfcfcac14646 28-Aug-2011 Owen Lin <owenlin@google.com> Merge "Launch Gallery from review intent."
a21a6b302dde029246d510edcb2d62ae3c645ead 27-Aug-2011 Owen Lin <owenlin@google.com> Merge "Fix: 5217165, cannot edit downloaded image"
1801ef094a8afe7973dc4ec877cc51262fd1544a 26-Aug-2011 Owen Lin <owenlin@google.com> Fix: 5217165, cannot edit downloaded image

The contentUri of the download image is "file:///xxx". Thus, it cannot get the correct
file type. So, we pass the mimetype in the intent to fix this issue.

Change-Id: I49b4b96472eb6a1561fbada95190c829728c037e
i/MenuExecutor.java
a4f0526dc8d993fb914d0e6505e22a1f30ad0e14 26-Aug-2011 Ray Chen <raychen@google.com> Fix 5133608 [UI] Details should be displayed as a system dialog in phone UI

We need this to reset the grid drawer.

Change-Id: Iead6568db1903d7e722f0e8154388ccd8f1aee67
pp/AlbumPage.java
pp/AlbumSetPage.java
i/DialogDetailsView.java
b6284920898627fa787900a99fc97b71a0c77574 26-Aug-2011 Owen Lin <owenlin@google.com> Launch Gallery from review intent.

Change-Id: Iaa2e9bdfde3ac6566dd65464ece82f4a5ced6831
fix: 3462852
pp/ActivityState.java
pp/Gallery.java
pp/StateManager.java
4105e22d72d7a44e67cba4a58ad88018ed664d10 24-Aug-2011 Ray Chen <raychen@google.com> Fix 5133608 [UI] Details should be displayed as a system dialog in phone UI
Fix 5132798 [UI] Details popup on tablet is incorrectly placed and should not have x icon to close
Fix 5199822 Long press and select "detail" shows details of another item

Change-Id: I0e992ded8a154edb1c7a81b75d0461d5bf309f31
pp/AlbumPage.java
pp/AlbumSetPage.java
pp/PhotoPage.java
i/DetailsAddressResolver.java
i/DetailsHelper.java
i/DetailsWindow.java
i/DialogDetailsView.java
i/GLDetailsView.java
i/ScrollView.java
2b0da6233f82b57c9905d59f4c6e2fe770e56c96 26-Aug-2011 Ray Chen <raychen@google.com> Merge "Fix 5205456 After sharing multiple images, the selection should be cleared"
bd8e025f1bb39b2be236b183ea8e78f93b308ad1 25-Aug-2011 Ray Chen <raychen@google.com> Fix 5188970 Cannot close Gallery when opened from Email/Gmail

Change-Id: I7af203a9aec8ebaf6c33fa592c996f917e0caca8
pp/AlbumPage.java
pp/AlbumSetPage.java
cd09872e859075aa8b5b90a151b0cae901bf4810 18-Aug-2011 Ray Chen <raychen@google.com> Fix 5027908 Crash in MMS while attaching a picture from Picasa

Change-Id: I7f67a7da5191f0ec8fbe3fc3c2d79e54394c4715
rovider/GalleryProvider.java
023a8c06b5e3fafab92cc07f2f93641253e32bb3 24-Aug-2011 Owen Lin <owenlin@google.com> Merge "Fix shortcup broken issue."
d6db8eab6df048b9065834113a6d46a885af01d3 18-Aug-2011 Owen Lin <owenlin@google.com> Fix shortcup broken issue.

fix: 5154308

Change-Id: I5cd2ef8efb84d4f356b3fe93106bddf10e0823cc
pp/GalleryAppImpl.java
adget/LocalPhotoSource.java
adget/MediaSetSource.java
adget/PhotoAppWidgetProvider.java
adget/WidgetClickHandler.java
adget/WidgetConfigure.java
adget/WidgetDatabaseHelper.java
adget/WidgetService.java
adget/WidgetSource.java
adget/WidgetTypeChooser.java
adget/WidgetUtils.java
idget/LocalPhotoSource.java
idget/MediaSetSource.java
idget/WidgetClickHandler.java
idget/WidgetConfigure.java
idget/WidgetDatabaseHelper.java
idget/WidgetProvider.java
idget/WidgetService.java
idget/WidgetSource.java
idget/WidgetTypeChooser.java
idget/WidgetUtils.java
476a89e18fc6b8a472b4e352d20be3a09a1776a4 24-Aug-2011 Owen Lin <owenlin@google.com> Fix cannot edit picasa synced images.

Change-Id: Ic2df3f6a8a93711c8616b1532acef12d67341062
fix: 5202762
ata/MtpImage.java
rovider/GalleryProvider.java
d6f517849bc63338ce2ab2c51c9fb7a3e167b916 24-Aug-2011 Ray Chen <raychen@google.com> Fix 5205456 After sharing multiple images, the selection should be cleared

Change-Id: I9fd12d371269197e1e05a6c49dae2b9a81ae4ca0
pp/GalleryActionBar.java
i/ActionModeHandler.java
666f131bda5fbb02a07d54cfb0282e1d224d8f19 23-Aug-2011 Owen Lin <owenlin@google.com> Merge "Fix unknown type for GL issue."
c060a99d0d0f6a0bbcf3cd6bbc6ee9d91e15814d 19-Aug-2011 Owen Lin <owenlin@google.com> Fix unknown type for GL issue.

fix: 5171449

Change-Id: Ib62e3237584144e94be6be773c292002bea5d21c
ata/DecodeUtils.java
i/TileImageView.java
b668a0ba747d751253b04e8fef42d64a9e4feae7 19-Aug-2011 Ray Chen <raychen@google.com> Merge "Fix 5179285 "Show on Map" intent for geotagged images mis-formatted in French"
598e242e3cb97f61a1eaf71d21459e45a5b2db42 19-Aug-2011 Ray Chen <raychen@google.com> Fix 5179825 Toast is created in a unprepared looper.

Change-Id: I80021755bc012340ed00fa52a20bf560369e9368
ata/LocationClustering.java
376be105e4396612a28c8911ce98d823a328d407 19-Aug-2011 Ray Chen <raychen@google.com> Fix 5179285 "Show on Map" intent for geotagged images mis-formatted in French

Change-Id: I4af6b549b534786163505d41b181888d347743d9
i/DetailsWindow.java
til/GalleryUtils.java
f9a0a4306d589b4a4e20554fed512a603426bfa1 17-Aug-2011 Owen Lin <owenlin@google.com> Initial code for Gallery2.

fix: 5176434

Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c
nim/AlphaAnimation.java
nim/Animation.java
nim/AnimationSet.java
nim/CanvasAnimation.java
nim/FloatAnimation.java
pp/AbstractGalleryActivity.java
pp/ActivityState.java
pp/AlbumDataAdapter.java
pp/AlbumPage.java
pp/AlbumPicker.java
pp/AlbumSetDataAdapter.java
pp/AlbumSetPage.java
pp/Config.java
pp/CropImage.java
pp/DialogPicker.java
pp/EyePosition.java
pp/FilterUtils.java
pp/Gallery.java
pp/GalleryActionBar.java
pp/GalleryActivity.java
pp/GalleryApp.java
pp/GalleryAppImpl.java
pp/GalleryContext.java
pp/LoadingListener.java
pp/Log.java
pp/ManageCachePage.java
pp/MovieActivity.java
pp/MoviePlayer.java
pp/PackagesMonitor.java
pp/PhotoDataAdapter.java
pp/PhotoPage.java
pp/SinglePhotoDataAdapter.java
pp/SlideshowDataAdapter.java
pp/SlideshowDream.java
pp/SlideshowPage.java
pp/StateManager.java
pp/UsbDeviceActivity.java
pp/Wallpaper.java
ata/ChangeNotifier.java
ata/ClusterAlbum.java
ata/ClusterAlbumSet.java
ata/ClusterSource.java
ata/Clustering.java
ata/ComboAlbum.java
ata/ComboAlbumSet.java
ata/ComboSource.java
ata/ContentListener.java
ata/DataManager.java
ata/DecodeUtils.java
ata/DownloadCache.java
ata/DownloadEntry.java
ata/DownloadUtils.java
ata/Face.java
ata/FaceClustering.java
ata/FilterSet.java
ata/FilterSource.java
ata/ImageCacheRequest.java
ata/ImageCacheService.java
ata/LocalAlbum.java
ata/LocalAlbumSet.java
ata/LocalImage.java
ata/LocalMediaItem.java
ata/LocalMergeAlbum.java
ata/LocalSource.java
ata/LocalVideo.java
ata/LocationClustering.java
ata/Log.java
ata/MediaDetails.java
ata/MediaItem.java
ata/MediaObject.java
ata/MediaSet.java
ata/MediaSource.java
ata/MtpClient.java
ata/MtpContext.java
ata/MtpDevice.java
ata/MtpDeviceSet.java
ata/MtpImage.java
ata/MtpSource.java
ata/Path.java
ata/PathMatcher.java
ata/SizeClustering.java
ata/TagClustering.java
ata/TimeClustering.java
ata/UriImage.java
ata/UriSource.java
rovider/GalleryProvider.java
i/AbstractDisplayItem.java
i/ActionModeHandler.java
i/AdaptiveBackground.java
i/AlbumSetSlidingWindow.java
i/AlbumSetView.java
i/AlbumSlidingWindow.java
i/AlbumView.java
i/BasicTexture.java
i/BitmapTexture.java
i/BitmapTileProvider.java
i/BoxBlurFilter.java
i/CacheBarView.java
i/CanvasTexture.java
i/ColorTexture.java
i/Config.java
i/CropView.java
i/CustomMenu.java
i/DetailsWindow.java
i/DisplayItem.java
i/DownUpDetector.java
i/DrawableTexture.java
i/FilmStripView.java
i/GLCanvas.java
i/GLCanvasImpl.java
i/GLPaint.java
i/GLRoot.java
i/GLRootView.java
i/GLView.java
i/GalleryEGLConfigChooser.java
i/GridDrawer.java
i/HighlightDrawer.java
i/Icon.java
i/IconDrawer.java
i/ImportCompleteListener.java
i/Label.java
i/Log.java
i/ManageCacheDrawer.java
i/MeasureHelper.java
i/MenuExecutor.java
i/MultiLineTexture.java
i/NinePatchChunk.java
i/NinePatchTexture.java
i/OnSelectedListener.java
i/Paper.java
i/PhotoView.java
i/PositionProvider.java
i/PositionRepository.java
i/ProgressBar.java
i/ProgressSpinner.java
i/RawTexture.java
i/ResourceTexture.java
i/ScrollBarView.java
i/ScrollView.java
i/ScrollerHelper.java
i/SelectionDrawer.java
i/SelectionManager.java
i/SlideshowView.java
i/SlotView.java
i/StaticBackground.java
i/StringTexture.java
i/StripDrawer.java
i/SynchronizedHandler.java
i/TextButton.java
i/Texture.java
i/TileImageView.java
i/TileImageViewAdapter.java
i/UploadedTexture.java
i/UserInteractionListener.java
til/CacheManager.java
til/Future.java
til/FutureListener.java
til/FutureTask.java
til/GalleryUtils.java
til/IdentityCache.java
til/IntArray.java
til/InterruptableOutputStream.java
til/LinkedNode.java
til/Log.java
til/MediaSetUtils.java
til/PriorityThreadFactory.java
til/ReverseGeocoder.java
til/ThreadPool.java
til/UpdateHelper.java
idget/LocalPhotoSource.java
idget/MediaSetSource.java
idget/WidgetClickHandler.java
idget/WidgetConfigure.java
idget/WidgetDatabaseHelper.java
idget/WidgetProvider.java
idget/WidgetService.java
idget/WidgetSource.java
idget/WidgetTypeChooser.java
idget/WidgetUtils.java