OSDN Git Service

android-x86/packages-apps-Gallery2.git
12 years agoam f36d8f29: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Tue, 22 Nov 2011 05:08:11 +0000 (21:08 -0800)]
am f36d8f29: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit 'f36d8f299d57849a1afb1b0c271bb4be0d336e43':
  Import revised translations. DO NOT MERGE

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Mon, 21 Nov 2011 23:26:05 +0000 (15:26 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 21 Nov 2011 22:58:48 +0000 (14:58 -0800)]
Import revised translations. DO NOT MERGE

Change-Id: If5d0d2f8c75a8b8a210a0fe1b1d22da682f08c81

12 years agoam 8cbc7c4e: Merge "Fix 5637927: NPE while trying to do slide show for gmail image...
Chih-Chung Chang [Mon, 21 Nov 2011 12:59:31 +0000 (04:59 -0800)]
am 8cbc7c4e: Merge "Fix 5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1

* commit '8cbc7c4eedb204e3ad9fa1cb8a7a1b21f7464c74':
  Fix 5637927: NPE while trying to do slide show for gmail image attachment

12 years agoMerge "Fix 5637927: NPE while trying to do slide show for gmail image attachment...
Chih-Chung Chang [Mon, 21 Nov 2011 12:56:35 +0000 (04:56 -0800)]
Merge "Fix 5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Fri, 18 Nov 2011 23:43:37 +0000 (15:43 -0800)]
Reconcile with ics-mr1-release

Change-Id: I1693539643fe35d4ffc893bf9b5444fd416756f2

12 years agoam 00b5f3c6: Fix 5635260 Albums view goes blank after changing view option and return...
Ray Chen [Fri, 18 Nov 2011 23:23:07 +0000 (15:23 -0800)]
am 00b5f3c6: Fix 5635260 Albums view goes blank after changing view option and returning to albums view

* commit '00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa':
  Fix 5635260 Albums view goes blank after changing view option and returning to albums view

12 years agoam 71a296c2: Merge "Make sure startAnimation won\'t be called after onPause." into...
Wei Huang [Fri, 18 Nov 2011 10:37:31 +0000 (02:37 -0800)]
am 71a296c2: Merge "Make sure startAnimation won\'t be called after onPause." into ics-mr1

* commit '71a296c27389fefa9361adada41715ae4623af32':
  Make sure startAnimation won't be called after onPause.

12 years agoFix 5637927: NPE while trying to do slide show for gmail image attachment
Chih-Chung Chang [Fri, 18 Nov 2011 10:04:10 +0000 (18:04 +0800)]
Fix 5637927: NPE while trying to do slide show for gmail image attachment

Change-Id: If30aa9798a030a5b97c7ff626f91187d7da93ab5

12 years agoFix 5635260 Albums view goes blank after changing view option and returning to albums...
Ray Chen [Fri, 18 Nov 2011 07:00:32 +0000 (15:00 +0800)]
Fix 5635260 Albums view goes blank after changing view option and returning to albums view

Change-Id: I1fd9776f050d16fc3abb723cc17b1cf07bd2f948

12 years agoMerge "Make sure startAnimation won't be called after onPause." into ics-mr1
Wei Huang [Fri, 18 Nov 2011 00:56:49 +0000 (16:56 -0800)]
Merge "Make sure startAnimation won't be called after onPause." into ics-mr1

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 17 Nov 2011 14:47:04 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam 612e9d69: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Thu, 17 Nov 2011 13:45:46 +0000 (05:45 -0800)]
am 612e9d69: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '612e9d697269cff5437366ae386dea7d6af6656c':
  Import revised translations.  DO NOT MERGE

12 years agoMake sure startAnimation won't be called after onPause.
Owen Lin [Thu, 17 Nov 2011 07:26:56 +0000 (15:26 +0800)]
Make sure startAnimation won't be called after onPause.

