• Home
  • History
  • Annotate
  • only in /frameworks/opt/photoviewer/src/com/android/ex/photo/
History log of /frameworks/opt/photoviewer/src/com/android/ex/photo/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
7aabd796bbcb149db9ac183c1d0aec09fccd42a4 05-Oct-2012 Adam Copp <adamcopp@google.com> Temporary fix for image viewer crash

This fixes a bug causing the app to crash when we can't open a stream to
a url when we download an image.

Bug: 7294701
Change-Id: Ifd0c62c3f5bb6a168e2e2932734fa448ffb9344c
til/ImageUtils.java
237ded1a59b1fc148a3ffcf78d6f9d34af5c170c 26-Sep-2012 Paul Westbrook <pwestbro@google.com> resolved conflicts for merge of b3f0f056 to master

Change-Id: I5def1804466ff971ed5bc5afd2a2d68e135d20a2
9323b13fc9bc79ce38ce7c851a2aa894ab988ed0 20-Sep-2012 Paul Westbrook <pwestbro@google.com> Add Exif parser

Class to parse exif headers of images to detect orientation

Modify ImageUtils#decodeStream to parse the exif header and respect
orientation

Bug: 7087307

Change-Id: I93c3a69a50ae26d3fd4e96944439f87e9d511945
til/Exif.java
til/ImageUtils.java
413185316e9e6f0713185d9adc733b2768ab5aa1 21-Sep-2012 Paul Westbrook <pwestbro@google.com> am 29c041a3: am 88d18b9f: am 4054bd6d: Use gesture detector from support lib

* commit '29c041a3e41b93c7ffd8f29550df501f0b45ea02':
Use gesture detector from support lib
bdf13fd95aa92f794be827421945370c1456ea7c 21-Sep-2012 Paul Westbrook <pwestbro@google.com> Use gesture detector from support lib

Bug: 7206080
Change-Id: I9b5d332d095335f13b61c9c9ccd8152a462a9eb5
iews/GestureDetector.java
iews/PhotoView.java
2aadb54327f77df1468826249ba63b91b65d8090 21-Sep-2012 Adam Copp <adamcopp@google.com> Merge "Add option to permenantly show ProgressBar"
075e0938e1413b6743f51baa5260cd9c8dea0711 20-Sep-2012 Mark Wei <markwei@google.com> am 05783789: am da78c1dc: am c907eecd: Prevent NPE while viewing photo from attachment.

* commit '057837890de13cc9fd6909f4c4a69abec388a34d':
Prevent NPE while viewing photo from attachment.
ae78bbd1c97e702147b29966903ca6e08ed3616f 13-Sep-2012 Adam Copp <adamcopp@google.com> Add option to permenantly show ProgressBar

In order to indicate to the user that more content is loading, the
provider can provide an image with the loading field set and null as it's
url. In this case, we will not try loading any image, and will just show the
ProgressBar.

Something like this is nessecary in Velvet, where we wish to load
infinite images.

Change-Id: Ib26412a579abdbe7fbd338b99ff39f4d1c13f806
dapters/BaseCursorPagerAdapter.java
dapters/PhotoPagerAdapter.java
ragments/PhotoViewFragment.java
rovider/PhotoContract.java
til/ImageUtils.java
2795f43ff0b98f6aab16b5db7d56c646875d6dae 20-Sep-2012 Adam Copp <adamcopp@google.com> Merge "Cursor listeners can use setPhotoIndex meaningfully"
4a6a7183e0740dfb305a16676c867e182aced7aa 19-Sep-2012 Adam Copp <adamcopp@google.com> Cursor listeners can use setPhotoIndex meaningfully

Cursor listeners can now use setPhotoIndex and have the changes take
effect immediately. It appears that nobody in code search will have
their code broken by this change.

Change-Id: I76afd8545310c24f05307d38ed03081914a17987
hotoViewActivity.java
2539f2ef0fa351d40551dda5ba0b543b2a042b0f 19-Sep-2012 Mark Wei <markwei@google.com> Prevent NPE while viewing photo from attachment.

