OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 3326551f: (-s ours) am c00af20f: Import translations. DO NOT MERGE
Ying Wang [Wed, 27 Jun 2012 18:49:45 +0000 (11:49 -0700)]
am 3326551f: (-s ours) am c00af20f: Import translations. DO NOT MERGE

* commit '3326551f504f48073c7083738e1f58f4cf7a3f49':
  Import translations. DO NOT MERGE

11 years agoam c00af20f: Import translations. DO NOT MERGE
Ying Wang [Wed, 27 Jun 2012 18:47:10 +0000 (11:47 -0700)]
am c00af20f: Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Ying Wang [Wed, 27 Jun 2012 18:23:44 +0000 (11:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id2dc6d5f32fc724c03e0f3a628590f6f07f87357

11 years agoImport translations. DO NOT MERGE
Ying Wang [Wed, 27 Jun 2012 18:23:07 +0000 (11:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5df2833519f46df2d6d9b5e290b605b0811d397f

11 years agoam acd75301: am bb52543c: Merge "Show undo option for 3 seconds after the last pictur...
Chih-Chung Chang [Wed, 27 Jun 2012 07:10:33 +0000 (00:10 -0700)]
am acd75301: am bb52543c: Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev

* commit 'acd753010dcf6d8079e4620722921694cb041dbf':
  Show undo option for 3 seconds after the last picture is deleted.

11 years agoam bb52543c: Merge "Show undo option for 3 seconds after the last picture is deleted...
Chih-Chung Chang [Wed, 27 Jun 2012 07:07:46 +0000 (00:07 -0700)]
am bb52543c: Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev

* commit 'bb52543c6ba40749d7046f6ea9da4a8b30793f8d':
  Show undo option for 3 seconds after the last picture is deleted.

11 years agoMerge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev
Chih-Chung Chang [Wed, 27 Jun 2012 07:05:15 +0000 (00:05 -0700)]
Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev

11 years agoam 52d51fff: am fc826a5f: Merge "Migrate local-album gallery widgets from pre-JB...
Hung-ying Tyan [Wed, 27 Jun 2012 06:47:29 +0000 (23:47 -0700)]
am 52d51fff: am fc826a5f: Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev

* commit '52d51fff7affd82bc69b025d261ebf19b25728c2':
  Migrate local-album gallery widgets from pre-JB.

11 years agoam fc826a5f: Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev
Hung-ying Tyan [Wed, 27 Jun 2012 06:44:47 +0000 (23:44 -0700)]
am fc826a5f: Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev

* commit 'fc826a5ff488e9e3b27d2a521518e0ae5346b9fe':
  Migrate local-album gallery widgets from pre-JB.

11 years agoMerge "Migrate local-album gallery widgets from pre-JB." into jb-dev
Hung-ying Tyan [Wed, 27 Jun 2012 06:42:36 +0000 (23:42 -0700)]
Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev

11 years agoShow undo option for 3 seconds after the last picture is deleted.
Chih-Chung Chang [Wed, 27 Jun 2012 05:40:06 +0000 (13:40 +0800)]
Show undo option for 3 seconds after the last picture is deleted.

Bug: 6742326
Change-Id: I5008c1984fff0a2affaeabf2a195cfcdc517ebc2

11 years agoMigrate local-album gallery widgets from pre-JB.
Hung-ying Tyan [Tue, 26 Jun 2012 13:15:30 +0000 (21:15 +0800)]
Migrate local-album gallery widgets from pre-JB.

The path of external storage is changed to /storage/sdcard0 in JB and the bucket
IDs in MediaStore are changed accordinly. The local-album gallery widget is
saved by its bucket ID so this needs to be migrated to new value as well.

Bug: 6720251
Change-Id: I58a3044f2f05d428a9524f7a8053259950d5128d

11 years agoam 27a76801: am c7e89dae: Update thumbnail if a picture is deleted in background.
Chih-Chung Chang [Tue, 26 Jun 2012 17:47:37 +0000 (10:47 -0700)]
am 27a76801: am c7e89dae: Update thumbnail if a picture is deleted in background.

* commit '27a768018b18f45b9dd912bafd09dea64460f852':
  Update thumbnail if a picture is deleted in background.

11 years agoam c7e89dae: Update thumbnail if a picture is deleted in background.
Chih-Chung Chang [Tue, 26 Jun 2012 17:45:02 +0000 (10:45 -0700)]
am c7e89dae: Update thumbnail if a picture is deleted in background.

* commit 'c7e89daeb178a895de211c411d09a822de52e4e9':
  Update thumbnail if a picture is deleted in background.

11 years agoUpdate thumbnail if a picture is deleted in background.
Chih-Chung Chang [Tue, 26 Jun 2012 11:12:09 +0000 (19:12 +0800)]
Update thumbnail if a picture is deleted in background.

Bug: 6712751
Change-Id: I17f56c9ff04441e51f28b3e3bec23b1ac308b70c

11 years agoam 64cebdd1: am 6118af9d: Fix the behavior of deleting the last picture.
Chih-Chung Chang [Tue, 26 Jun 2012 10:42:04 +0000 (03:42 -0700)]
am 64cebdd1: am 6118af9d: Fix the behavior of deleting the last picture.

* commit '64cebdd1eebd2c001e6680f247c6f741889ad989':
  Fix the behavior of deleting the last picture.

11 years agoam 6118af9d: Fix the behavior of deleting the last picture.
Chih-Chung Chang [Tue, 26 Jun 2012 10:40:04 +0000 (03:40 -0700)]
am 6118af9d: Fix the behavior of deleting the last picture.

* commit '6118af9ddad8acc050133154f8f60c842c7f9bfa':
  Fix the behavior of deleting the last picture.

11 years agoFix the behavior of deleting the last picture.
Chih-Chung Chang [Fri, 22 Jun 2012 12:56:04 +0000 (20:56 +0800)]
Fix the behavior of deleting the last picture.

Also fix the jank while deleting multiple pictures quickly.

Bug: 67139326712555
Change-Id: I9d64d8bbdcd4ec0dc9a447a51d50f88ff27363b4

11 years agoMerge "Use public OverScroller() instead of a hidden one.."
Pin Ting [Tue, 26 Jun 2012 06:07:05 +0000 (23:07 -0700)]
Merge "Use public OverScroller() instead of a hidden one.."

11 years agoMerge "Use another version of setRemoteViews for backward compatibility."
Owen Lin [Tue, 26 Jun 2012 04:08:56 +0000 (21:08 -0700)]
Merge "Use another version of setRemoteViews for backward compatibility."

11 years agoMerge "Use MediaColumns.WIDTH and MediaColumns.HEIGHT only when they are available."
Owen Lin [Tue, 26 Jun 2012 04:08:20 +0000 (21:08 -0700)]
Merge "Use MediaColumns.WIDTH and MediaColumns.HEIGHT only when they are available."

11 years agoUse public OverScroller() instead of a hidden one..
Pin Ting [Wed, 20 Jun 2012 10:39:57 +0000 (18:39 +0800)]
Use public OverScroller() instead of a hidden one..

Bug:6698374
Change-Id: I3a97d0b4bbfb5e2a1e9f4a656d39db636defcdbd

11 years agoam 57150b3c: Reconcile with jb-release
The Android Open Source Project [Fri, 22 Jun 2012 22:23:50 +0000 (15:23 -0700)]
am 57150b3c: Reconcile with jb-release

* commit '57150b3c30a066bdf7f346223bf0707a345c4e47':

11 years agoReconcile with jb-release
The Android Open Source Project [Fri, 22 Jun 2012 22:20:45 +0000 (15:20 -0700)]
Reconcile with jb-release

Change-Id: Ica9e5255d9ea862cb24ef52d69545881147a2a26

11 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 22 Jun 2012 22:08:45 +0000 (15:08 -0700)]
merge in jb-release history after reset to jb-dev

11 years agoam ea34811c: (-s ours) am 55fad05e: Import translations. DO NOT MERGE
Ying Wang [Fri, 22 Jun 2012 19:30:22 +0000 (12:30 -0700)]
am ea34811c: (-s ours) am 55fad05e: Import translations. DO NOT MERGE

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

11 years agoam 55fad05e: Import translations. DO NOT MERGE
Ying Wang [Fri, 22 Jun 2012 19:28:13 +0000 (12:28 -0700)]
am 55fad05e: Import translations. DO NOT MERGE

* commit '55fad05ef4a80b3a690d4748c5b90fb5c0488d22':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Ying Wang [Fri, 22 Jun 2012 17:55:29 +0000 (10:55 -0700)]
Import translations. DO NOT MERGE

Change-Id: If644f38aa01a00a9eb6906f487ec46c0f1a0d532

11 years agoImport translations. DO NOT MERGE
Ying Wang [Fri, 22 Jun 2012 17:54:51 +0000 (10:54 -0700)]
Import translations. DO NOT MERGE

Change-Id: I49c07cd7b3bde69fb0b2b09c298710cae6d2a91f

11 years agoam 9334cdf3: Reconcile with jb-release
The Android Open Source Project [Fri, 22 Jun 2012 15:20:21 +0000 (08:20 -0700)]
am 9334cdf3: Reconcile with jb-release

* commit '9334cdf3825667134a55b198568c76ae40fc4a57':

11 years agoReconcile with jb-release
The Android Open Source Project [Fri, 22 Jun 2012 15:17:20 +0000 (08:17 -0700)]
Reconcile with jb-release

Change-Id: I20961dda95f0a5b0b580b73de5e8b09434eaaa44

11 years agoUse another version of setRemoteViews for backward compatibility.
Owen Lin [Fri, 22 Jun 2012 07:33:53 +0000 (15:33 +0800)]
Use another version of setRemoteViews for backward compatibility.

bug: 6706684
Change-Id: I6fd77845d64cfb9e6830c1eabdcb5c2e9a7df854

11 years agoUse MediaColumns.WIDTH and MediaColumns.HEIGHT only when they are available.
Owen Lin [Fri, 22 Jun 2012 04:31:33 +0000 (12:31 +0800)]
Use MediaColumns.WIDTH and MediaColumns.HEIGHT only when they are available.

bug:6698720

Change-Id: Iaabfd1d5fe16b5d89f564d688a78e773ad36c8bd

11 years agoGuard the use of SYSTEM_UI_FLAG_XXXX with TargetApi
Owen Lin [Wed, 20 Jun 2012 08:54:24 +0000 (16:54 +0800)]
Guard the use of SYSTEM_UI_FLAG_XXXX with TargetApi

bug: 6698718

Change-Id: I6962f0128ce2bd57658b7f3b77d2bc150eff1f60

11 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 21 Jun 2012 21:20:58 +0000 (14:20 -0700)]
merge in jb-release history after reset to jb-dev

11 years agoam 3ca90d33: (-s ours) am 424df443: Import translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 19:03:47 +0000 (12:03 -0700)]
am 3ca90d33: (-s ours) am 424df443: Import translations. DO NOT MERGE

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

11 years agoam 424df443: Import translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 18:52:47 +0000 (11:52 -0700)]
am 424df443: Import translations. DO NOT MERGE

