summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am 002a3fec: Fix 5686493: Crash when try to click any thumbnailChih-Chung Chang2011-11-301-1/+3
|\| | | | | | | | | | | | | | | | | | | * commit '002a3fece284f713537fad4523ee963d257350e9': Fix 5686493: Crash when try to click any thumbnail
| * | | Fix 5686493: Crash when try to click any thumbnailChih-Chung Chang2011-11-301-1/+3
| |/ / | | | | | | | | | Change-Id: Ia109333c3a207ca2a60889c2731f6c11737b5592
* | | am 45fa6771: Merge "Improve screen on/off logic in slideshow." into ics-mr1Daniel Sandler2011-11-302-15/+55
|\| | | | | | | | | | | | | | * commit '45fa677140112f725df3765be56edc715c226aa5': Improve screen on/off logic in slideshow.
| * | Merge "Improve screen on/off logic in slideshow." into ics-mr1Daniel Sandler2011-11-292-15/+55
| |\ \
| | * | Improve screen on/off logic in slideshow.Daniel Sandler2011-11-292-15/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 622c2b2c: Merge "Show a dialog to require updating PlusOne." into ics-mr1Wei Huang2011-11-297-41/+66
|\| | | | | | | | | | | | | | | | | | | * commit '622c2b2c7721008e7851d0af3d89d3fc545ceaf6': Show a dialog to require updating PlusOne.
| * | | Merge "Show a dialog to require updating PlusOne." into ics-mr1Wei Huang2011-11-297-41/+66
| |\ \ \
| | * | | Show a dialog to require updating PlusOne.Owen Lin2011-11-247-41/+66
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I1ff4f5eca90ade49b0785324b9319ef0b7d751ca fix: 5608342
* | | / am fc8c503d: Fix 5661035: Accepts bluetooth keys while playing a video from ↵Chih-Chung Chang2011-11-292-0/+63
|\| | | | |_|/ |/| | | | | | | | | | | | | | gallery. * commit 'fc8c503d1351c6ee62d233a944f2bd5220e64a55': Fix 5661035: Accepts bluetooth keys while playing a video from gallery.
| * | Fix 5661035: Accepts bluetooth keys while playing a video from gallery.Chih-Chung Chang2011-11-292-0/+63
| |/ | | | | | | Change-Id: I8174b1a97baad563d8bbd685b9aab3a8ca428ead
* | am 8cbc7c4e: Merge "Fix 5637927: NPE while trying to do slide show for gmail ↵Chih-Chung Chang2011-11-211-7/+19
|\| | | | | | | | | | | | | image attachment" into ics-mr1 * commit '8cbc7c4eedb204e3ad9fa1cb8a7a1b21f7464c74': Fix 5637927: NPE while trying to do slide show for gmail image attachment
| * Merge "Fix 5637927: NPE while trying to do slide show for gmail image ↵Chih-Chung Chang2011-11-211-7/+19
| |\ | | | | | | | | | attachment" into ics-mr1
| | * Fix 5637927: NPE while trying to do slide show for gmail image attachmentChih-Chung Chang2011-11-181-7/+19
| | | | | | | | | | | | Change-Id: If30aa9798a030a5b97c7ff626f91187d7da93ab5
* | | am 00b5f3c6: Fix 5635260 Albums view goes blank after changing view option ↵Ray Chen2011-11-182-1/+2
|\| | | | | | | | | | | | | | | | | | | | and returning to albums view * commit '00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa': Fix 5635260 Albums view goes blank after changing view option and returning to albums view
| * | Fix 5635260 Albums view goes blank after changing view option and returning ↵Ray Chen2011-11-182-1/+2
| |/ | | | | | | | | | | to albums view Change-Id: I1fd9776f050d16fc3abb723cc17b1cf07bd2f948
* | am 71a296c2: Merge "Make sure startAnimation won\'t be called after ↵Wei Huang2011-11-182-5/+22
|\| | | | | | | | | | | | | onPause." into ics-mr1 * commit '71a296c27389fefa9361adada41715ae4623af32': Make sure startAnimation won't be called after onPause.
| * Merge "Make sure startAnimation won't be called after onPause." into ics-mr1Wei Huang2011-11-172-5/+22
| |\
| | * Make sure startAnimation won't be called after onPause.Owen Lin2011-11-172-5/+22
| | | | | | | | | | | | | | | Change-Id: I6c5238394b2ad64e22fbcb250ecd1534da7e8d03 fix: 5629252
* | | am d7401652: Fix 5611147 attachments (picture) can\'t be viewed after ↵Ray Chen2011-11-162-4/+8
|\| | | | | | | | | | | | | | | | | | | | they\'re saved * commit 'd74016524fa899747411240daa453e5ca9cac219': Fix 5611147 attachments (picture) can't be viewed after they're saved
| * | Fix 5611147 attachments (picture) can't be viewed after they're savedRay Chen2011-11-162-4/+8
| | | | | | | | | | | | Change-Id: I0de0b8c176e1c3f838e81e3549c6795613b90069
* | | am bfbd7bb4: Merge "Fix 5481444 Face clustering should use PWA profile shot ↵Wei Huang2011-11-157-40/+122
|\| | | | | | | | | | | | | | | | | | | | instead of random photo" into ics-mr1 * commit 'bfbd7bb47582be2a636eadffb041a698c52817f6': Fix 5481444 Face clustering should use PWA profile shot instead of random photo
| * | Merge "Fix 5481444 Face clustering should use PWA profile shot instead of ↵Wei Huang2011-11-157-40/+122
| |\ \ | | | | | | | | | | | | random photo" into ics-mr1
| | * | Fix 5481444 Face clustering should use PWA profile shot instead of random photoRay Chen2011-11-117-40/+122
| | | | | | | | | | | | | | | | Change-Id: Ie4e3f9ae19431ab5b36d216cd7f4c626de503bbf
* | | | am c5d42ff7: Merge "Fix b/5517002 by dismissing running progress dialog in ↵Yuli Huang2011-11-153-40/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | onPause()." into ics-mr1 * commit 'c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b': Fix b/5517002 by dismissing running progress dialog in onPause().
| * | | Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." ↵Yuli Huang2011-11-153-40/+44
| |\ \ \ | | |_|/ | |/| | | | | | into ics-mr1
| | * | Fix b/5517002 by dismissing running progress dialog in onPause().Yuli Huang2011-11-153-40/+44
| | | | | | | | | | | | | | | | Change-Id: I524f876e53776c38bc850120a2d7b7e6381ca33a
* | | | am c903fd67: Fix the memory leak by WeakHashMap.Owen Lin2011-11-151-67/+40
|\| | | | | | | | | | | | | | | | | | | * commit 'c903fd67c26d652f9dbd5cb321b64d1601357985': Fix the memory leak by WeakHashMap.
| * | | Fix the memory leak by WeakHashMap.Owen Lin2011-11-141-67/+40
| |/ / | | | | | | | | | | | | | | | | | | | | | fix: 5601885 Also simplify the code. Change-Id: I97cdf00d84fa093ad7032e85ec7c31c3365e2447
* | | am c9af80a1: Merge "Fix 5213252 [UI] Updated action bar layouts and action ↵Ray Chen2011-11-111-0/+1
|\| | | | | | | | | | | | | | | | | | | | orders" into ics-mr1 * commit 'c9af80a1e46106b93271903753d36682b480479c': Fix 5213252 [UI] Updated action bar layouts and action orders
| * | Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ↵Ray Chen2011-11-101-0/+1
| |\ \ | | | | | | | | | | | | ics-mr1
| | * | Fix 5213252 [UI] Updated action bar layouts and action ordersRay Chen2011-11-101-0/+1
| | |/ | | | | | | | | | Change-Id: I798a86ed1f6883af1ea3cd3e9c67a6603d0273cc
* | | resolved conflicts for merge of 64d592c0 to masterOwen Lin2011-11-112-50/+80
|\| | | | | | | | | | | Change-Id: Iae4a66e37fcb852c4b105fe732c6597b638b2059
| * | Merge "Request sync when opening Gallery/Album." into ics-mr1Owen Lin2011-11-102-52/+80
| |\ \
| | * | Request sync when opening Gallery/Album.Owen Lin2011-11-112-52/+80
| | | | | | | | | | | | | | | | | | | | | | | | fix: 5519437 Change-Id: I0fb60415e3a92a677ca72ee8e0b95ae57e802152
* | | | am d80bb597: Merge "Show control overlay when earphone is unplugged" into ↵Owen Lin2011-11-111-10/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'd80bb5974b0ec43ca1755aff4287fc7815504058': Show control overlay when earphone is unplugged
| * | | Merge "Show control overlay when earphone is unplugged" into ics-mr1Owen Lin2011-11-101-10/+6
| |\ \ \
| | * | | Show control overlay when earphone is unpluggedOwen Lin2011-11-111-10/+6
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I3e259e66d318010a3f9e9b47b561a09b2db2b6a5 fix: 5563251
* | | | am e193bc40: Merge "Fix b/5518211 by disabling effects when photo cannot be ↵Yuli Huang2011-11-113-30/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | loaded." into ics-mr1 * commit 'e193bc40110b0606806c864234e95141be6bd312': Fix b/5518211 by disabling effects when photo cannot be loaded.
| * | | Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ↵Yuli Huang2011-11-103-30/+38
| |\ \ \ | | |/ / | |/| | | | | | ics-mr1
| | * | Fix b/5518211 by disabling effects when photo cannot be loaded.Yuli Huang2011-11-103-30/+38
| | | | | | | | | | | | | | | | Change-Id: I9e5ae9cfaf9bee52cd63a0e77a3b083e47b59335
* | | | am b86c6aa0: Fix 5548567: Don\'t play video immediately.Chih-Chung Chang2011-11-111-17/+10
|\| | | | | | | | | | | | | | | | | | | * commit 'b86c6aa085a66ffee2a178f4b5e2426cc67ca90b': Fix 5548567: Don't play video immediately.
| * | | Fix 5548567: Don't play video immediately.Chih-Chung Chang2011-11-101-17/+10
| |/ / | | | | | | | | | Change-Id: I30e9ebf7461e12250e1ef240c157e7f59b1ce2a1
* | | am af92c510: Merge "Fix 5585254: Make system UI enter "low profile mode" ↵Chih-Chung Chang2011-11-101-1/+2
|\| | | | | | | | | | | | | | | | | | | | while playing." into ics-mr1 * commit 'af92c5100158fe39cca21abb76ca685bfe106eeb': Fix 5585254: Make system UI enter "low profile mode" while playing.
| * | Merge "Fix 5585254: Make system UI enter "low profile mode" while playing." ↵Chih-Chung Chang2011-11-091-1/+2
| |\ \ | | | | | | | | | | | | into ics-mr1
| | * | Fix 5585254: Make system UI enter "low profile mode" while playing.Chih-Chung Chang2011-11-091-1/+2
| | | | | | | | | | | | | | | | Change-Id: I91f680871b7a965f6776cb017dcd825a587e5054
* | | | Merge "Fix 5453262 No pictures / Videos available in Gallery message not ↵Ray Chen2011-11-091-6/+5
|\ \ \ \ | | | | | | | | | | | | | | | displayed"
| * | | | Fix 5453262 No pictures / Videos available in Gallery message not displayedRay Chen2011-11-091-6/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib6c8691e4206f9d6a07a7587d22a67c1a21bc5a5
* | | | | am 8cfe549a: Fix b/5587210: Add file extension to display-name.Yuli Huang2011-11-101-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '8cfe549a3c6e50653ce50cedf90e8463d641987d': Fix b/5587210: Add file extension to display-name.
| * | | | Fix b/5587210: Add file extension to display-name.Yuli Huang2011-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I7c3522f2532bbce688ee8d4d0403f7314baca481
* | | | | am 90b7a7a1: Fix b/5510870 by persisting states of save/share buttons.Yuli Huang2011-11-102-2/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '90b7a7a1fed287cab3500acdfaf4e82ec0a59dec': Fix b/5510870 by persisting states of save/share buttons.