Bug: 7189283
Change-Id: Ibcb98ae13cf801a6934e0ed4efb4c5349678dcce
ragments/PhotoViewFragment.java
da471e748028dd1d30fbb140432a897f4868f238 19-Sep-2012 Paul Westbrook <pwestbro@google.com> am dd2a57c4: am d9904217: am bd64181d: Integrate copy of GestureDetector into photoviewer

* commit 'dd2a57c446c05fe7cd8453bc249f38c03d2ab299':
Integrate copy of GestureDetector into photoviewer
190f6bd9a66ab01364451e22cb7992f86227a4c6 18-Sep-2012 Paul Westbrook <pwestbro@google.com> Integrate copy of GestureDetector into photoviewer

This allows the MR0/1 behavior to be used when Email/Gmail is
running on older versions of the platform

Change-Id: I1936d36ddb9f09a3b48d38c2ad44e70ac002fbda
iews/GestureDetector.java
iews/PhotoView.java
524ac65920b684ca4602e23981cb976e2bab0f0d 17-Sep-2012 Mark Wei <markwei@google.com> am 34672da4: am 4030071b: am 697c046e: Prevent NPE in Gmail while viewing photo from attachment

* commit '34672da452ddf07347d2e9fc02f6d66c954ebba3':
Prevent NPE in Gmail while viewing photo from attachment
c4d9382e8e52e1122d51f52402c6c4a609a785d6 17-Sep-2012 Mark Wei <markwei@google.com> Prevent NPE in Gmail while viewing photo from attachment

Bug: 7174197
Change-Id: I29ca226b5134888dbe3488f859d9790fe1388984
ragments/PhotoViewFragment.java
1389ae2ea3376b317e4810f9e3b123a0cb5ac008 11-Sep-2012 Adam Copp <adamcopp@google.com> Do not show loading bar after thumbnail has loaded

After talking to the designers for Google Now, who have said they talked
to the designers from gallery app, it appears that we should not show
the loading spinner once the thumbnail has loaded.

Let me know if this is orthogonal to the behaviour you would like in the
gmail app, and I can write a more involved patch with an overridable
callback to decide wether to show the spinner or not.

Change-Id: I77a3f2e2487d469ab47e45c7a94942f831528d41
ragments/PhotoViewFragment.java
3b16fb64efd107102fe93bf0c6cd09ae1c1614f5 06-Sep-2012 Adam Copp <adamcopp@google.com> Merge "Make setLightsOutMode protected"
b462d1bf5d3833fabbdc38d13f66dadcf6ceda54 06-Sep-2012 Adam Copp <adamcopp@google.com> Fix double-tap to restore from fullscreen

After auto-hiding the actionbar, two taps must be made to restore
the action bar.

this change fixes that by calling setFullScreen instead of just changing
lights out mode. This correctly updates the mFullScreen variable and
means only one tap is required to restore the action bar.

Bug: 7117697

Change-Id: I8645ca77c2f025868c487c2c63e7057d696d6dac
hotoViewActivity.java
7e6995626b551c215bc3064c95b9996af940746a 06-Sep-2012 Adam Copp <adamcopp@google.com> Make setLightsOutMode protected

setLightsOutMode becomes protected so that subclasses can reliably
hide and show ui elements when fullscreen mode is enabled.

Change-Id: I891cfd80b515df72020d5df21427247615f04a74
hotoViewActivity.java
0ab3e0cf9cbb5751a276e4c2555640a0e8173b5f 28-Aug-2012 Adam Copp <adamcopp@google.com> Scope changes and removal of unnessecary variable

Adds isFullScreen() and setPhotoIndex() protected methods to
PhotoViewActivity in order to allow subclasses access to this
information.

Removes mDataValid from BaseCursorPagerAdapter since it was hiding how
simple the checks actually were (it was just mCursor != null)

A nullcheck has also been added to BaseFragmentPagerAdapter in
instantiateItem. in the long term, BaseCursorPagerAdapter should not be
so fragile, and should not surface nulls, but that change could be quite
involved, so should probably not be rolled into this change.