Change-Id: I6c5238394b2ad64e22fbcb250ecd1534da7e8d03
fix: 5629252

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Wed, 16 Nov 2011 18:53:11 +0000 (10:53 -0800)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Nov 2011 18:17:05 +0000 (10:17 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I8d3977a59dd8ac6628b6e5095e76d9f26ab9f42f

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 16 Nov 2011 14:46:48 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam d7401652: Fix 5611147 attachments (picture) can\'t be viewed after they\'re saved
Ray Chen [Wed, 16 Nov 2011 08:12:02 +0000 (00:12 -0800)]
am d7401652: Fix 5611147 attachments (picture) can\'t be viewed after they\'re saved

* commit 'd74016524fa899747411240daa453e5ca9cac219':
  Fix 5611147 attachments (picture) can't be viewed after they're saved

12 years agoFix 5611147 attachments (picture) can't be viewed after they're saved
Ray Chen [Wed, 16 Nov 2011 03:12:47 +0000 (11:12 +0800)]
Fix 5611147 attachments (picture) can't be viewed after they're saved

Change-Id: I0de0b8c176e1c3f838e81e3549c6795613b90069

12 years agoam 8ab8a64c: (-s ours) am 756f9bc7: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Nov 2011 21:11:10 +0000 (13:11 -0800)]
am 8ab8a64c: (-s ours) am 756f9bc7: Import revised translations. DO NOT MERGE

* commit '8ab8a64cc40a683d364829aad404fea4548cbd48':
  Import revised translations. DO NOT MERGE

12 years agoam bfbd7bb4: Merge "Fix 5481444 Face clustering should use PWA profile shot instead...
Wei Huang [Tue, 15 Nov 2011 21:11:00 +0000 (13:11 -0800)]
am bfbd7bb4: Merge "Fix 5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1

* commit 'bfbd7bb47582be2a636eadffb041a698c52817f6':
  Fix 5481444 Face clustering should use PWA profile shot instead of random photo

12 years agoam c5d42ff7: Merge "Fix b/5517002 by dismissing running progress dialog in onPause...
Yuli Huang [Tue, 15 Nov 2011 21:06:55 +0000 (13:06 -0800)]
am c5d42ff7: Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1

* commit 'c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b':
  Fix b/5517002 by dismissing running progress dialog in onPause().

12 years agoam 756f9bc7: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Nov 2011 20:19:48 +0000 (12:19 -0800)]
am 756f9bc7: Import revised translations. DO NOT MERGE

* commit '756f9bc72468a6fba926602b86525aed7bb05b40':
  Import revised translations. DO NOT MERGE

12 years agoMerge "Fix 5481444 Face clustering should use PWA profile shot instead of random...
Wei Huang [Tue, 15 Nov 2011 20:12:03 +0000 (12:12 -0800)]
Merge "Fix 5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1

12 years agoam c903fd67: Fix the memory leak by WeakHashMap.
Owen Lin [Tue, 15 Nov 2011 19:30:08 +0000 (11:30 -0800)]
am c903fd67: Fix the memory leak by WeakHashMap.

* commit 'c903fd67c26d652f9dbd5cb321b64d1601357985':
  Fix the memory leak by WeakHashMap.

12 years agoMerge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1
Yuli Huang [Tue, 15 Nov 2011 15:18:16 +0000 (07:18 -0800)]
Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 15 Nov 2011 14:46:32 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoFix b/5517002 by dismissing running progress dialog in onPause().
Yuli Huang [Mon, 14 Nov 2011 14:38:16 +0000 (22:38 +0800)]
Fix b/5517002 by dismissing running progress dialog in onPause().

Change-Id: I524f876e53776c38bc850120a2d7b7e6381ca33a

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 14 Nov 2011 21:32:51 +0000 (13:32 -0800)]
Import revised translations. DO NOT MERGE

Change-Id: I325ec90678dbd808dc4cab87de77ddfcc8ececf2

12 years agoFix the memory leak by WeakHashMap.
Owen Lin [Mon, 14 Nov 2011 04:23:03 +0000 (12:23 +0800)]
Fix the memory leak by WeakHashMap.

