OSDN Git Service

android-x86/packages-apps-Gallery2.git
12 years agoChange panorama java package name.
Pin Ting [Thu, 15 Mar 2012 06:46:53 +0000 (14:46 +0800)]
Change panorama java package name.

bug:5954391

Make camera, camcorder, panorama activities share the same java package.

Change-Id: I5b72e94d5fa335a4089e3700e4cc3b5af3f882f6

12 years agoFix 3462852 [UI] When linking from Camera preview - App icon with 'Up' arrow should...
Ray Chen [Tue, 6 Mar 2012 09:24:28 +0000 (17:24 +0800)]
Fix 3462852 [UI] When linking from Camera preview - App icon with 'Up' arrow should go to next level up.

Some changes in this CL:

1. ActivityState can decide whether to enable home button and show up arrow
2. ActivityState can handle home_up event on its own
3. Support getContentUri in LocalAlbum (Image/Video Roll) and LocalMergeAlbum (Camera Roll)
4. Gallery supports view action for AlbumPage (Camera Roll)

Change-Id: I85a75cdce9cbc2a877651fdec34a0180ed8e785c

12 years agoMerge "Fix 5406844 Category switcher does not highlight current selection"
Ray Chen [Thu, 15 Mar 2012 00:47:31 +0000 (17:47 -0700)]
Merge "Fix 5406844 Category switcher does not highlight current selection"

12 years agoAggregate three gesture detectors.
Chih-Chung Chang [Wed, 14 Mar 2012 09:39:42 +0000 (17:39 +0800)]
Aggregate three gesture detectors.

Change-Id: I270cd7bdeb81d9a8ea5d3aa122f44074413e7616

12 years agoReorganize import for all files.
Owen Lin [Wed, 14 Mar 2012 09:27:24 +0000 (17:27 +0800)]
Reorganize import for all files.

Change-Id: Ia9188bcde727e317e6a476caccaea562f0758b19

12 years agoMerge "Reuse bitmap for all micro thumb images to prevent GC."
Owen Lin [Wed, 14 Mar 2012 08:23:09 +0000 (01:23 -0700)]
Merge "Reuse bitmap for all micro thumb images to prevent GC."

12 years agoReuse bitmap for all micro thumb images to prevent GC.
Owen Lin [Wed, 7 Mar 2012 09:39:56 +0000 (17:39 +0800)]
Reuse bitmap for all micro thumb images to prevent GC.

Change-Id: I27d3002e5bb745a597f52962fe24744c8329441c

12 years agoSimplify PhotoEditor code.
Yuli Huang [Mon, 12 Mar 2012 08:34:41 +0000 (16:34 +0800)]
Simplify PhotoEditor code.

1. Encapsulate spinner usages inside Toolbar.
2. Remove unnecessary static variable usages.

Change-Id: Iaec614c5322a50c1e2c0cfa9cec1971b85e32f8a

12 years agoMerge "Set task affinity for Camera activities."
Chih-Chung Chang [Tue, 13 Mar 2012 05:31:44 +0000 (22:31 -0700)]
Merge "Set task affinity for Camera activities."

12 years agoSet task affinity for Camera activities.
Chih-Chung Chang [Tue, 13 Mar 2012 04:28:02 +0000 (12:28 +0800)]
Set task affinity for Camera activities.

Bug: 6156475
Change-Id: Idd1be6941242fdfc7f46c706c4a1948acf85d2be

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 12 Mar 2012 18:51:15 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ibd6567a362824e6ca459de53191c32c31813aa9d

12 years agoFix 5406844 Category switcher does not highlight current selection
Ray Chen [Mon, 12 Mar 2012 13:34:25 +0000 (21:34 +0800)]
Fix 5406844 Category switcher does not highlight current selection

Change-Id: I7f6295d452764220bd3faa49526be25872a42e6d

12 years agoAdd DisableCameraReceiver to disable camera activities if there is no camera.
Chih-Chung Chang [Mon, 12 Mar 2012 08:04:59 +0000 (16:04 +0800)]
Add DisableCameraReceiver to disable camera activities if there is no camera.

Change-Id: I84061e05c5eec793bf528df1c43d931d22d91d35

12 years agoChange id "root" to "movie_view_root" to avoid confusion.
Chih-Chung Chang [Mon, 12 Mar 2012 04:46:25 +0000 (12:46 +0800)]
Change id "root" to "movie_view_root" to avoid confusion.