Change-Id: I4889c5ae2a764660926c70da25b85565f4600188
hotoViewActivity.java
dapters/BaseCursorPagerAdapter.java
dapters/BaseFragmentPagerAdapter.java
91dbfd25cc234de393ae22fc39a832a6335e1bc2 04-Sep-2012 Adam Copp <adamcopp@google.com> Add parameter for max initial scale factor

you can now pass EXTRA_MAX_INITIAL_SCALE into PhotoViewActivity in order
to specify the maximum initial scale of images displayed. This parameter
defaults to 1x if now supplied, so images will not be displayed larger
than their actual size by default.

This allows the gmail team to resolve 7049410 whilst velvet can keep
something like the old behaviour (which is more natural for their app)

Bug: 7049410
Change-Id: I7d230666ca50a4634d8436519ed280cc6e558ee3
ntents.java
hotoViewActivity.java
dapters/PhotoPagerAdapter.java
ragments/PhotoViewFragment.java
iews/PhotoView.java
d4a7a6c3fbbeed97d6550612e81c57f98f093a84 30-Aug-2012 Paul Westbrook <pwestbro@google.com> am 7d920938: am 45faaf4d: am 2b4059cd: Allow action bar to be updated

* commit '7d9209389c0c678cbd5a82d767fb6c984fcd0d64':
Allow action bar to be updated
2989cf0c8e4b0aee4c9ac2b5384a392fd74cd6a9 30-Aug-2012 Paul Westbrook <pwestbro@google.com> Allow action bar to be updated

Allow the action bar to be updated when the photo list loader
loads data

Bug: 7082929
Change-Id: I476df1fa2ec7dcb1adfe5aed359a5126c60be179
hotoViewActivity.java
f24e7099f9688518d705116c1b4279fc6279d3d6 30-Aug-2012 Mark Wei <markwei@google.com> resolved conflicts for merge of f688fc95 to master

Change-Id: Ib4ade547d76faa4a730b75ea691c1cf1f99888cd
0f7d1502f4f7c0b364e7644875a04fb0c90807ff 30-Aug-2012 Mark Wei <markwei@google.com> Fix NullPointerException when tapping attachment.

Bug: 7083179
Change-Id: I9955aeda9a0d2bb6d30ce9f7e7e3961cb47284e0
oaders/PhotoBitmapLoader.java
til/ImageUtils.java
11661deff6135a896c8bc716d30a17c08892b56b 30-Aug-2012 Mark Wei <markwei@google.com> am 97992e59: am c645df0a: am 4f38cc16: Attachment image viewer should not scale images larger than original size.

* commit '97992e595ffb8eef8a6a12609cc4da368d4e0f6f':
Attachment image viewer should not scale images larger than original size.
3a14814364ff1e48109d32a06bd063c66914889b 30-Aug-2012 Mark Wei <markwei@google.com> Attachment image viewer should not scale images larger than original size.

Bug: 7049410
Change-Id: I1ed2555203e1541f1481cae4f17f532eaa57c1cd
oaders/PhotoBitmapLoader.java
iews/PhotoView.java
e9d441306cc11d5538f8af05db4d0f94a1e91f70 29-Aug-2012 Paul Westbrook <pwestbro@google.com> am 4689c6f8: am 162052cc: am 114cef99: Fix crash in email with attachments

* commit '4689c6f834a99fe8b57f2391bc14d13a3c6645cb':
Fix crash in email with attachments
e6d03190d2b2ec6ea07a59daa7e687c3c383f9c3 29-Aug-2012 Paul Westbrook <pwestbro@google.com> Fix crash in email with attachments

There isn't a need to call swapCursor in a runnable

Bug: 7072747
Change-Id: I0a0a9b6835acc4a1d1748c94f4d8bec4551638b0
hotoViewActivity.java
dapters/PhotoPagerAdapter.java
502e7156de49b62863ef0824cfd8b5a0be65dbed 22-Aug-2012 Adam Copp <adamcopp@google.com> Merge "Add HTTP uri handling & fetch thumbnail first"
bd8b47b147f29f196f37d66ccb561d40414ab5b6 22-Aug-2012 Adam Copp <adamcopp@google.com> Add HTTP uri handling & fetch thumbnail first

If a http:// or https:// url is specified as the thumbnail uri or
regular uri for an image, we attempt to fetch it over the internet.

Also, changed the order of loading so that we always attempt to fetch
the thumbnail image before we fetch the regular image. This aids in the
http:// uri case, since it should take significantly less time to be
presented with a thumbnail than the full image.

Finally, finishes the photo viewer activity when the "top" button on the
action bar is pressed, unless a custom override has been added.

These 3 changes could be seperated into different patches if you would
like

Change-Id: Iddc8cc6bef3f9e66198dfb98eb2f7bd309023b3f
hotoViewActivity.java
ragments/PhotoViewFragment.java
til/ImageUtils.java
abfecf5511e7f4e700f77826b9ed9834313143ff 21-Aug-2012 Marc Blank <mblank@google.com> Abort posted runnable if cursor is no longer open

Bug: 7002552
Change-Id: I38ce1231b0ec88ebf02d4d0edb5495b8baac65d5
hotoViewActivity.java
9556f61c11991d6e955cfd68ca53f4f489dfa8c5 14-Aug-2012 Paul Westbrook <pwestbro@google.com> Fix some photo view problems

Make sure to stop the indeterminate progress bare when we can't
load an image

Bug: 6956516
Change-Id: Ifb69ca2e08a8ddfb351989d8e276e7fb6e3b06e5
hotoViewActivity.java
dapters/BaseFragmentPagerAdapter.java
ragments/PhotoViewFragment.java
iews/ProgressBarWrapper.java
7d13b0b858f6d2bce1a1f0088ab6739033087d19 11-Aug-2012 Andrew Sapperstein <asapperstein@google.com> Created a sample photo viewer implementation.

Change-Id: Ida5ab5c3247a52c5fbbd495d6e127c18493356ce
rovider/PhotoContract.java
68a16aa04f9b98868f4412e7324b0fc292c9d858 07-Aug-2012 Andrew Sapperstein <asapperstein@google.com> Made title and subtitle not show immediately.

Fixes an issue where we used to show the app title
for an instant before getting the data for the photo.
Now we show nothing until we have the photo data.

Change-Id: I2a77b18af2ec2051848c188e0dad7ca04be4f285
ntents.java
hotoViewActivity.java
dapters/PhotoPagerAdapter.java
1a7f70300256d443fe2236a0008b4aa016e2d834 07-Aug-2012 Andrew Sapperstein <asapperstein@google.com> Fix Build.

Change-Id: If36065612faadc4d6b44ddbfc9efde0597db4718
hotoViewActivity.java
150e623129eef49467f1d6f67649e4636a4513f2 03-Aug-2012 Andrew Sapperstein <asapperstein@google.com> Enabled optional support for showing progress.

Added some progress bars to the "empty" view
so that implementors of the API can show the
progress of things like downloads or loading.

Additionally, added a retry button and an optional
text that allows you to indicate status to the user.

Due to a bug in the framework, we actually use two
progress bars (one determinate and one indeterminate)
to update our status. Created a wrapper that allows
the controlling of both progress bars in sync.

Change-Id: I710e06317948d376d445abf1603545982ac8479d
hotoViewActivity.java
ragments/PhotoViewFragment.java
iews/ProgressBarWrapper.java
1abd4654c2eeacc7d854a438a9c72d7239278bea 30-Jul-2012 Andrew Sapperstein <asapperstein@google.com> ActionBar now auto-hides like Gallery's version.

5 second delay from opened. Will not hide on first
appearance. Has be closed and re-opened. Also,
eliminated the progress spinner when the photo hadn't
yet loaded.

Additionally, modified the action bar to match gallery's
transparency.

Change-Id: I69e72d787bc2cda9c18df6a9cf1800d155d6876a
hotoViewActivity.java
ragments/PhotoViewFragment.java
c3f8a6b51c1d78806616ac4dcc5204e7e9053285 28-Jul-2012 Andrew Sapperstein <asapperstein@google.com> Fixes a bug where scaling would not be performed.

Had to add an additional case to the page transform
that handles the new issue where the just disappeared
view is actually behind the screen but still getting
touch events. Victory.

Change-Id: Ifb760fd7d7510fec37c4101d448dbc980575b1be
hotoViewPager.java
9db663e1e820c3445f57fe11d9a12e9c8777e704 27-Jul-2012 Andrew Sapperstein <asapperstein@google.com> Partial fix of 6890014.

No longer crashing. But the attachment is now
in a very weird state.

Change-Id: If688d9c19a81124cbd1ecd0266821800f76f3c74
ntents.java
dapters/PhotoPagerAdapter.java
til/ImageUtils.java
9007d640832f674a9d65058a3c2a484c078d239e 27-Jul-2012 Andrew Sapperstein <asapperstein@google.com> Showing a default preview photo.

If we do not have a preview and are currently
waiting on a full photo, we will show a stock
photo. Currently shows a grey box as we do not
have assets yet.

Change-Id: I155071598b20bf81b2b60bdd8ac881a64b8ee1b7
hotoViewActivity.java
ragments/PhotoViewFragment.java
6361dccee51bc01d75df08bc35b7893a98e7ed48 25-Jul-2012 Andrew Sapperstein <asapperstein@google.com> Finalized the photo viewer transitions.

Changed the black background to be on the
FrameLayout behind the view pager rather than
on the the photo view. Also deleted some dead code.

Change-Id: I19759d3f7e93c32b6c6aceda0c296610f90f20f7
iews/PhotoView.java
d04cec7495069a1a72a7721fab33eca94cd49043 25-Jul-2012 Andrew Sapperstein <asapperstein@google.com> Added transitions to photo viewer.

Change-Id: Ie3c9a36019e161cf0f7b32cfbeba4749ef5ccfd8
hotoViewPager.java
928a39fb533255b34145285fabbd4f51961df63a 24-Jul-2012 Andrew Sapperstein <asapperstein@google.com> Support showing previews in the photo viewer.

The photo viewer now supports the notion of a
preview of the full image. The preview is not
pinchable in any manner and displays a circular
progress bar over top of it while we are downloading
the full version of the image.

To enable this functionality, there is a new column
in the PhotoContract API called thumbnailUri. If it is
not set to null and if the attempted load of the contentUri
is unsuccessful, we will attempt to load a thumbnail version
that will show until the contentUri is finished loading.

Change-Id: I5547a5fc6a30ee6a30f137dc1dee76a77fb5b304
ntents.java
dapters/PhotoPagerAdapter.java
ragments/PhotoViewFragment.java
rovider/PhotoContract.java
iews/PhotoView.java
0c18e5deef5209d21b527a01feb6b789715eb48e 21-Jul-2012 Andrew Sapperstein <asapperstein@google.com> Reloading bitmaps if cursor updates.

Change-Id: I5624e533d4f35255028cd1a31508dabdb33dfe7f
hotoViewActivity.java
dapters/BaseCursorPagerAdapter.java
dapters/PhotoPagerAdapter.java
ragments/PhotoViewFragment.java
oaders/PhotoBitmapLoader.java
8122882aaf14820bc2241605b2ab818ad358b9af 27-Jun-2012 Ying Wang <wangying@google.com> Import translations. DO NOT MERGE

Change-Id: Ib683da0aa64c2c63dfc672ea18b7417aded3ec5c
ntents.java
hotoViewActivity.java
hotoViewPager.java
dapters/BaseCursorPagerAdapter.java
dapters/BaseFragmentPagerAdapter.java
dapters/PhotoPagerAdapter.java
ragments/PhotoViewFragment.java
oaders/PhotoBitmapLoader.java
oaders/PhotoPagerLoader.java
rovider/PhotoContract.java
til/ImageUtils.java
iews/PhotoView.java