fix: 5601885

Also simplify the code.

Change-Id: I97cdf00d84fa093ad7032e85ec7c31c3365e2447

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sun, 13 Nov 2011 14:47:17 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam c9af80a1: Merge "Fix 5213252 [UI] Updated action bar layouts and action orders...
Ray Chen [Fri, 11 Nov 2011 19:48:32 +0000 (11:48 -0800)]
am c9af80a1: Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1

* commit 'c9af80a1e46106b93271903753d36682b480479c':
  Fix 5213252 [UI] Updated action bar layouts and action orders

12 years agoFix 5481444 Face clustering should use PWA profile shot instead of random photo
Ray Chen [Thu, 3 Nov 2011 09:51:38 +0000 (17:51 +0800)]
Fix 5481444 Face clustering should use PWA profile shot instead of random photo

Change-Id: Ie4e3f9ae19431ab5b36d216cd7f4c626de503bbf

12 years agoresolved conflicts for merge of 64d592c0 to master
Owen Lin [Fri, 11 Nov 2011 10:17:26 +0000 (18:17 +0800)]
resolved conflicts for merge of 64d592c0 to master

Change-Id: Iae4a66e37fcb852c4b105fe732c6597b638b2059

12 years agoMerge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1
Ray Chen [Fri, 11 Nov 2011 07:33:43 +0000 (23:33 -0800)]
Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1

12 years agoam d80bb597: Merge "Show control overlay when earphone is unplugged" into ics-mr1
Owen Lin [Fri, 11 Nov 2011 06:36:40 +0000 (06:36 +0000)]
am d80bb597: Merge "Show control overlay when earphone is unplugged" into ics-mr1

* commit 'd80bb5974b0ec43ca1755aff4287fc7815504058':
  Show control overlay when earphone is unplugged

12 years agoam e193bc40: Merge "Fix b/5518211 by disabling effects when photo cannot be loaded...
Yuli Huang [Fri, 11 Nov 2011 06:36:40 +0000 (06:36 +0000)]
am e193bc40: Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1

* commit 'e193bc40110b0606806c864234e95141be6bd312':
  Fix b/5518211 by disabling effects when photo cannot be loaded.

12 years agoam b86c6aa0: Fix 5548567: Don\'t play video immediately.
Chih-Chung Chang [Fri, 11 Nov 2011 06:36:39 +0000 (06:36 +0000)]
am b86c6aa0: Fix 5548567: Don\'t play video immediately.

* commit 'b86c6aa085a66ffee2a178f4b5e2426cc67ca90b':
  Fix 5548567: Don't play video immediately.

12 years agoMerge "Request sync when opening Gallery/Album." into ics-mr1
Owen Lin [Fri, 11 Nov 2011 06:34:30 +0000 (22:34 -0800)]
Merge "Request sync when opening Gallery/Album." into ics-mr1

12 years agoMerge "Show control overlay when earphone is unplugged" into ics-mr1
Owen Lin [Fri, 11 Nov 2011 06:33:16 +0000 (22:33 -0800)]
Merge "Show control overlay when earphone is unplugged" into ics-mr1

12 years agoShow control overlay when earphone is unplugged
Owen Lin [Fri, 11 Nov 2011 04:01:09 +0000 (12:01 +0800)]
Show control overlay when earphone is unplugged

Change-Id: I3e259e66d318010a3f9e9b47b561a09b2db2b6a5
fix: 5563251

12 years agoMerge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1
Yuli Huang [Fri, 11 Nov 2011 02:58:20 +0000 (18:58 -0800)]
Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1

12 years agoRequest sync when opening Gallery/Album.
Owen Lin [Tue, 8 Nov 2011 11:05:56 +0000 (19:05 +0800)]
Request sync when opening Gallery/Album.

fix: 5519437

Change-Id: I0fb60415e3a92a677ca72ee8e0b95ae57e802152