There is also one id "root" in Camera.

Change-Id: Id6ebc5362f5ddceabe6dab6218de9b091454bde7

12 years agoMerge "Merge Camera into Gallery package."
Chih-Chung Chang [Fri, 9 Mar 2012 09:21:20 +0000 (01:21 -0800)]
Merge "Merge Camera into Gallery package."

12 years agoMerge Camera into Gallery package.
Chih-Chung Chang [Thu, 8 Mar 2012 12:10:53 +0000 (20:10 +0800)]
Merge Camera into Gallery package.

Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a

12 years agoFix b/5948180: Photo is repositioned during being scaled.
Yuli Huang [Thu, 8 Mar 2012 11:11:54 +0000 (19:11 +0800)]
Fix b/5948180: Photo is repositioned during being scaled.

Avoid repositioning photo to center vertically during scaling it.

Change-Id: Id9f2de6b2b1611419a0c03888cff49a5336b39df

12 years agoMerge "Fix b/5948187: Add progress text for loading video."
Yuli Huang [Thu, 8 Mar 2012 04:03:51 +0000 (20:03 -0800)]
Merge "Fix b/5948187: Add progress text for loading video."

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 7 Mar 2012 19:12:06 +0000 (11:12 -0800)]
Import translations. DO NOT MERGE

Change-Id: I675ae2b5e04df6941251c8f561033fefffca3c93

12 years agoFix b/5948187: Add progress text for loading video.
Yuli Huang [Wed, 7 Mar 2012 11:35:28 +0000 (19:35 +0800)]
Fix b/5948187: Add progress text for loading video.

Change-Id: If85a5db3c6128cf0c59b97dc44f51cdfc87d225b

12 years agoFix b/5885342: Multiple PhotoEditor activities cause exceptions.
Yuli Huang [Tue, 6 Mar 2012 17:18:08 +0000 (01:18 +0800)]
Fix b/5885342: Multiple PhotoEditor activities cause exceptions.

Avoid using a static variable to keep tracking views across activities.

Change-Id: Ia53444502d476d37b64344e5aea5f58a06ee3b03

12 years agoUse AnimationTime for animation caluclation.
Chih-Chung Chang [Fri, 2 Mar 2012 10:14:53 +0000 (18:14 +0800)]
Use AnimationTime for animation caluclation.

Change-Id: I3af8334978c054ddbc2050a240f0d9c113a44012

12 years agoFix a wrong flag value.
Yuli Huang [Thu, 1 Mar 2012 09:39:47 +0000 (17:39 +0800)]
Fix a wrong flag value.

Change-Id: I7450dc31bb307b19dcfd34ee7df83126df1d294e

12 years agoFix b/6064909: Photo might not be snapped back correctly.
Yuli Huang [Thu, 1 Mar 2012 08:51:08 +0000 (16:51 +0800)]
Fix b/6064909: Photo might not be snapped back correctly.

Photo might not be snapped back if the animation wasn't actually started
because of no position/scale changes.

Change-Id: I6b5e938bffd954b848cae04514a06d0427151025

12 years agoFix b/5624131: Panning enlarged photo switches images by mistake.
Yuli Huang [Thu, 23 Feb 2012 14:26:12 +0000 (22:26 +0800)]
Fix b/5624131: Panning enlarged photo switches images by mistake.

Avoid swiping images when panning to view vertically enlarged photo.

Change-Id: Ieb72cb8f38595fbedc927e8a0380fe31532ee434

12 years agoMerge "Fix 5948189 BUG BASH: action bar flashes during multi-select"
Ray Chen [Wed, 29 Feb 2012 07:29:01 +0000 (23:29 -0800)]
Merge "Fix 5948189 BUG BASH: action bar flashes during multi-select"

12 years agoFix 5948189 BUG BASH: action bar flashes during multi-select
Ray Chen [Mon, 20 Feb 2012 05:32:47 +0000 (13:32 +0800)]
Fix 5948189 BUG BASH: action bar flashes during multi-select

This CL fixes the flashing by disabling MenuItem directly instead of setting null intent
to ShareActionProvider, so there won't be any "icons shrinking" effect that causes flashing.

The rest of the change is code refactoring. More comments are added and the final UI operations
are merged into one Runnable object.

Change-Id: I73843c1df6b7a9675176e1b3ae6a35cc1cb715fa

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 28 Feb 2012 19:11:26 +0000 (11:11 -0800)]
Import translations. DO NOT MERGE

