summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/fra...cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Steve Kondik2013-09-190-0/+0
|\
| * am ccc95132: Merge "Use ConnectionManager to restart loaders" into jb-mr2-devAdam Copp2013-04-100-0/+0
| |\
| * \ Merge "Use ConnectionManager to restart loaders" into ur9Alice Yang2013-04-091-1/+57
| |\ \
* | \ \ Merge tag 'android-4.3_r2.1' into cm-10.2Ricardo Cerqueira2013-07-2461-180/+508
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Use ConnectionManager to restart loaders" into jb-mr2-devAdam Copp2013-04-031-1/+57
| |\ \ \ | | |/ / | |/| / | | |/
| | * Use ConnectionManager to restart loadersAdam Copp2013-03-261-1/+57
| * | Merge "Hide spinners if airplane mode enabled whilst browsing images" into jb...Adam Copp2013-03-252-13/+15
| |\ \
| | * | Hide spinners if airplane mode enabled whilst browsing imagesAdam Copp2013-03-252-13/+15
| | |/
| * | am 9fae8df9: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-03-200-0/+0
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-03-201-2/+1
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-03-201-2/+1
| * | | am b0c23f29: (-s ours) am 9860d23d: (-s ours) DO NOT MERGE: Fix NPE in PhotoV...Alice Yang2013-03-190-0/+0
| |\| |
| | * | am 9860d23d: (-s ours) DO NOT MERGE: Fix NPE in PhotoViewActivityAlice Yang2013-03-190-0/+0
| | |\ \
| | | * | DO NOT MERGE: Fix NPE in PhotoViewActivityAlice Yang2013-03-191-0/+1
| * | | | Merge "This CL breaks existing functionality. Gmail uses the photoviewer to d...Mark Wei2013-03-181-1/+2
| |\ \ \ \
| | * | | | This CL breaks existing functionality. Gmail uses the photoviewer to display ...Mark Wei2013-03-181-1/+2
| * | | | | Merge "Hide the spinner and show failure message if photo data is null" into ...Adam Copp2013-03-181-2/+1
| |\| | | |
| | * | | | Hide the spinner and show failure message if photo data is nullAdam Copp2013-03-181-2/+1
| | | |_|/ | | |/| |
| * | | | am c06b017a: Always set ViewPager adapter immediately.Adam Copp2013-03-180-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Always set ViewPager adapter immediately.Adam Copp2013-03-181-0/+1
| * | | | am 3765cc4c: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-03-180-0/+0
| |\| | |
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-03-1842-84/+42
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-1842-84/+42
| * | | | Always set ViewPager adapter immediately.Adam Copp2013-03-181-0/+1
| | |/ / | |/| |
| * | | am 57f06d7f: Swap default_image from .png to .xml drawableAdam Copp2013-03-140-0/+0
| |\| |
| | * | Swap default_image from .png to .xml drawableAdam Copp2013-03-142-0/+13
| * | | Merge "Swap default_image from .png to .xml drawable" into jb-mr2-devAdam Copp2013-03-142-0/+13
| |\ \ \
| | * | | Swap default_image from .png to .xml drawableAdam Copp2013-03-132-0/+13
| * | | | Merge remote-tracking branch 'goog/jb-ub-mail-ur9' into mergeAlice Yang2013-03-1352-28/+154
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-03-1248-0/+91
| | * | When image bytes are unable to be decoded into a Bitmap (like TIFF files), weMark Wei2013-03-114-28/+63
| | |/
| * | Use resources to specify wether or not to enforce no upscalingAdam Copp2013-03-062-1/+8
| * | am ea8c4b44: Continuously attempt to load thumbnail if it fails the first tim...Mark Wei2013-02-262-9/+23
| |\|
| | * Continuously attempt to load thumbnail if it fails the first time. This behaviorMark Wei2013-02-202-9/+23
| * | Merge branch 'goog/jb-ub-mail-ur8' into masterPaul Westbrook2013-02-157-142/+239
| |\|
| | * Ignore the SecurityException for now so that Gmail does not crash. A later CLMark Wei2013-02-131-0/+2
| | * Merge "Let the framework manage fragments" into jb-ub-mail-ur8Vikram Aggarwal2013-02-084-51/+93
| | |\
| | | * Let the framework manage fragmentsVikram Aggarwal2013-02-084-51/+93
| | * | Save/Restore Actionbar titleVikram Aggarwal2013-02-071-14/+47
| | |/
| | * Starts a pending download immediately when swiping to that image.Mark Wei2013-01-293-22/+29
| | * Modify image attachments previews to conform to UX specsMark Wei2013-01-173-27/+29
| | * Load image attachments from live conversations.Mark Wei2013-01-151-32/+27
| | * Set the fullscreen timeout, even with no actionbarPaul Westbrook2012-12-192-14/+14
| | * Merge "Fix some build errors" into jb-ub-mail-ur8Paul Westbrook2012-12-192-0/+3
| | |\
| | | * Fix some build errorsPaul Westbrook2012-12-192-0/+3
| | * | Merge: "Set the scale type for the default image icon"Paul Westbrook2012-12-191-0/+1
| | |/
| | * Merge: "Restart loader on attachment cursor updates:Paul Westbrook2012-12-191-0/+4
| | * Merge "Fix for panorama icon not always showing up in photo viewer"Paul Westbrook2012-12-192-1/+7
| | * Merge "Fix problem where part of wrong photo shows"Paul Westbrook2012-12-192-2/+5
| | * Merge photo viewer changes from masterPaul Westbrook2012-12-193-13/+66