* commit '424df443c6d1252c858d90e6e3a73914e81e4d14':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 18:02:05 +0000 (11:02 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib58116d9f2da412110e7a45fe8c41eea73f771b1

11 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 18:01:30 +0000 (11:01 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ife7bedf0d5a4ef1a25a0474b56773da7c635317e

11 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 21 Jun 2012 14:03:46 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev

11 years agoUse View.setBackgroundDrawable instead of setBackground.
Wu-cheng Li [Thu, 21 Jun 2012 08:45:55 +0000 (16:45 +0800)]
Use View.setBackgroundDrawable instead of setBackground.

View.setBackground was added in API 16. Use setBackgroundDrawable
instead.

bug:6698428
Change-Id: I1346ba4c640ae98d76e333779b4620cdc48b6a3a

11 years agoam 2e671684: (-s ours) am 2574da18: Import translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 05:34:25 +0000 (22:34 -0700)]
am 2e671684: (-s ours) am 2574da18: Import translations. DO NOT MERGE

* commit '2e67168492d5453876e913937ed1e36111fc2e48':
  Import translations. DO NOT MERGE

11 years agoam 2574da18: Import translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 05:31:19 +0000 (22:31 -0700)]
am 2574da18: Import translations. DO NOT MERGE

* commit '2574da183322bef8eb84ab2411bc14d5ff202655':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 01:45:30 +0000 (18:45 -0700)]
Import translations. DO NOT MERGE