Change-Id: If2542a34f7e9e4b999252e8cf98cd2a5a8b9f3d9

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 27 Feb 2012 20:21:35 +0000 (12:21 -0800)]
Import translations. DO NOT MERGE

Change-Id: Idf31034a533999342bf2452f2e66b6cc0ae4dd7c

12 years agoFix 5948223 [bug bash] Albums text disappears when exiting gallery
Ray Chen [Fri, 17 Feb 2012 05:12:32 +0000 (13:12 +0800)]
Fix 5948223 [bug bash] Albums text disappears when exiting gallery

Change-Id: Ib787184f747ff30afabc35b16b46950dc3b5b50c

12 years agoFix 5948410 BUG BASH: Temporarily title is displayed during gallery start
Ray Chen [Fri, 17 Feb 2012 04:40:44 +0000 (12:40 +0800)]
Fix 5948410 BUG BASH: Temporarily title is displayed during gallery start

Change-Id: I88a67e3e9437124001be836239736a8275c1abf4

12 years agoRemove unused code.
Chih-Chung Chang [Wed, 22 Feb 2012 00:00:31 +0000 (08:00 +0800)]
Remove unused code.

Change-Id: I167596ab023671651df298ddb2b80b7c782f4223

12 years agoReduce memory allocation and make small improvements.
Chih-Chung Chang [Fri, 17 Feb 2012 22:17:18 +0000 (06:17 +0800)]
Reduce memory allocation and make small improvements.

Change-Id: Iac3f302454119de6363cd5cfb158619e739b0536

12 years agoCache animation time value to reduce work and synchronize animation.
Chih-Chung Chang [Fri, 17 Feb 2012 02:02:27 +0000 (10:02 +0800)]
Cache animation time value to reduce work and synchronize animation.

Change-Id: I00081bc6037c01dafc56cf017dcc1da448c1d106

12 years agoMerge "Change from fillRect to clearBuffer for pure black background."
Chih-Chung Chang [Thu, 16 Feb 2012 20:47:14 +0000 (12:47 -0800)]
Merge "Change from fillRect to clearBuffer for pure black background."

12 years agoam 09528ef1: am aa5bdb1a: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 16 Feb 2012 19:25:39 +0000 (11:25 -0800)]
am 09528ef1: am aa5bdb1a: Reconcile with ics-mr1-release

* commit '09528ef10279f3893210ebcebb7a099e58c6c965':

12 years agoam be493ca8: am 5e73e2dc: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 16 Feb 2012 19:25:23 +0000 (11:25 -0800)]
am be493ca8: am 5e73e2dc: Reconcile with ics-mr1-release

* commit 'be493ca826bf56324aef42fbdbda0912539c9a3e':

12 years agoChange from fillRect to clearBuffer for pure black background.
Chih-Chung Chang [Thu, 16 Feb 2012 18:25:23 +0000 (02:25 +0800)]
Change from fillRect to clearBuffer for pure black background.

Change-Id: Ie3da19b377f3e7926ab37c5936ce48cbb3227f92

12 years agoam aa5bdb1a: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 16 Feb 2012 18:13:54 +0000 (10:13 -0800)]
am aa5bdb1a: Reconcile with ics-mr1-release

* commit 'aa5bdb1afac03ece211f0375372fcc7d35e4fbbd':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Thu, 16 Feb 2012 18:10:54 +0000 (10:10 -0800)]
Reconcile with ics-mr1-release

Change-Id: I5fc102975a6f3ef9fe1fa8c73260b9571dce0e1a

12 years agoam 5e73e2dc: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 16 Feb 2012 18:06:44 +0000 (10:06 -0800)]
am 5e73e2dc: Reconcile with ics-mr1-release

* commit '5e73e2dcb3cea2d87a4c82c7e89919b3c766d3b0':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Thu, 16 Feb 2012 18:02:59 +0000 (10:02 -0800)]
Reconcile with ics-mr1-release

Change-Id: I3b1152bc0e20e7097af445995283581c655e3f2b

12 years agoSimplify the reference from textures to GLCanvas.
Chih-Chung Chang [Thu, 16 Feb 2012 18:02:12 +0000 (02:02 +0800)]
Simplify the reference from textures to GLCanvas.

Change-Id: Ia64e60ec4b920b707148f7c2b9373ce484a52d9f