12 years agoMerge "Import revised translations."
Eric Fischer [Thu, 10 Nov 2011 23:01:57 +0000 (15:01 -0800)]
Merge "Import revised translations."

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Thu, 10 Nov 2011 22:36:29 +0000 (14:36 -0800)]
Reconcile with ics-mr1-release

Change-Id: I7af0b572fb36c3c93761232c46d9adf74da8aacd

12 years agoImport revised translations.
Eric Fischer [Thu, 10 Nov 2011 22:12:56 +0000 (14:12 -0800)]
Import revised translations.

Change-Id: I34e26a60238c1a846f6f9a327db7b892737539cf

12 years agoam af92c510: Merge "Fix 5585254: Make system UI enter "low profile mode" while playin...
Chih-Chung Chang [Thu, 10 Nov 2011 18:51:13 +0000 (18:51 +0000)]
am af92c510: Merge "Fix 5585254: Make system UI enter "low profile mode" while playing." into ics-mr1

* commit 'af92c5100158fe39cca21abb76ca685bfe106eeb':
  Fix 5585254: Make system UI enter "low profile mode" while playing.

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 10 Nov 2011 14:47:10 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoFix 5548567: Don't play video immediately.
Chih-Chung Chang [Thu, 10 Nov 2011 10:01:33 +0000 (18:01 +0800)]
Fix 5548567: Don't play video immediately.

Change-Id: I30e9ebf7461e12250e1ef240c157e7f59b1ce2a1

12 years agoFix 5213252 [UI] Updated action bar layouts and action orders
Ray Chen [Wed, 9 Nov 2011 02:49:09 +0000 (10:49 +0800)]
Fix 5213252 [UI] Updated action bar layouts and action orders

Change-Id: I798a86ed1f6883af1ea3cd3e9c67a6603d0273cc

12 years agoFix b/5518211 by disabling effects when photo cannot be loaded.
Yuli Huang [Thu, 10 Nov 2011 08:50:31 +0000 (16:50 +0800)]
Fix b/5518211 by disabling effects when photo cannot be loaded.

Change-Id: I9e5ae9cfaf9bee52cd63a0e77a3b083e47b59335

12 years agoMerge "Fix 5453262 No pictures / Videos available in Gallery message not displayed"
Ray Chen [Thu, 10 Nov 2011 07:01:49 +0000 (23:01 -0800)]
Merge "Fix 5453262 No pictures / Videos available in Gallery message not displayed"

12 years agoam 8cfe549a: Fix b/5587210: Add file extension to display-name.
Yuli Huang [Thu, 10 Nov 2011 05:42:56 +0000 (05:42 +0000)]
am 8cfe549a: Fix b/5587210: Add file extension to display-name.

* commit '8cfe549a3c6e50653ce50cedf90e8463d641987d':
  Fix b/5587210: Add file extension to display-name.

12 years agoMerge "Fix 5585254: Make system UI enter "low profile mode" while playing." into...
Chih-Chung Chang [Thu, 10 Nov 2011 04:17:38 +0000 (20:17 -0800)]
Merge "Fix 5585254: Make system UI enter "low profile mode" while playing." into ics-mr1

12 years agoam 90b7a7a1: Fix b/5510870 by persisting states of save/share buttons.
Yuli Huang [Thu, 10 Nov 2011 01:11:46 +0000 (01:11 +0000)]
am 90b7a7a1: Fix b/5510870 by persisting states of save/share buttons.

* commit '90b7a7a1fed287cab3500acdfaf4e82ec0a59dec':
  Fix b/5510870 by persisting states of save/share buttons.

12 years agoFix b/5587210: Add file extension to display-name.
Yuli Huang [Wed, 9 Nov 2011 18:10:10 +0000 (02:10 +0800)]
Fix b/5587210: Add file extension to display-name.

