summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/fra...cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2mr1.1-stagingcm-10.1Steve Kondik2013-02-1211-120/+203
|\
| * Merge 'goog/jb-ub-now-carmello' into frameworks/opt/photoviewerJim Guggemos2012-12-0411-120/+203
|/|
| * Support data URIs in photoviewer.Mark Brophy2012-11-271-1/+30
| * Need one more initLoader in a runnable.Mike Dodd2012-11-151-1/+8
| * call initLoader in a runnableMartin Hibdon2012-11-141-1/+9
| * Make some static members protectedMartin Hibdon2012-11-131-2/+2
| * Make some members protectedMartin Hibdon2012-11-083-27/+27
| * Remove PhotoViewFragment's dependency on PhotoViewActivityMartin Hibdon2012-10-303-50/+84
| * Make PhotoViewer use the support libraryMartin Hibdon2012-10-267-34/+33
| * Merge "Fix scale popping by disabling zoom on thumbnails"Adam Copp2012-10-251-1/+11
| |\
| | * Fix scale popping by disabling zoom on thumbnailsAdam Copp2012-10-241-1/+11
| |/ |/|
| * Remove unused imports and variablesAdam Copp2012-10-243-6/+2
|/
* Rename module names to avoid name conflicts.cm-10.1-M1Ying Wang2012-10-072-3/+3
* Temporary fix for image viewer crashAdam Copp2012-10-051-0/+6
* am c930ef0a: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-260-0/+0
|\
| * Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-260-0/+0
| |\
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-260-0/+0
| | |\
* | | | resolved conflicts for merge of b3f0f056 to masterPaul Westbrook2012-09-252-3/+188
|\| | |
| * | | am 3a539a30: am 5211e468: Add Exif parserPaul Westbrook2012-09-252-170/+343
| |\| |
| | * | am 5211e468: Add Exif parserPaul Westbrook2012-09-252-170/+343
| | |\ \
| | | * | Add Exif parserPaul Westbrook2012-09-252-170/+343
* | | | | am e5913938: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-240-0/+0
|\| | | |
| * | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-240-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-220-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am 29c041a3: am 88d18b9f: am 4054bd6d: Use gesture detector from support libPaul Westbrook2012-09-212-670/+8
|\| | | |
| * | | | am 88d18b9f: am 4054bd6d: Use gesture detector from support libPaul Westbrook2012-09-212-670/+8
| |\| | |
| | * | | am 4054bd6d: Use gesture detector from support libPaul Westbrook2012-09-212-670/+8
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Use gesture detector from support libPaul Westbrook2012-09-212-670/+8
* | | | | Merge "Add option to permenantly show ProgressBar"Adam Copp2012-09-215-5/+32
|\ \ \ \ \
| * | | | | Add option to permenantly show ProgressBarAdam Copp2012-09-205-5/+32
* | | | | | am b060fe28: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-200-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-190-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-180-0/+0
| | | | |\ \ \
* | | | | | | | am 05783789: am da78c1dc: am c907eecd: Prevent NPE while viewing photo from a...Mark Wei2012-09-201-2/+4
|\| | | | | | |
| * | | | | | | am da78c1dc: am c907eecd: Prevent NPE while viewing photo from attachment.Mark Wei2012-09-201-2/+4
| |\| | | | | |
| | * | | | | | am c907eecd: Prevent NPE while viewing photo from attachment.Mark Wei2012-09-191-2/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
| | | * | | | Prevent NPE while viewing photo from attachment.Mark Wei2012-09-191-2/+4
* | | | | | | Merge "Cursor listeners can use setPhotoIndex meaningfully"Adam Copp2012-09-201-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Cursor listeners can use setPhotoIndex meaningfullyAdam Copp2012-09-191-3/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | 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
| |/ / / / / /
* | | | | | | am dd2a57c4: am d9904217: am bd64181d: Integrate copy of GestureDetector into...Paul Westbrook2012-09-182-8/+657
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am d9904217: am bd64181d: Integrate copy of GestureDetector into photoviewerPaul Westbrook2012-09-182-8/+657
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am bd64181d: Integrate copy of GestureDetector into photoviewerPaul Westbrook2012-09-182-8/+657
| | |\ \ \ \ \ | | | | |/ / / | | | |/| / / | | | |_|/ / | | |/| | |
| | | * | | Integrate copy of GestureDetector into photoviewerPaul Westbrook2012-09-172-8/+657
* | | | | | am 34672da4: am 4030071b: am 697c046e: Prevent NPE in Gmail while viewing pho...Mark Wei2012-09-171-1/+4
|\| | | | | | |_|_|/ / |/| | | |
| * | | | am 4030071b: am 697c046e: Prevent NPE in Gmail while viewing photo from attac...Mark Wei2012-09-171-1/+4
| |\| | |
| | * | | am 697c046e: Prevent NPE in Gmail while viewing photo from attachmentMark Wei2012-09-171-1/+4
| | |\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 01:13:58 +0000