12 years agoMake GLCanvas a bit faster.
Chih-Chung Chang [Wed, 15 Feb 2012 23:27:03 +0000 (07:27 +0800)]
Make GLCanvas a bit faster.

(1) make a faster version of translate(x, y).
(2) make mapPoints() faster.
(3) avoid calling canvas.rotate() when it is not needed.

Change-Id: I364e2aa3fc9ee81c43f42f3af8b2d30a1241b482

12 years agoMerge "Try to use less of "Long" to make the program faster."
Chih-Chung Chang [Wed, 15 Feb 2012 20:36:29 +0000 (12:36 -0800)]
Merge "Try to use less of "Long" to make the program faster."

12 years agoTry to use less of "Long" to make the program faster.
Chih-Chung Chang [Wed, 15 Feb 2012 00:19:50 +0000 (08:19 +0800)]
Try to use less of "Long" to make the program faster.

Change-Id: I6adb870a8f2bca97318d0fbb6f42388aef4c19c1

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 14 Feb 2012 22:16:37 +0000 (14:16 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoImport translations.
Eric Fischer [Tue, 14 Feb 2012 21:18:04 +0000 (13:18 -0800)]
Import translations.

Change-Id: I958b1d3318cbf5a8840ba8053ac748f1d96a7eff

12 years agoam eeda756e: Merge "Add profiling tools."
Chih-Chung Chang [Tue, 14 Feb 2012 17:30:35 +0000 (09:30 -0800)]
am eeda756e: Merge "Add profiling tools."

* commit 'eeda756e6efb58710916d614a4c79437df25e380':
  Add profiling tools.

12 years agoMerge "Add profiling tools."
Chih-Chung Chang [Tue, 14 Feb 2012 17:28:17 +0000 (09:28 -0800)]
Merge "Add profiling tools."

12 years agoam a431626b: Merge "Fix b/5948042: Incorrect scrolling position after deleting pictures."
Yuli Huang [Tue, 14 Feb 2012 03:28:24 +0000 (19:28 -0800)]
am a431626b: Merge "Fix b/5948042: Incorrect scrolling position after deleting pictures."

* commit 'a431626bba8c6441fe0ee007e9d950b47f06ad96':
  Fix b/5948042: Incorrect scrolling position after deleting pictures.

12 years agoMerge "Fix b/5948042: Incorrect scrolling position after deleting pictures."
Yuli Huang [Tue, 14 Feb 2012 03:26:38 +0000 (19:26 -0800)]
Merge "Fix b/5948042: Incorrect scrolling position after deleting pictures."

12 years agoAdd profiling tools.
Chih-Chung Chang [Fri, 3 Feb 2012 13:17:17 +0000 (21:17 +0800)]
Add profiling tools.

Change-Id: Ieab118ededaab5ef46408fac6fdb66b9fff4900e

12 years agoam 7f10c153: Merge "Use FloatMath instead of Math."
Chih-Chung Chang [Mon, 13 Feb 2012 18:24:12 +0000 (10:24 -0800)]
am 7f10c153: Merge "Use FloatMath instead of Math."

* commit '7f10c1533e087b528f58294edaba18726e350103':
  Use FloatMath instead of Math.

12 years agoMerge "Use FloatMath instead of Math."
Chih-Chung Chang [Mon, 13 Feb 2012 18:22:25 +0000 (10:22 -0800)]
Merge "Use FloatMath instead of Math."

12 years agoFix b/5948042: Incorrect scrolling position after deleting pictures.
Yuli Huang [Mon, 13 Feb 2012 11:55:58 +0000 (19:55 +0800)]
Fix b/5948042: Incorrect scrolling position after deleting pictures.

Scrolling position may not be updated correctly after deleting some
pictures.

Change-Id: I82de2cf1178ed1f97e48162a0e3bdf00a34d9bad

12 years agoam fef6691d: Merge "Shows video filename read from OpenableColumns."
Pin Ting [Sat, 11 Feb 2012 07:21:03 +0000 (23:21 -0800)]
am fef6691d: Merge "Shows video filename read from OpenableColumns."

* commit 'fef6691d870711d8cdaf3ac14b24e5a7c6496b6f':
  Shows video filename read from OpenableColumns.

12 years agoMerge "Shows video filename read from OpenableColumns."
Pin Ting [Sat, 11 Feb 2012 07:19:29 +0000 (23:19 -0800)]
Merge "Shows video filename read from OpenableColumns."

12 years agoUse FloatMath instead of Math.
Chih-Chung Chang [Fri, 10 Feb 2012 23:19:47 +0000 (07:19 +0800)]
Use FloatMath instead of Math.

Change-Id: I41661b231f6c034dbca6af26d5950eda6c5fc7da

12 years agoam 4a9c58cb: Merge "Revert "Use FloatMath instead of Math.""
Chih-Chung Chang [Sat, 11 Feb 2012 01:10:42 +0000 (17:10 -0800)]
am 4a9c58cb: Merge "Revert "Use FloatMath instead of Math.""

* commit '4a9c58cb0029a4ea96c2ade614c265805d699179':
  Revert "Use FloatMath instead of Math."

12 years agoMerge "Revert "Use FloatMath instead of Math.""
Chih-Chung Chang [Sat, 11 Feb 2012 01:09:31 +0000 (17:09 -0800)]
Merge "Revert "Use FloatMath instead of Math.""

12 years agoRevert "Use FloatMath instead of Math."
Chih-Chung Chang [Sat, 11 Feb 2012 01:08:58 +0000 (17:08 -0800)]
Revert "Use FloatMath instead of Math."

This reverts commit 6bb8b2eb8695c042798f0eb798032cd30d642a65

12 years agoam af4724e9: Merge "Use FloatMath instead of Math."
Chih-Chung Chang [Sat, 11 Feb 2012 00:12:08 +0000 (16:12 -0800)]
am af4724e9: Merge "Use FloatMath instead of Math."

* commit 'af4724e9fe7f0b6636c1c90219283c37acbee45b':
  Use FloatMath instead of Math.

12 years agoMerge "Use FloatMath instead of Math."
Chih-Chung Chang [Sat, 11 Feb 2012 00:10:20 +0000 (16:10 -0800)]
Merge "Use FloatMath instead of Math."

12 years agoUse FloatMath instead of Math.
Chih-Chung Chang [Fri, 10 Feb 2012 23:19:47 +0000 (07:19 +0800)]
Use FloatMath instead of Math.

Change-Id: I26eb6a554f72c13ba2801ce35ef0cf2a1466a97b

12 years agoShows video filename read from OpenableColumns.
Pin Ting [Fri, 10 Feb 2012 18:53:53 +0000 (02:53 +0800)]
Shows video filename read from OpenableColumns.

bug:5796182
Change-Id: I92bc652d713bcc70b5a048f5948dc17e90a5e874

12 years agoam 164bd217: am 35659b2c: (-s ours) am 70992e04: (-s ours) am a64072a4: Merge "Import...
Justin Ho [Fri, 10 Feb 2012 18:25:00 +0000 (10:25 -0800)]
am 164bd217: am 35659b2c: (-s ours) am 70992e04: (-s ours) am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1

* commit '164bd217f574f68e9f3b03ed59b34842cacf4ca5':

12 years agoam 35659b2c: (-s ours) am 70992e04: (-s ours) am a64072a4: Merge "Import translations...
Justin Ho [Fri, 10 Feb 2012 18:19:59 +0000 (10:19 -0800)]
am 35659b2c: (-s ours) am 70992e04: (-s ours) am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1

* commit '35659b2c06a70381b462f1e7029eda13aa5e97d6':

12 years agoam b09b9bd0: am c2bc46ea: (-s ours) am 4e1e57fd: am a64072a4: Merge "Import translati...
Justin Ho [Fri, 10 Feb 2012 18:18:10 +0000 (10:18 -0800)]
am b09b9bd0: am c2bc46ea: (-s ours) am 4e1e57fd: am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1

* commit 'b09b9bd0af11a5985c8854e9161c8e0a9637486f':
  Import translations. DO NOT MERGE

12 years agoam c2661be5: am ee7512d6: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ssh:...
Eric Fischer [Fri, 10 Feb 2012 18:18:09 +0000 (10:18 -0800)]
am c2661be5: am ee7512d6: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/packages/apps/Gallery2 into ics-scoop-plus-aosp

* commit 'c2661be5d5531cc70cf3f4c9387b4ac0cde5f0e5':

12 years agoam d46c2b12: am 4707351e: (-s ours) am 3293fee0: am dfeefe6a: Import translations...
Eric Fischer [Fri, 10 Feb 2012 18:15:47 +0000 (10:15 -0800)]
am d46c2b12: am 4707351e: (-s ours) am 3293fee0: am dfeefe6a: Import translations. DO NOT MERGE

* commit 'd46c2b121f0f544d186e0ecd55a2e492bbd7465f':
  Import translations. DO NOT MERGE

12 years agoam c2bc46ea: (-s ours) am 4e1e57fd: am a64072a4: Merge "Import translations. DO NOT...
Justin Ho [Fri, 10 Feb 2012 18:15:37 +0000 (10:15 -0800)]
am c2bc46ea: (-s ours) am 4e1e57fd: am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1

* commit 'c2bc46ea31e7ec145f11ba7a7d5f5891ad0c50ac':
  Import translations. DO NOT MERGE

12 years agoam ee7512d6: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git...
Eric Fischer [Fri, 10 Feb 2012 18:15:24 +0000 (10:15 -0800)]
am ee7512d6: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/packages/apps/Gallery2 into ics-scoop-plus-aosp

* commit 'ee7512d63a1ea117b7655f28ea30bcb1d8cb151d':

12 years agoam 70992e04: (-s ours) am a64072a4: Merge "Import translations. DO NOT MERGE" into...
Justin Ho [Fri, 10 Feb 2012 18:13:20 +0000 (10:13 -0800)]
am 70992e04: (-s ours) am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1

* commit '70992e04d00e6708d33adbb7c016499b6e030d68':

12 years agoam 4707351e: (-s ours) am 3293fee0: am dfeefe6a: Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:13:19 +0000 (10:13 -0800)]
am 4707351e: (-s ours) am 3293fee0: am dfeefe6a: Import translations. DO NOT MERGE