Change-Id: I7c3522f2532bbce688ee8d4d0403f7314baca481

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 9 Nov 2011 18:06:23 +0000 (10:06 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 9 Nov 2011 14:47:40 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam 738e82e1: Fix b/5510870 by saving/restoring Activity states.
Yuli Huang [Wed, 9 Nov 2011 14:34:20 +0000 (14:34 +0000)]
am 738e82e1: Fix b/5510870 by saving/restoring Activity states.

* commit '738e82e163f90e1fe7aeef8bd153dc7763631f30':
  Fix b/5510870 by saving/restoring Activity states.

12 years agoFix 5585254: Make system UI enter "low profile mode" while playing.
Chih-Chung Chang [Wed, 9 Nov 2011 12:57:53 +0000 (20:57 +0800)]
Fix 5585254: Make system UI enter "low profile mode" while playing.

Change-Id: I91f680871b7a965f6776cb017dcd825a587e5054

12 years agoFix b/5510870 by persisting states of save/share buttons.
Yuli Huang [Wed, 9 Nov 2011 07:10:45 +0000 (15:10 +0800)]
Fix b/5510870 by persisting states of save/share buttons.

Change-Id: Ida5c2868199b75a1a710ee5b92e0e3dffd71cec6

12 years agoFix 5453262 No pictures / Videos available in Gallery message not displayed
Ray Chen [Wed, 9 Nov 2011 08:13:19 +0000 (16:13 +0800)]
Fix 5453262 No pictures / Videos available in Gallery message not displayed

Change-Id: Ib6c8691e4206f9d6a07a7587d22a67c1a21bc5a5

12 years agoam 13105e73: Merge "Add face tanning effect to gallery" into ics-mr1
Yuli Huang [Tue, 8 Nov 2011 18:49:14 +0000 (18:49 +0000)]
am 13105e73: Merge "Add face tanning effect to gallery" into ics-mr1

* commit '13105e73298f7ed0031232d48a7cf43ac4c0d21f':
  Add face tanning effect to gallery

12 years agoFix b/5510870 by saving/restoring Activity states.
Yuli Huang [Fri, 4 Nov 2011 08:39:50 +0000 (16:39 +0800)]
Fix b/5510870 by saving/restoring Activity states.

1. Filters implement Parcelable for saving/restoring states.
2. Extract Doodle for making doodling paths parcelable.

Change-Id: Ice8e6e068891da8a8f9251e62d95ea755fa99933

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 8 Nov 2011 14:46:22 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoMerge "Add face tanning effect to gallery" into ics-mr1
Yuli Huang [Tue, 8 Nov 2011 03:58:36 +0000 (19:58 -0800)]
Merge "Add face tanning effect to gallery" into ics-mr1

12 years agoam 826c44f2: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Mon, 7 Nov 2011 20:41:00 +0000 (20:41 +0000)]
am 826c44f2: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '826c44f23e8f3a5b9b5ed0227816f0a6441b5ed8':
  Import revised translations.  DO NOT MERGE

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Mon, 7 Nov 2011 20:36:26 +0000 (12:36 -0800)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Nov 2011 20:26:25 +0000 (12:26 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I60c0c0e36909fdad936f20880904a18ccddb503c

12 years agoam e9560e6c: Merge "Change OK to CROP fro CropImage." into ics-mr1
Wei Huang [Mon, 7 Nov 2011 18:57:34 +0000 (18:57 +0000)]
am e9560e6c: Merge "Change OK to CROP fro CropImage." into ics-mr1

* commit 'e9560e6c7bc55718c46264ac03eb7b44bfc857f2':
  Change OK to CROP fro CropImage.

12 years agoMerge "Change OK to CROP fro CropImage." into ics-mr1
Wei Huang [Mon, 7 Nov 2011 18:54:46 +0000 (10:54 -0800)]
Merge "Change OK to CROP fro CropImage." into ics-mr1

12 years agoam d6985f9b: Fix 5457600: In UriImage, read exif to determine orientation.
Chih-Chung Chang [Mon, 7 Nov 2011 18:34:30 +0000 (18:34 +0000)]
am d6985f9b: Fix 5457600: In UriImage, read exif to determine orientation.

* commit 'd6985f9ba58c11c29760f28be07ebd229a9b7a39':
  Fix 5457600: In UriImage, read exif to determine orientation.

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Mon, 7 Nov 2011 16:31:56 +0000 (08:31 -0800)]
Reconcile with ics-mr1-release