Change-Id: If82aede2b76dc81e117d9b6e62bb21c96aaf8914

11 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 01:44:55 +0000 (18:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: I74d3d343c159a47c3375fbbb28b2579034d33d72

11 years agoam 254a6b42: am 82220026: Merge "Fade in/out the undo bar." into jb-dev
Wei Huang [Wed, 20 Jun 2012 18:41:47 +0000 (11:41 -0700)]
am 254a6b42: am 82220026: Merge "Fade in/out the undo bar." into jb-dev

* commit '254a6b42372179bcc9cf6166639325d11411be77':
  Fade in/out the undo bar.

11 years agoam 82220026: Merge "Fade in/out the undo bar." into jb-dev
Wei Huang [Wed, 20 Jun 2012 18:38:34 +0000 (11:38 -0700)]
am 82220026: Merge "Fade in/out the undo bar." into jb-dev

* commit '822200267879dfaaf77421007116e59c5bb372cd':
  Fade in/out the undo bar.

11 years agoMerge "Fade in/out the undo bar." into jb-dev
Wei Huang [Wed, 20 Jun 2012 18:35:46 +0000 (11:35 -0700)]
Merge "Fade in/out the undo bar." into jb-dev

11 years agoam f058c3e7: (-s ours) am 705d8085: Import translations. DO NOT MERGE
Ying Wang [Wed, 20 Jun 2012 17:25:21 +0000 (10:25 -0700)]
am f058c3e7: (-s ours) am 705d8085: Import translations. DO NOT MERGE

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

11 years agoam 705d8085: Import translations. DO NOT MERGE
Ying Wang [Wed, 20 Jun 2012 17:22:27 +0000 (10:22 -0700)]
am 705d8085: Import translations. DO NOT MERGE

* commit '705d808558fd3e165fd787b8628aae7db084e764':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Ying Wang [Wed, 20 Jun 2012 16:43:37 +0000 (09:43 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie875f22d881a5f35fce1484e0cfe6237b15699f7

11 years agoImport translations. DO NOT MERGE
Ying Wang [Wed, 20 Jun 2012 16:42:55 +0000 (09:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7b28f69652740d7e0f0a9e55ec40c9b710986391

11 years agoam 377329db: Reconcile with jb-release
The Android Open Source Project [Wed, 20 Jun 2012 15:31:47 +0000 (08:31 -0700)]
am 377329db: Reconcile with jb-release

* commit '377329db75cc550ed78418c0c6a04a5ac534e5ba':
  Make SystemUI always consists with the contrller overlay.

11 years agoReconcile with jb-release
The Android Open Source Project [Wed, 20 Jun 2012 15:26:03 +0000 (08:26 -0700)]
Reconcile with jb-release

Change-Id: I38e3c46db8518d6c3d45afcf7b1d99421d95811d

11 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 20 Jun 2012 14:03:33 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev

11 years agoFade in/out the undo bar.
Chih-Chung Chang [Tue, 19 Jun 2012 09:34:50 +0000 (17:34 +0800)]
Fade in/out the undo bar.

The fading out happens after 3 seconds or the user swipes away.

Bug: 6610348

Change-Id: Icd4dea7b0396f26556240adab93b9e645a9f1e58

11 years agoMove LongSparseArray into Gallery for unbundling.
Owen Lin [Wed, 20 Jun 2012 05:55:16 +0000 (13:55 +0800)]
Move LongSparseArray into Gallery for unbundling.

Change-Id: Ifa0d06818a2d21bd8ddeabe808d792f39c31322f

11 years agoam 2e3a1767: (-s ours) am 8c93a140: Import translations. DO NOT MERGE
Eric Fischer [Tue, 19 Jun 2012 20:27:21 +0000 (13:27 -0700)]
am 2e3a1767: (-s ours) am 8c93a140: Import translations. DO NOT MERGE

* commit '2e3a1767f4e0b7769f0726795efba3a8f7c1de1f':
  Import translations. DO NOT MERGE

11 years agoam 8c93a140: Import translations. DO NOT MERGE
Eric Fischer [Tue, 19 Jun 2012 20:25:41 +0000 (13:25 -0700)]
am 8c93a140: Import translations. DO NOT MERGE

* commit '8c93a140f61d2880163dcc7dc99fa177aa4f0b2b':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 19 Jun 2012 20:23:58 +0000 (13:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: If311f3cbb087651e37b00789c69cd4035ec03e02

11 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 19 Jun 2012 20:23:08 +0000 (13:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ibcd085099f2a66292ff49a84cf05910b430fe147

11 years agoMake SystemUI always consists with the contrller overlay.
Owen Lin [Tue, 19 Jun 2012 06:35:06 +0000 (14:35 +0800)]
Make SystemUI always consists with the contrller overlay.

Change-Id: I81f2a71fd38fc2588a9acb97b9d333978ffb5e48
fix: 6679875

11 years agoam 382feb11: am 885f729f: Merge "Make SystemUI always consists with the contrller...
Wei Huang [Tue, 19 Jun 2012 18:27:42 +0000 (11:27 -0700)]
am 382feb11: am 885f729f: Merge "Make SystemUI always consists with the contrller overlay." into jb-dev

* commit '382feb11b767600d6aed8ad97d08d9de7a8673e0':
  Make SystemUI always consists with the contrller overlay.

11 years agoam 885f729f: Merge "Make SystemUI always consists with the contrller overlay." into...
Wei Huang [Tue, 19 Jun 2012 18:25:37 +0000 (11:25 -0700)]
am 885f729f: Merge "Make SystemUI always consists with the contrller overlay." into jb-dev

* commit '885f729fa16f9a25e688b23f1f9a94ab1bc591d5':
  Make SystemUI always consists with the contrller overlay.

11 years agoMerge "Make SystemUI always consists with the contrller overlay." into jb-dev
Wei Huang [Tue, 19 Jun 2012 18:23:10 +0000 (11:23 -0700)]
Merge "Make SystemUI always consists with the contrller overlay." into jb-dev

11 years agoam da1698d5: Reconcile with jb-release
The Android Open Source Project [Tue, 19 Jun 2012 14:20:42 +0000 (07:20 -0700)]
am da1698d5: Reconcile with jb-release

* commit 'da1698d5fd2606b56f51d82711e9bff5c5beb580':

11 years agoReconcile with jb-release
The Android Open Source Project [Tue, 19 Jun 2012 14:16:01 +0000 (07:16 -0700)]
Reconcile with jb-release

Change-Id: I0763b67b445b03b74c5a873a5373d30528acebf9

11 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 19 Jun 2012 14:04:48 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev

11 years agoam 17f64cac: Reconcile with jb-release
The Android Open Source Project [Tue, 19 Jun 2012 13:16:19 +0000 (06:16 -0700)]
am 17f64cac: Reconcile with jb-release

* commit '17f64cac08778af45774f6d8a808381b0dc6f1a2':

11 years agoReconcile with jb-release
The Android Open Source Project [Tue, 19 Jun 2012 13:13:51 +0000 (06:13 -0700)]
Reconcile with jb-release

Change-Id: Ice7fa76d34e7120514e558cc86fd1b76ae718074

11 years agoMake SystemUI always consists with the contrller overlay.
Owen Lin [Tue, 19 Jun 2012 06:35:06 +0000 (14:35 +0800)]
Make SystemUI always consists with the contrller overlay.

Change-Id: I81f2a71fd38fc2588a9acb97b9d333978ffb5e48
fix: 6679875

11 years agoam 078be806: am d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." into jb-dev
Wei Huang [Tue, 19 Jun 2012 06:19:48 +0000 (23:19 -0700)]
am 078be806: am d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." into jb-dev

* commit '078be806c9caa4c750e17d44851e075e8cf09ef2':
  Fix Gallery glitch due to ColorTexture.

11 years agoam d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." into jb-dev
Wei Huang [Tue, 19 Jun 2012 06:17:17 +0000 (23:17 -0700)]
am d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." into jb-dev

* commit 'd937a2e931f222d2e60d9da007df4647b975eb7f':
  Fix Gallery glitch due to ColorTexture.

11 years agoMerge "Fix Gallery glitch due to ColorTexture." into jb-dev
Wei Huang [Tue, 19 Jun 2012 06:15:18 +0000 (23:15 -0700)]
Merge "Fix Gallery glitch due to ColorTexture." into jb-dev

11 years agoFix Gallery glitch due to ColorTexture.
Owen Lin [Tue, 19 Jun 2012 03:36:23 +0000 (11:36 +0800)]
Fix Gallery glitch due to ColorTexture.

Change the initial value of mTextureTarget to GL_TEXTURE_2D,
since it is default enabled.

bug:6668616

Change-Id: I4bf475ca1a02fed3371e8223003a10e88ce8d519

11 years agoam 90e71542: (-s ours) am c66604cb: Import translations. DO NOT MERGE
Ying Wang [Mon, 18 Jun 2012 17:52:40 +0000 (10:52 -0700)]
am 90e71542: (-s ours) am c66604cb: Import translations. DO NOT MERGE

* commit '90e71542d1307a3b142509ee658304920d1b3f3d':
  Import translations. DO NOT MERGE

11 years agoam f915fe3a: am 2ce59cbd: Fix scaling gesture responsiveness.
Chih-Chung Chang [Mon, 18 Jun 2012 17:52:38 +0000 (10:52 -0700)]
am f915fe3a: am 2ce59cbd: Fix scaling gesture responsiveness.

* commit 'f915fe3aae9b44d7cdc96633a1b6ebe10bbb431e':
  Fix scaling gesture responsiveness.

11 years agoam 756359c0: am 6b891c6a: Add swipe-to-delete gesture.
Chih-Chung Chang [Mon, 18 Jun 2012 17:52:38 +0000 (10:52 -0700)]
am 756359c0: am 6b891c6a: Add swipe-to-delete gesture.

* commit '756359c0bb6aa1d97c48a621f6d0dda64c2ca055':
  Add swipe-to-delete gesture.

11 years agoam c66604cb: Import translations. DO NOT MERGE
Ying Wang [Mon, 18 Jun 2012 17:39:47 +0000 (10:39 -0700)]
am c66604cb: Import translations. DO NOT MERGE

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

11 years agoam 2ce59cbd: Fix scaling gesture responsiveness.
Chih-Chung Chang [Mon, 18 Jun 2012 17:35:57 +0000 (10:35 -0700)]
am 2ce59cbd: Fix scaling gesture responsiveness.

* commit '2ce59cbd4368eaf0f30cfea28891bd47155182cb':
  Fix scaling gesture responsiveness.

11 years agoam 6b891c6a: Add swipe-to-delete gesture.
Chih-Chung Chang [Mon, 18 Jun 2012 17:35:56 +0000 (10:35 -0700)]
am 6b891c6a: Add swipe-to-delete gesture.

* commit '6b891c6a3739f8c49d42f9db6fc76cb92c7c5f25':
  Add swipe-to-delete gesture.

11 years agoImport translations. DO NOT MERGE
Ying Wang [Mon, 18 Jun 2012 17:22:38 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib1876c5daebce55dc45ee46d493a8f6494bce54a

11 years agoImport translations. DO NOT MERGE
Ying Wang [Mon, 18 Jun 2012 17:22:03 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE

Change-Id: I68a09a0a51b46c4929d725dbd22d2176fadba8c6

11 years agoFix scaling gesture responsiveness.
Chih-Chung Chang [Mon, 18 Jun 2012 09:24:58 +0000 (17:24 +0800)]
Fix scaling gesture responsiveness.

Bug: 6632011
Change-Id: I9cfeafa4365354a631565f8ee4a9b53df76d06e9

11 years agoAdd swipe-to-delete gesture.
Chih-Chung Chang [Thu, 7 Jun 2012 12:09:13 +0000 (20:09 +0800)]
Add swipe-to-delete gesture.

Change-Id: I992e59702f9dfff17da2f4464e48c9228d42b1b3

11 years agoam e0279d33: resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp
Jean-Baptiste Queru [Fri, 15 Jun 2012 00:09:01 +0000 (17:09 -0700)]
am e0279d33: resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp

* commit 'e0279d33974a095b12abfe33f3e0be84b5e7b7d0':
  Gallery2: Check privative effects

11 years agoresolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp
Jean-Baptiste Queru [Thu, 14 Jun 2012 22:26:35 +0000 (15:26 -0700)]
resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp

Change-Id: I4d8d85960b5f0289ee442278db39b8f8c445d73e

11 years agoam 8d340042: Merge "Gallery2: Check privative effects"
Jean-Baptiste Queru [Thu, 14 Jun 2012 19:15:37 +0000 (12:15 -0700)]
am 8d340042: Merge "Gallery2: Check privative effects"

* commit '8d340042d2b79218b19f650803ea6a584c61f01f':
  Gallery2: Check privative effects

11 years agoMerge "Gallery2: Check privative effects"
Jean-Baptiste Queru [Thu, 14 Jun 2012 18:28:31 +0000 (11:28 -0700)]
Merge "Gallery2: Check privative effects"

11 years agoGallery2: Check privative effects
Jorge Ruesga [Tue, 12 Jun 2012 21:28:58 +0000 (23:28 +0200)]
Gallery2: Check privative effects

Gallery2 has 2 effects (FaceTan and Facelift) from the privative gapps.
If gapps is not present, Gallery2 gets into a FC when click on this effects.
This patch checks if the permission "com.google.android.media.effects" exists
and hide this 2 effects if permission not exists

Patch 2: Use EffectFactory.isEffectSupported to detect if filters exists
Patch 3: Make isPresent method from effect classes a static method
Patch 4: Change actions classes for static calling to effects classes

Change-Id: I8f6b59e57e504114835ab3283f65a72b4f6774a8

11 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 13 Jun 2012 15:45:06 +0000 (08:45 -0700)]
merge in jb-release history after reset to jb-dev

11 years agoam 295c2453: (-s ours) am 6dd67099: Import translations. DO NOT MERGE
Ying Wang [Tue, 12 Jun 2012 20:15:22 +0000 (13:15 -0700)]
am 295c2453: (-s ours) am 6dd67099: Import translations. DO NOT MERGE

* commit '295c2453f820709b8aa2a431940af1020d2de585':
  Import translations. DO NOT MERGE

11 years agoam 6dd67099: Import translations. DO NOT MERGE
Ying Wang [Tue, 12 Jun 2012 19:45:56 +0000 (12:45 -0700)]
am 6dd67099: Import translations. DO NOT MERGE

* commit '6dd670997a88fe7502f9ce0e4f9c872b7352027f':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Ying Wang [Tue, 12 Jun 2012 18:51:32 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE

Change-Id: Idb929a3d9027bfc52a8fe9fd49d06a8ee22b268f

11 years agoImport translations. DO NOT MERGE
Ying Wang [Tue, 12 Jun 2012 18:50:53 +0000 (11:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id76289427ddecca985371b6d11e3e1fcb7f8b49f

11 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 12 Jun 2012 18:24:10 +0000 (11:24 -0700)]
merge in jb-release history after reset to jb-dev

11 years agoam 27d6bf93: am b62f354d: am 582c3bb9: Merge "Gallery2: Use ICS alert drawable"
Jean-Baptiste Queru [Mon, 11 Jun 2012 18:26:51 +0000 (11:26 -0700)]
am 27d6bf93: am b62f354d: am 582c3bb9: Merge "Gallery2: Use ICS alert drawable"

* commit '27d6bf937c3d9934fed171ea69aafaf90c9463e6':
  Gallery2: Use ICS alert drawable

11 years agoam b62f354d: am 582c3bb9: Merge "Gallery2: Use ICS alert drawable"
Jean-Baptiste Queru [Mon, 11 Jun 2012 18:22:16 +0000 (11:22 -0700)]
am b62f354d: am 582c3bb9: Merge "Gallery2: Use ICS alert drawable"

* commit 'b62f354d4f890a20f6bec37eac83226f75a4a475':
  Gallery2: Use ICS alert drawable

11 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 11 Jun 2012 17:24:33 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1eb9710c0fdf95d4d39a3b36ecb2606a64723177

11 years agoam d23a3e37: Reconcile with jb-release
The Android Open Source Project [Mon, 11 Jun 2012 16:25:49 +0000 (09:25 -0700)]
am d23a3e37: Reconcile with jb-release

* commit 'd23a3e37680ee0b84bec0ada0ff8e64da79b805e':