* commit '4707351e0baec6326e6c74b5c184a66552929c3b':
  Import translations. DO NOT MERGE

12 years agoam 4e1e57fd: am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1
Justin Ho [Fri, 10 Feb 2012 18:10:55 +0000 (10:10 -0800)]
am 4e1e57fd: am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1

* commit '4e1e57fdba6999cb46f1f72eb529ffbb68be83a6':
  Import translations. DO NOT MERGE

12 years agoam a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1
Justin Ho [Fri, 10 Feb 2012 18:09:34 +0000 (10:09 -0800)]
am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1

* commit 'a64072a481580cbe3f3166f0c6d4424b20f1275c':
  Import translations. DO NOT MERGE

12 years agoMerge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/packages/apps...
Eric Fischer [Fri, 10 Feb 2012 18:08:47 +0000 (10:08 -0800)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/packages/apps/Gallery2 into ics-scoop-plus-aosp

12 years agoam 3293fee0: am dfeefe6a: Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:08:30 +0000 (10:08 -0800)]
am 3293fee0: am dfeefe6a: Import translations. DO NOT MERGE

* commit '3293fee0e28ee082b91e171ae83c2dde6af2c036':
  Import translations. DO NOT MERGE

12 years agoam 3f9bc412: (-s ours) am dfeefe6a: Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:08:29 +0000 (10:08 -0800)]
am 3f9bc412: (-s ours) am dfeefe6a: Import translations. DO NOT MERGE