Change-Id: I0eb3a8338e095504809785f4f9ff15c0e8fc7329

12 years agoChange OK to CROP fro CropImage.
Owen Lin [Mon, 7 Nov 2011 10:09:51 +0000 (18:09 +0800)]
Change OK to CROP fro CropImage.

fix: 5199444

Change-Id: I8ee74ba371c5537d7b86d771a202e0ac40668dfc

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sun, 6 Nov 2011 14:46:37 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoFix 5457600: In UriImage, read exif to determine orientation.
Chih-Chung Chang [Mon, 24 Oct 2011 11:46:07 +0000 (19:46 +0800)]
Fix 5457600: In UriImage, read exif to determine orientation.

Change-Id: Iacc5c52747a4ed4dd8f6cab48ce784aff907525b

12 years agoAdd face tanning effect to gallery
Ruei-sung Lin [Fri, 14 Oct 2011 01:20:07 +0000 (18:20 -0700)]
Add face tanning effect to gallery

bug:  5453164

Change-Id: I259e80325854b9e4a2d2c93db74b306b8e15535c

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Fri, 4 Nov 2011 15:31:35 +0000 (08:31 -0700)]
Reconcile with ics-mr1-release

Change-Id: Ic37b4c137bcb0afe35a796aa8538ba50a8a7fb19

12 years agoFix 5556160 Crash in gallery after playing slideshow Crespo IML33B.
Ray Chen [Thu, 3 Nov 2011 07:47:38 +0000 (15:47 +0800)]
Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B.

Change-Id: Ia3de43eae5d96c9f1674dd1ccb01dc004612bda9

12 years agoam 529f5341: Merge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33...
Wei Huang [Thu, 3 Nov 2011 18:53:28 +0000 (18:53 +0000)]
am 529f5341: Merge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1

* commit '529f53415f34835a32105a73a23f7aa94c5a7e16':
  Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B.

12 years agoMerge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B." into...
Wei Huang [Thu, 3 Nov 2011 18:48:49 +0000 (11:48 -0700)]
Merge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1

12 years agoam cc2f8c4e: Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1
Chih-Chung Chang [Thu, 3 Nov 2011 16:43:42 +0000 (16:43 +0000)]
am cc2f8c4e: Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1

* commit 'cc2f8c4e24a9cd8fcf99e960f0148a57128b6133':
  Fix 5543077: Gallery UI tweaks.

12 years agoMerge "Fix 5543077: Gallery UI tweaks." into ics-mr1
Chih-Chung Chang [Thu, 3 Nov 2011 16:40:39 +0000 (09:40 -0700)]
Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1

12 years agoam 1a9b69fb: Merge "3252698: Make drawing target 60fps." into ics-mr1
Chih-Chung Chang [Thu, 3 Nov 2011 16:26:02 +0000 (16:26 +0000)]
am 1a9b69fb: Merge "3252698: Make drawing target 60fps." into ics-mr1

* commit '1a9b69fbc17263e00aa138dde0c52b37fab6766b':
  3252698: Make drawing target 60fps.

12 years agoMerge "3252698: Make drawing target 60fps." into ics-mr1
Chih-Chung Chang [Thu, 3 Nov 2011 16:19:40 +0000 (09:19 -0700)]
Merge "3252698: Make drawing target 60fps." into ics-mr1

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 3 Nov 2011 13:44:37 +0000 (06:44 -0700)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoFix 5543077: Gallery UI tweaks.
Chih-Chung Chang [Thu, 3 Nov 2011 11:25:58 +0000 (19:25 +0800)]
Fix 5543077: Gallery UI tweaks.

Change-Id: I0b85b37ba851628acd0853e4de0985b494606487

