OSDN Git Service

android-x86/packages-apps-Camera2.git
12 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

12 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

12 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

12 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

12 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.

12 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.

12 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

12 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':

12 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

12 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

12 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':

12 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

12 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

12 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.

12 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.

12 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

12 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

12 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

12 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.

12 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.

12 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

12 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.

12 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.

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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"

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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':

12 years agoReconcile with jb-release
The Android Open Source Project [Mon, 11 Jun 2012 16:22:41 +0000 (09:22 -0700)]
Reconcile with jb-release

Change-Id: I4eaf451a2a61d0fa8fc37a1a045ab02ca4ae0711

12 years agoam 4712ffa6: am 132db75a: Don\'t display loading text when loading album sets.
Yuli Huang [Mon, 11 Jun 2012 15:49:58 +0000 (08:49 -0700)]
am 4712ffa6: am 132db75a: Don\'t display loading text when loading album sets.

* commit '4712ffa668e60c23418be104a66f07da57d64cc2':
  Don't display loading text when loading album sets.

12 years agoam 132db75a: Don\'t display loading text when loading album sets.
Yuli Huang [Mon, 11 Jun 2012 15:48:20 +0000 (08:48 -0700)]
am 132db75a: Don\'t display loading text when loading album sets.

* commit '132db75a1fa9b41d3000c6cb29bd3d90a7d8ef28':
  Don't display loading text when loading album sets.

12 years agoam 582c3bb9: Merge "Gallery2: Use ICS alert drawable"
Jean-Baptiste Queru [Mon, 11 Jun 2012 15:46:55 +0000 (08:46 -0700)]
am 582c3bb9: Merge "Gallery2: Use ICS alert drawable"

* commit '582c3bb99cf58b55defa5f788d488c62f771b60e':
  Gallery2: Use ICS alert drawable

12 years agoMerge "Gallery2: Use ICS alert drawable"
Jean-Baptiste Queru [Mon, 11 Jun 2012 14:40:17 +0000 (07:40 -0700)]
Merge "Gallery2: Use ICS alert drawable"

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

12 years agoDon't display loading text when loading album sets.
Yuli Huang [Mon, 11 Jun 2012 06:29:23 +0000 (14:29 +0800)]
Don't display loading text when loading album sets.

bug:6635606
Change-Id: I55f0dafd5ead8455ed8bee1f03c06ca03662ebbd

12 years agoam 30116cd2: (-s ours) am 1d3a2ec8: Import translations. DO NOT MERGE
Eric Fischer [Fri, 8 Jun 2012 23:33:46 +0000 (16:33 -0700)]
am 30116cd2: (-s ours) am 1d3a2ec8: Import translations. DO NOT MERGE

* commit '30116cd2dd2b0da7e70537d6a52b1a620eef75d0':
  Import translations. DO NOT MERGE

12 years agoam 1d3a2ec8: Import translations. DO NOT MERGE
Eric Fischer [Fri, 8 Jun 2012 23:32:09 +0000 (16:32 -0700)]
am 1d3a2ec8: Import translations. DO NOT MERGE