* commit '3f9bc4128e2f59cef855863dcb71de5d0ecaf69b':
  Import translations. DO NOT MERGE

12 years agoam a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1
Justin Ho [Fri, 10 Feb 2012 18:08:14 +0000 (10:08 -0800)]
am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1

* commit 'a64072a481580cbe3f3166f0c6d4424b20f1275c':
  Import translations. DO NOT MERGE

12 years agoMerge "Import translations. DO NOT MERGE" into ics-mr1
Justin Ho [Fri, 10 Feb 2012 18:06:24 +0000 (10:06 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-mr1

12 years agoam dfeefe6a: Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:05:40 +0000 (10:05 -0800)]
am dfeefe6a: Import translations. DO NOT MERGE

* commit 'dfeefe6a7a3ede9735c9f90dae99d5e354b621b7':
  Import translations. DO NOT MERGE

12 years agoam dfeefe6a: Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:05:09 +0000 (10:05 -0800)]
am dfeefe6a: Import translations. DO NOT MERGE

* commit 'dfeefe6a7a3ede9735c9f90dae99d5e354b621b7':
  Import translations. DO NOT MERGE

12 years agoam fbc235e4: Merge "Fix b/5974541: Support up to 45 degrees for straighten."
Yuli Huang [Fri, 10 Feb 2012 07:37:54 +0000 (23:37 -0800)]
am fbc235e4: Merge "Fix b/5974541: Support up to 45 degrees for straighten."