12 years agoam da9f0c77: Merge "Fix 5420843 [UI] Text strings for selecting images/album for...
Ray Chen [Thu, 3 Nov 2011 10:22:36 +0000 (10:22 +0000)]
am da9f0c77: Merge "Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1

* commit 'da9f0c773aa6c9ba228f30811df35d2c601dfdb6':
  Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing

12 years agoam eda8303b: Merge "Fix 5511057 Action bar UI is broken when sorting within an album...
Ray Chen [Thu, 3 Nov 2011 10:22:36 +0000 (10:22 +0000)]
am eda8303b: Merge "Fix 5511057 Action bar UI is broken when sorting within an album" into ics-mr1

* commit 'eda8303bebf12f60edf15a2abbc08b99a7c35eef':
  Fix 5511057 Action bar UI is broken when sorting within an album

12 years agoMerge "Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget...
Ray Chen [Thu, 3 Nov 2011 10:04:14 +0000 (03:04 -0700)]
Merge "Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1

12 years agoMerge "Fix 5511057 Action bar UI is broken when sorting within an album" into ics-mr1
Ray Chen [Thu, 3 Nov 2011 10:03:43 +0000 (03:03 -0700)]
Merge "Fix 5511057 Action bar UI is broken when sorting within an album" into ics-mr1

12 years agoFix 5556160 Crash in gallery after playing slideshow Crespo IML33B.
Ray Chen [Thu, 3 Nov 2011 07:47:38 +0000 (15:47 +0800)]
Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B.

Change-Id: Ia3de43eae5d96c9f1674dd1ccb01dc004612bda9

12 years ago3252698: Make drawing target 60fps.
Chih-Chung Chang [Thu, 3 Nov 2011 04:21:58 +0000 (12:21 +0800)]
3252698: Make drawing target 60fps.

Change-Id: I5dbff93713422e49378b8e215cac8b7f749ef38a

12 years agoam a98d3c4d: Merge "Add cover image to MediaSet." into ics-mr1
Owen Lin [Thu, 3 Nov 2011 02:26:35 +0000 (02:26 +0000)]
am a98d3c4d: Merge "Add cover image to MediaSet." into ics-mr1

* commit 'a98d3c4dbed84296496f5f710bd1289d735581d5':
  Add cover image to MediaSet.

12 years agoMerge "Add cover image to MediaSet." into ics-mr1
Owen Lin [Thu, 3 Nov 2011 02:24:27 +0000 (19:24 -0700)]
Merge "Add cover image to MediaSet." into ics-mr1

12 years agoam e617b945: (-s ours) am 82635d92: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Thu, 3 Nov 2011 00:43:25 +0000 (00:43 +0000)]
am e617b945: (-s ours) am 82635d92: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'e617b945b25f0034ff3136457b32bfe39b6d3e08':
  Import revised translations.  DO NOT MERGE

12 years agoam 82635d92: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 3 Nov 2011 00:04:24 +0000 (00:04 +0000)]
am 82635d92: (-s ours) Import revised translations.  DO NOT MERGE

* commit '82635d92bc0f2186da650a00fa458d1c542e2ec9':
  Import revised translations.  DO NOT MERGE

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Nov 2011 22:17:50 +0000 (15:17 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I6d64dfa6b24c8fdf56138637208d7e66ae95b7b2

12 years agoMerge "Import revised translations."
Eric Fischer [Wed, 2 Nov 2011 21:13:37 +0000 (14:13 -0700)]
Merge "Import revised translations."

12 years agoam c0c13c38: Merge "Fix 5471518 Playing slide show from any picture doesn\'t start...
Ray Chen [Wed, 2 Nov 2011 17:50:34 +0000 (17:50 +0000)]
am c0c13c38: Merge "Fix 5471518 Playing slide show from any picture doesn\'t start from the current picture which is unexpected IRL17 Crespo" into ics-mr1

* commit 'c0c13c38c8e4e86689f4989ca268f71cbb46bff0':
  Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo