summaryrefslogtreecommitdiffstats
path: root/photoviewer
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'goog/jb-ub-mail-ur8' into masterPaul Westbrook2013-02-15144-6095/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: photoviewer/AndroidManifest.xml photoviewer/res/values/dimen.xml photoviewer/src/com/android/ex/photo/Intents.java photoviewer/src/com/android/ex/photo/PhotoViewActivity.java photoviewer/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java photoviewer/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java photoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java photoviewer/src/com/android/ex/photo/provider/PhotoContract.java photoviewer/src/com/android/ex/photo/util/ImageUtils.java photoviewer/src/com/android/ex/photo/views/PhotoView.java Change-Id: Icb06b228f0eab1f828a21507ec2fbe7ede998536
| * Delete framework/ex's photo viewerPaul Westbrook2012-12-19144-5939/+0
| | | | | | | | | | Bug: 7389288 Change-Id: I3139681fcd24c796115386e70a9fc3220fca8d87
| * Fix problem where part of wrong photo showsPaul Westbrook2012-12-142-2/+5
| | | | | | | | | | | | | | | | | | Fix a problem when swiping through a few image attachments where, when reaching the end, part of the N-1 photo is shown while the blue glow is being shown on the right side Bug: 7745114 Change-Id: Ic7d8b4213303a7e06c902b117e1e68b40bd8e1c3
| * Fix for panorama icon not always showing up in photo viewer.Mark Wei2012-10-252-1/+6
| | | | | | | | | | Bug: 7392422 Change-Id: Ifff054c86366eb0b495a06ead9e0dc60123e90c4
| * Restart loader on attachment cursor updatesPaul Westbrook2012-10-241-1/+5
| | | | | | | | | | Bug: 7403076 Change-Id: I620403db9f7304e99ca4e9c0c58a439e277225d0
| * Load preview firstPaul Westbrook2012-10-121-14/+12
| | | | | | | | | | | | | | | | | | If the preview is available, load the it first, while waiting for the full size image to load Bug: 7340082 Bug: 7298245 Change-Id: I64934001d832844a776f8d9c1f2abcece552f79c
| * Set the scale type for the default image iconPaul Westbrook2012-10-121-0/+1
| | | | | | | | | | | | | | | | | | By setting the scale type to center, the default icon is not scaled up. Bug: 7298245 Bug: 7340457 Change-Id: I66200a1c751ca80e878e55a7b9daa656a6cbe98d
* | am e9c8a53c: am 7d7b83bc: Merge "Fix problem where part of wrong photo ↵Mindy Pereira2012-12-142-2/+5
|\ \ | | | | | | | | | | | | | | | | | | shows" into jb-mr1.1-dev * commit 'e9c8a53c11e7092344f49e965150037ca8581dbe': Fix problem where part of wrong photo shows
| * | Fix problem where part of wrong photo showsPaul Westbrook2012-12-142-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a problem when swiping through a few image attachments where, when reaching the end, part of the N-1 photo is shown while the blue glow is being shown on the right side Bug: 7745114 Cherry-pick of https://googleplex-android-review.googlesource.com/#/c/260544/ Change-Id: Ic7d8b4213303a7e06c902b117e1e68b40bd8e1c3
* | | resolved conflicts for merge of 28ed566a to masterMark Wei2012-10-292-1/+6
|\| | | | | | | | | | | Change-Id: I7b97bf6ddb01e8bbc059708889a4dc30efe6c8e9
| * | Fix for panorama icon not always showing up in photo viewer.Mark Wei2012-10-262-1/+6
| | | | | | | | | | | | | | | | | | cherry-pick of https://googleplex-android-review.googlesource.com/#/c/246161/ Bug: 7392422 Change-Id: Ifff054c86366eb0b495a06ead9e0dc60123e90c4
| * | Restart loader on attachment cursor updatesPaul Westbrook2012-10-261-1/+5
| | | | | | | | | | | | | | | | | | cherry-pick of https://googleplex-android-review.googlesource.com/#/c/245483/ Bug: 7403076 Change-Id: I620403db9f7304e99ca4e9c0c58a439e277225d0
| * | Load preview firstPaul Westbrook2012-10-131-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the preview is available, load the it first, while waiting for the full size image to load Cherry-pick of https://googleplex-android-review.googlesource.com/#/c/238893/ Bug: 7340082 Bug: 7298245 Change-Id: I64934001d832844a776f8d9c1f2abcece552f79c
| * | Set the scale type for the default image iconPaul Westbrook2012-10-121-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | By setting the scale type to center, the default icon is not scaled up. cherry-pick of https://googleplex-android-review.googlesource.com/#/c/238674/ Bug: 7298245 Bug: 7340457 Change-Id: I66200a1c751ca80e878e55a7b9daa656a6cbe98d
* | Allow PhotoViewActivity to choose inital photo by uriMartin Hibdon2012-10-162-1/+37
| | | | | | | | | | | | | | | | This ensures that the correct photo will be displayed even if the contents of the cursor changes between the time the activity is launched and the cursor gets loaded. Change-Id: I5f00ebde072587929f01e34c8b4b84e5eb0e9bd3
* | Temporary fix for image viewer crashAdam Copp2012-10-051-0/+6
| | | | | | | | | | | | | | | | 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
* | resolved conflicts for merge of b3f0f056 to masterPaul Westbrook2012-09-252-3/+188
|\| | | | | | | Change-Id: I5def1804466ff971ed5bc5afd2a2d68e135d20a2
| * Add Exif parserPaul Westbrook2012-09-252-170/+343
| | | | | | | | | | | | | | | | | | | | | | 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
* | am 29c041a3: am 88d18b9f: am 4054bd6d: Use gesture detector from support libPaul Westbrook2012-09-212-670/+8
|\| | | | | | | | | * commit '29c041a3e41b93c7ffd8f29550df501f0b45ea02': Use gesture detector from support lib
| * Use gesture detector from support libPaul Westbrook2012-09-212-670/+8
| | | | | | | | | | Bug: 7206080 Change-Id: I9b5d332d095335f13b61c9c9ccd8152a462a9eb5
* | Merge "Add option to permenantly show ProgressBar"Adam Copp2012-09-215-5/+32
|\ \
| * | Add option to permenantly show ProgressBarAdam Copp2012-09-205-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 05783789: am da78c1dc: am c907eecd: Prevent NPE while viewing photo from ↵Mark Wei2012-09-201-2/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | attachment. * commit '057837890de13cc9fd6909f4c4a69abec388a34d': Prevent NPE while viewing photo from attachment.
| * | Prevent NPE while viewing photo from attachment.Mark Wei2012-09-191-2/+4
| | | | | | | | | | | | | | | Bug: 7189283 Change-Id: Ibcb98ae13cf801a6934e0ed4efb4c5349678dcce
* | | Merge "Cursor listeners can use setPhotoIndex meaningfully"Adam Copp2012-09-201-3/+3
|\ \ \
| * | | Cursor listeners can use setPhotoIndex meaningfullyAdam Copp2012-09-191-3/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | 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
* | | Merge "Specify minimum SDK version of 11 in the manifest"Adam Copp2012-09-191-0/+3
|\ \ \
| * | | Specify minimum SDK version of 11 in the manifestAdam Copp2012-09-191-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The photoviewer project throws errors in eclipse because there's no minimum sdk version in the AndroidManifest. This CL specifies min SDK version of 11, which is sufficient for all of the calls we make in the app and stops eclipse from complaining Change-Id: Id5492651faa8fffc857d2660f7d4796428efb2d6
* | | am dd2a57c4: am d9904217: am bd64181d: Integrate copy of GestureDetector ↵Paul Westbrook2012-09-182-8/+657
|\ \ \ | | |/ | |/| | | | | | | | | | | | | into photoviewer * commit 'dd2a57c446c05fe7cd8453bc249f38c03d2ab299': Integrate copy of GestureDetector into photoviewer
| * | Integrate copy of GestureDetector into photoviewerPaul Westbrook2012-09-172-8/+657
| | | | | | | | | | | | | | | | | | | | | This allows the MR0/1 behavior to be used when Email/Gmail is running on older versions of the platform Change-Id: I1936d36ddb9f09a3b48d38c2ad44e70ac002fbda
* | | am 34672da4: am 4030071b: am 697c046e: Prevent NPE in Gmail while viewing ↵Mark Wei2012-09-171-1/+4
|\| | | |/ |/| | | | | | | | | photo from attachment * commit '34672da452ddf07347d2e9fc02f6d66c954ebba3': Prevent NPE in Gmail while viewing photo from attachment
| * Prevent NPE in Gmail while viewing photo from attachmentMark Wei2012-09-171-1/+4
| | | | | | | | | | Bug: 7174197 Change-Id: I29ca226b5134888dbe3488f859d9790fe1388984
* | Do not show loading bar after thumbnail has loadedAdam Copp2012-09-121-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Make setLightsOutMode protected"Adam Copp2012-09-061-1/+1
|\ \
| * | Make setLightsOutMode protectedAdam Copp2012-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | setLightsOutMode becomes protected so that subclasses can reliably hide and show ui elements when fullscreen mode is enabled. Change-Id: I891cfd80b515df72020d5df21427247615f04a74
* | | Fix double-tap to restore from fullscreenAdam Copp2012-09-061-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Scope changes and removal of unnessecary variableAdam Copp2012-09-043-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Add parameter for max initial scale factorAdam Copp2012-09-045-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 7d920938: am 45faaf4d: am 2b4059cd: Allow action bar to be updatedPaul Westbrook2012-08-301-0/+6
|\| | | | | | | | | * commit '7d9209389c0c678cbd5a82d767fb6c984fcd0d64': Allow action bar to be updated
| * Allow action bar to be updatedPaul Westbrook2012-08-301-0/+6
| | | | | | | | | | | | | | | | Allow the action bar to be updated when the photo list loader loads data Bug: 7082929 Change-Id: I476df1fa2ec7dcb1adfe5aed359a5126c60be179
* | resolved conflicts for merge of f688fc95 to masterMark Wei2012-08-302-2/+5
|\| | | | | | | Change-Id: Ib4ade547d76faa4a730b75ea691c1cf1f99888cd
| * Fix NullPointerException when tapping attachment.Mark Wei2012-08-302-2/+4
| | | | | | | | | | Bug: 7083179 Change-Id: I9955aeda9a0d2bb6d30ce9f7e7e3961cb47284e0
* | am 97992e59: am c645df0a: am 4f38cc16: Attachment image viewer should not ↵Mark Wei2012-08-292-3/+10
|\| | | | | | | | | | | | | scale images larger than original size. * commit '97992e595ffb8eef8a6a12609cc4da368d4e0f6f': Attachment image viewer should not scale images larger than original size.
| * Attachment image viewer should not scale images larger than original size.Mark Wei2012-08-292-3/+10
| | | | | | | | | | Bug: 7049410 Change-Id: I1ed2555203e1541f1481cae4f17f532eaa57c1cd
* | am 4689c6f8: am 162052cc: am 114cef99: Fix crash in email with attachmentsPaul Westbrook2012-08-292-41/+38
|\| | | | | | | | | * commit '4689c6f834a99fe8b57f2391bc14d13a3c6645cb': Fix crash in email with attachments
| * Fix crash in email with attachmentsPaul Westbrook2012-08-282-41/+38
| | | | | | | | | | | | | | There isn't a need to call swapCursor in a runnable Bug: 7072747 Change-Id: I0a0a9b6835acc4a1d1748c94f4d8bec4551638b0
* | Merge "Add HTTP uri handling & fetch thumbnail first"Adam Copp2012-08-224-175/+214
|\ \ | |/ |/|
| * Add HTTP uri handling & fetch thumbnail firstAdam Copp2012-08-224-175/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-08-151-0/+8
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2012-08-151-0/+8
| | | | | | | | | | | | | | | Change-Id: I2ce3d15b85e4a32ca9870606cc3636c5796eeb3a Auto-generated-cl: translation import
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 13:05:53 +0000