* commit 'fbc235e42c17f8c06e6be753b0863ec2ee2539e7':
  Fix b/5974541: Support up to 45 degrees for straighten.

12 years agoMerge "Fix b/5974541: Support up to 45 degrees for straighten."
Yuli Huang [Fri, 10 Feb 2012 07:36:29 +0000 (23:36 -0800)]
Merge "Fix b/5974541: Support up to 45 degrees for straighten."

12 years agoam 49d11f8b: Merge "Fix indent."
Ray Chen [Thu, 9 Feb 2012 14:48:30 +0000 (06:48 -0800)]
am 49d11f8b: Merge "Fix indent."

* commit '49d11f8bace6432c5246d832966a3b15b7e54933':
  Fix indent.

12 years agoMerge "Fix indent."
Ray Chen [Thu, 9 Feb 2012 14:47:12 +0000 (06:47 -0800)]
Merge "Fix indent."

12 years agoFix b/5974541: Support up to 45 degrees for straighten.
Yuli Huang [Thu, 9 Feb 2012 10:39:31 +0000 (18:39 +0800)]
Fix b/5974541: Support up to 45 degrees for straighten.

Change-Id: I131a478c59f5619e801311d9872440b2c7014578

12 years agoam f948355d: Merge "Fix b/5974663: inconsistent transparency of disabled action buttons."
Yuli Huang [Thu, 9 Feb 2012 07:58:57 +0000 (23:58 -0800)]
am f948355d: Merge "Fix b/5974663: inconsistent transparency of disabled action buttons."

* commit 'f948355db86dde8531088d49c69a4ac0a5d1231e':
  Fix b/5974663: inconsistent transparency of disabled action buttons.

12 years agoam e4321efb: Merge "Shows image filename read from OpenableColumns."
Pin Ting [Thu, 9 Feb 2012 07:57:18 +0000 (23:57 -0800)]
am e4321efb: Merge "Shows image filename read from OpenableColumns."

* commit 'e4321efb533ebf1801f5dd738ec3e8efe426e3a2':
  Shows image filename read from OpenableColumns.

12 years agoMerge "Fix b/5974663: inconsistent transparency of disabled action buttons."
Yuli Huang [Thu, 9 Feb 2012 07:57:11 +0000 (23:57 -0800)]
Merge "Fix b/5974663: inconsistent transparency of disabled action buttons."

12 years agoMerge "Shows image filename read from OpenableColumns."
Pin Ting [Thu, 9 Feb 2012 07:55:48 +0000 (23:55 -0800)]
Merge "Shows image filename read from OpenableColumns."

12 years agoFix b/5974663: inconsistent transparency of disabled action buttons.
Yuli Huang [Thu, 9 Feb 2012 07:21:40 +0000 (15:21 +0800)]
Fix b/5974663: inconsistent transparency of disabled action buttons.

1. Avoid gray out save-button again as disabled alpha is already applied
to all text buttons.
2. Reduce disabled alpha of image buttons to make them look consistent
with text buttons.

Change-Id: Ie76988db1424ce036470a754acd2e4501979dd1a

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 9 Feb 2012 02:34:03 +0000 (18:34 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ied427c7a1b1e87e666b170a5aa533c638bab97a3

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 9 Feb 2012 02:08:34 +0000 (18:08 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5d1ba410c706ae3d540af1b1b8cdf260ceb517eb

12 years agoam 25a69159: Import translations. DO NOT MERGE
Eric Fischer [Wed, 8 Feb 2012 21:13:14 +0000 (13:13 -0800)]
am 25a69159: Import translations. DO NOT MERGE

* commit '25a6915956887a33b60b848584176c2bc6845479':
  Import translations. DO NOT MERGE

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 8 Feb 2012 21:06:28 +0000 (13:06 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ib49ea69bac5f27840a1e542a5e0946c09a1d264c

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 8 Feb 2012 21:06:10 +0000 (13:06 -0800)]
Import translations. DO NOT MERGE

Change-Id: Idf23634c1451bbfbd2e2bc815977b1a4dc7d8740

12 years agoam 88c7a253: Import translations. DO NOT MERGE
Eric Fischer [Tue, 7 Feb 2012 18:36:16 +0000 (10:36 -0800)]
am 88c7a253: Import translations. DO NOT MERGE

* commit '88c7a253f83302d57f7fafdd74a0021e59e9454f':
  Import translations. DO NOT MERGE