* commit '1d3a2ec89bd286f253f1f050f7e9e5406119273b':
  Import translations. DO NOT MERGE

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 8 Jun 2012 23:26:27 +0000 (16:26 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3e067ce23fd1d27086b2a8b60e7532f6aa8f7601

12 years agoam e167e1cf: Reconcile with jb-release
The Android Open Source Project [Thu, 7 Jun 2012 14:55:30 +0000 (07:55 -0700)]
am e167e1cf: Reconcile with jb-release

* commit 'e167e1cf7f23f3605523c6c6808a1a39eecc74ef':

12 years agoReconcile with jb-release
The Android Open Source Project [Thu, 7 Jun 2012 14:51:25 +0000 (07:51 -0700)]
Reconcile with jb-release

Change-Id: I617695b74de11b9aec6d4b4355d6859f0ada53e8

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

12 years agoam 5543eac3: am e6d36bb2: Merge "Check the offset of output rect when cropping image...
Wei Huang [Wed, 6 Jun 2012 21:51:43 +0000 (14:51 -0700)]
am 5543eac3: am e6d36bb2: Merge "Check the offset of output rect when cropping image." into jb-dev

* commit '5543eac38b2bd0e0606deaf8da15d20f415c748f':
  Check the offset of output rect when cropping image.

12 years agoam e6d36bb2: Merge "Check the offset of output rect when cropping image." into jb-dev
Wei Huang [Wed, 6 Jun 2012 21:49:49 +0000 (14:49 -0700)]
am e6d36bb2: Merge "Check the offset of output rect when cropping image." into jb-dev

* commit 'e6d36bb213c749a750bffd5e37ce85c232a64ff3':
  Check the offset of output rect when cropping image.

12 years agoMerge "Check the offset of output rect when cropping image." into jb-dev
Wei Huang [Wed, 6 Jun 2012 21:47:58 +0000 (14:47 -0700)]
Merge "Check the offset of output rect when cropping image." into jb-dev

12 years agoam 6edae671: (-s ours) am 699ef52c: Import translations. DO NOT MERGE
Eric Fischer [Wed, 6 Jun 2012 18:06:13 +0000 (11:06 -0700)]
am 6edae671: (-s ours) am 699ef52c: Import translations. DO NOT MERGE

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

12 years agoam 699ef52c: Import translations. DO NOT MERGE
Eric Fischer [Wed, 6 Jun 2012 18:01:47 +0000 (11:01 -0700)]
am 699ef52c: Import translations. DO NOT MERGE

* commit '699ef52cb398a2d5a7ec962e7df2837a6dbccef4':
  Import translations. DO NOT MERGE

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 6 Jun 2012 17:56:34 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5847ab732e86841a916b6d641766c329c4e367be

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 6 Jun 2012 17:56:12 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE

Change-Id: I543c2eab5652cf2f6ad3534ce9d59bd3a973e74b

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

12 years agoCheck the offset of output rect when cropping image.
Owen Lin [Wed, 30 May 2012 08:39:21 +0000 (16:39 +0800)]
Check the offset of output rect when cropping image.

bug: 6568720
Change-Id: I36c98cab5830eaac15369ada1a1a988e10b0fbf4

12 years agoam 98e39643: am 1b27f309: Merge "Update drawable for the new resize handles." into...
Wei Huang [Tue, 5 Jun 2012 19:26:00 +0000 (12:26 -0700)]
am 98e39643: am 1b27f309: Merge "Update drawable for the new resize handles." into jb-dev

* commit '98e3964391668a5774e2d9b06751e8b2c61c144a':
  Update drawable for the new resize handles.

12 years agoam cc9da2a5: (-s ours) am 49661d3f: Import translations. DO NOT MERGE
Eric Fischer [Tue, 5 Jun 2012 19:25:36 +0000 (12:25 -0700)]
am cc9da2a5: (-s ours) am 49661d3f: Import translations. DO NOT MERGE

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

12 years agoam 1b27f309: Merge "Update drawable for the new resize handles." into jb-dev
Wei Huang [Tue, 5 Jun 2012 18:08:59 +0000 (11:08 -0700)]
am 1b27f309: Merge "Update drawable for the new resize handles." into jb-dev

* commit '1b27f3096d814d7b2a536dde59d7dbfc91945a05':
  Update drawable for the new resize handles.

12 years agoMerge "Update drawable for the new resize handles." into jb-dev
Wei Huang [Tue, 5 Jun 2012 18:07:14 +0000 (11:07 -0700)]
Merge "Update drawable for the new resize handles." into jb-dev

12 years agoam 49661d3f: Import translations. DO NOT MERGE
Eric Fischer [Tue, 5 Jun 2012 16:47:02 +0000 (09:47 -0700)]
am 49661d3f: Import translations. DO NOT MERGE

* commit '49661d3f313d32620cb15247a46e593e333a778d':
  Import translations. DO NOT MERGE

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 5 Jun 2012 16:39:40 +0000 (09:39 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7ad1b46db67adde3e45c2dc24b77622a29af3150

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 5 Jun 2012 16:39:21 +0000 (09:39 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3b315a50d72129caf734b5d7279e352e73d74cdb

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 5 Jun 2012 13:59:32 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoUpdate drawable for the new resize handles.
Yuli Huang [Tue, 5 Jun 2012 10:28:16 +0000 (18:28 +0800)]
Update drawable for the new resize handles.

bug:6598235
Change-Id: Id765f4024ad2896b3f172dce3408b2634fb1eb18

12 years agoam 8ddda9cd: (-s ours) am b4343fb4: Import translations. DO NOT MERGE
Eric Fischer [Mon, 4 Jun 2012 22:00:18 +0000 (15:00 -0700)]
am 8ddda9cd: (-s ours) am b4343fb4: Import translations. DO NOT MERGE

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

12 years agoam b4343fb4: Import translations. DO NOT MERGE
Eric Fischer [Mon, 4 Jun 2012 21:56:25 +0000 (14:56 -0700)]
am b4343fb4: Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 4 Jun 2012 21:45:24 +0000 (14:45 -0700)]
Import translations. DO NOT MERGE

Change-Id: I630c967050e27c228f1f05333cc2a3590b3eadcb

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 4 Jun 2012 21:44:28 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: Idb069f2aca29a88fa1b34d7198968109fe88fa9e

12 years agoam 2f6fb1ce: am 25a91535: Merge "Update the screen nail size even if screen nail...
Wei Huang [Mon, 4 Jun 2012 16:20:43 +0000 (09:20 -0700)]
am 2f6fb1ce: am 25a91535: Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev

* commit '2f6fb1ceef0fa27ecea869934b4c09ade97ec2cc':
  Update the screen nail size even if screen nail is still the same one.

12 years agoam 25a91535: Merge "Update the screen nail size even if screen nail is still the...
Wei Huang [Mon, 4 Jun 2012 16:18:09 +0000 (09:18 -0700)]
am 25a91535: Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev

* commit '25a9153565d0ecd760387499fce4ba10474175d2':
  Update the screen nail size even if screen nail is still the same one.

12 years agoMerge "Update the screen nail size even if screen nail is still the same one." into...
Wei Huang [Mon, 4 Jun 2012 16:15:15 +0000 (09:15 -0700)]
Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Sun, 3 Jun 2012 13:04:40 +0000 (06:04 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoam 30e51141: am e5c8ed74: Fix b/6590795 dejank photo effect slider
Ruei-sung Lin [Sun, 3 Jun 2012 04:36:33 +0000 (21:36 -0700)]
am 30e51141: am e5c8ed74: Fix b/6590795 dejank photo effect slider

* commit '30e511418cb69e04525964675885485dde18da8a':
  Fix b/6590795 dejank photo effect slider

12 years agoam e5c8ed74: Fix b/6590795 dejank photo effect slider
Ruei-sung Lin [Sun, 3 Jun 2012 04:34:16 +0000 (21:34 -0700)]
am e5c8ed74: Fix b/6590795 dejank photo effect slider

* commit 'e5c8ed74768f16e4e82c46a31d5118788dbb3a57':
  Fix b/6590795 dejank photo effect slider

12 years agoFix b/6590795 dejank photo effect slider
Ruei-sung Lin [Thu, 31 May 2012 18:59:31 +0000 (11:59 -0700)]
Fix b/6590795 dejank photo effect slider

Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea

12 years agoam 0ab62de3: Merge 79b8f0b7
Jean-Baptiste Queru [Sat, 2 Jun 2012 02:00:39 +0000 (19:00 -0700)]
am 0ab62de3: Merge 79b8f0b7

* commit '0ab62de3e8d00c6d1ed9c7cc67a41125468b1c05':
  Adding xhdpi version of app icon. Bug: 6596419

12 years agoMerge 79b8f0b7
Jean-Baptiste Queru [Sat, 2 Jun 2012 01:57:17 +0000 (18:57 -0700)]
Merge 79b8f0b7

Change-Id: Ideb1bf5d1d40baff73f662c3eaad200ad9dc94ac

12 years agoUpdate the screen nail size even if screen nail is still the same one.
Chih-Chung Chang [Fri, 1 Jun 2012 19:03:08 +0000 (12:03 -0700)]
Update the screen nail size even if screen nail is still the same one.

Because the rotation value may have changed.

Bug: 6594218
Change-Id: I8da2a3041da0e27e1b80723dab8a825a2350c2dd

12 years agoAdding xhdpi version of app icon. Bug: 6596419
Christian Robertson [Fri, 1 Jun 2012 18:11:49 +0000 (11:11 -0700)]
Adding xhdpi version of app icon. Bug: 6596419

Change-Id: I6f8b044d14854f41a4ba788756045f1ee1f56759

12 years agoam 309a9cbb: (-s ours) am 8da8d1d4: Import translations. DO NOT MERGE
Eric Fischer [Fri, 1 Jun 2012 18:02:34 +0000 (11:02 -0700)]
am 309a9cbb: (-s ours) am 8da8d1d4: Import translations. DO NOT MERGE

* commit '309a9cbb72f6dccc1dc972a72da02935f2f0331e':
  Import translations. DO NOT MERGE

12 years agoam 8da8d1d4: Import translations. DO NOT MERGE
Eric Fischer [Fri, 1 Jun 2012 18:00:46 +0000 (11:00 -0700)]
am 8da8d1d4: Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 1 Jun 2012 17:19:20 +0000 (10:19 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia4cc33ee514ce169636fda6e8007389ac60c8e17

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 1 Jun 2012 17:19:04 +0000 (10:19 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie58fbc6fe46cbf13cf54a0db03d50bda43f778de

12 years agoam e2b5f9f4: am 9d4ee023: Merge "Use "Gallery" instead of "Photo Studio" as the label...
Wei Huang [Fri, 1 Jun 2012 05:22:26 +0000 (22:22 -0700)]
am e2b5f9f4: am 9d4ee023: Merge "Use "Gallery" instead of "Photo Studio" as the label for photo editor." into jb-dev

* commit 'e2b5f9f468360ca19e446c9d94d4a0120024d3aa':
  Use "Gallery" instead of "Photo Studio" as the label for photo editor.

12 years agoam 9d4ee023: Merge "Use "Gallery" instead of "Photo Studio" as the label for photo...
Wei Huang [Fri, 1 Jun 2012 05:19:43 +0000 (22:19 -0700)]
am 9d4ee023: Merge "Use "Gallery" instead of "Photo Studio" as the label for photo editor." into jb-dev

* commit '9d4ee023cb6b754d07d33fb94dd7ae33851b2d35':
  Use "Gallery" instead of "Photo Studio" as the label for photo editor.

12 years agoMerge "Use "Gallery" instead of "Photo Studio" as the label for photo editor." into...
Wei Huang [Fri, 1 Jun 2012 05:17:50 +0000 (22:17 -0700)]
Merge "Use "Gallery" instead of "Photo Studio" as the label for photo editor." into jb-dev

12 years agoam 1eed3b2a: am 6f30a447: Merge "Don\'t allow the orientation to be unlocked if ...
Chih-Chung Chang [Thu, 31 May 2012 23:08:28 +0000 (16:08 -0700)]
am 1eed3b2a: am 6f30a447: Merge "Don\'t allow the orientation to be unlocked if "Rotation Lock" is checked in Settings." into jb-dev

* commit '1eed3b2ac7abb0fc2078605d9341f14f6197dbf5':
  Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings.

12 years agoam 6f30a447: Merge "Don\'t allow the orientation to be unlocked if "Rotation Lock...
Chih-Chung Chang [Thu, 31 May 2012 23:05:39 +0000 (16:05 -0700)]
am 6f30a447: Merge "Don\'t allow the orientation to be unlocked if "Rotation Lock" is checked in Settings." into jb-dev

* commit '6f30a44785f5dc19d3db1b3d80d828826c2a44dd':
  Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings.

12 years agoMerge "Don't allow the orientation to be unlocked if "Rotation Lock" is checked in...
Chih-Chung Chang [Thu, 31 May 2012 23:03:31 +0000 (16:03 -0700)]
Merge "Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings." into jb-dev

12 years agoGallery2: Use ICS alert drawable
Björn Lundén [Thu, 31 May 2012 21:51:07 +0000 (23:51 +0200)]
Gallery2: Use ICS alert drawable

Same bug here. It's using the old compability drawable
instead of the Holo theme one.

Change-Id: Ia84ce1d305ee63fc6bc1fdb407a91b3421842eb1

12 years agoUse "Gallery" instead of "Photo Studio" as the label for photo editor.
Chih-Chung Chang [Thu, 31 May 2012 20:34:15 +0000 (13:34 -0700)]
Use "Gallery" instead of "Photo Studio" as the label for photo editor.

Bug: 6589966
Change-Id: I0760fa6864da5c398e157f386295dea372f0b33e