OSDN Git Service
The Android Open Source Project [Thu, 20 Sep 2012 17:41:03 +0000 (10:41 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: I08c7654bad53aad3a1b72c8a229973f889045902
Chih-Chung Chang [Thu, 6 Sep 2012 12:02:09 +0000 (20:02 +0800)]
Do not accept fling gesture after we changed from/to filmstrip mode.
Change-Id: Ifb3d692bcf621ff02c6d4e6d91ba8484d702f905
Chih-Chung Chang [Fri, 7 Sep 2012 04:33:18 +0000 (21:33 -0700)]
am
e311bb72: Do not accept fling gesture after we changed from/to filmstrip mode.
* commit '
e311bb72205569675f36784ad67d5bd950a944b8':
Do not accept fling gesture after we changed from/to filmstrip mode.
Chih-Chung Chang [Thu, 6 Sep 2012 12:02:09 +0000 (20:02 +0800)]
Do not accept fling gesture after we changed from/to filmstrip mode.
Change-Id: Ifb3d692bcf621ff02c6d4e6d91ba8484d702f905
Jean-Baptiste Queru [Mon, 27 Aug 2012 23:33:55 +0000 (16:33 -0700)]
Merge from AOSP
Change-Id: I11aeba06aa988e97d12125028327ed46fe2bc9c7
Chih-Chung Chang [Mon, 27 Aug 2012 10:17:37 +0000 (03:17 -0700)]
Merge "Progressbar: correct the first updated value for progressbar"
Jean-Baptiste Queru [Fri, 24 Aug 2012 21:44:57 +0000 (14:44 -0700)]
Merge "Fine-tune SDK versions"
Jean-Baptiste Queru [Fri, 24 Aug 2012 17:35:52 +0000 (10:35 -0700)]
Fine-tune SDK versions
Change-Id: Ic8ebb95d51a4a66da7b026ea93572db1781bed35
Wu, Hao [Tue, 8 May 2012 12:39:08 +0000 (20:39 +0800)]
Progressbar: correct the first updated value for progressbar
This patch corrects the first updated value from 0 to 1. After
execute first operation, then need to update Progress to 1, not
0.
Change-Id: Ie3ae6bea79b3e50e727723d75de84b1797aaf382
Author: Wu, Hao <hao.wu@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 34729
The Android Open Source Project [Fri, 27 Jul 2012 21:52:47 +0000 (14:52 -0700)]
Reconcile with jb-release
Change-Id: Ie95fe2b6b772217090296b8409f1f1f7326a0a93
The Android Automerger [Wed, 25 Jul 2012 03:23:15 +0000 (20:23 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Thu, 19 Jul 2012 15:41:05 +0000 (08:41 -0700)]
Reconcile with jb-mr0-release
Change-Id: Icf6d8b9461cfd22e019d735a8ba66812879e3083
The Android Automerger [Thu, 19 Jul 2012 06:04:48 +0000 (23:04 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 17 Jul 2012 19:31:30 +0000 (12:31 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Ying Wang [Fri, 13 Jul 2012 19:16:41 +0000 (12:16 -0700)]
am
8c1fe6d3: Import translations. DO NOT MERGE
* commit '
8c1fe6d39f511c60f03763c1c905a437fc02c3ab':
Import translations. DO NOT MERGE
Ying Wang [Fri, 13 Jul 2012 17:28:52 +0000 (10:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2d34057147bfe8ae4d4698e43c41aed9c2b9f71e
Auto-generated-cl: translation import
The Android Open Source Project [Fri, 29 Jun 2012 15:14:13 +0000 (08:14 -0700)]
Reconcile with jb-release
Change-Id: Iba9ed40f75d1d8519d5052fa4dd5fd6796cf8e24
The Android Automerger [Fri, 29 Jun 2012 00:10:51 +0000 (17:10 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Thu, 28 Jun 2012 17:16:25 +0000 (10:16 -0700)]
am
7aeb8cd4: Import translations. DO NOT MERGE
* commit '
7aeb8cd43cdf11aec3f925e76cf84b37fecdb260':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 28 Jun 2012 17:11:30 +0000 (10:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I340bc2547295382bdbbf31b933e2facec181cbfc
Auto-generated-cl: translation import
The Android Automerger [Wed, 27 Jun 2012 21:09:46 +0000 (14:09 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Wed, 27 Jun 2012 19:32:53 +0000 (12:32 -0700)]
am
d857f776: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
d857f77613007fc2005903eb33e5315ed45368c4':
Import translations. DO NOT MERGE
Ying Wang [Wed, 27 Jun 2012 19:30:47 +0000 (12:30 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Wed, 27 Jun 2012 18:47:38 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I01abb0b9f6481a865cc3c796bc301f1a34c76be7
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
Ying Wang [Wed, 27 Jun 2012 18:23:07 +0000 (11:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5df2833519f46df2d6d9b5e290b605b0811d397f
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.
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
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.
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
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
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
The Android Automerger [Tue, 26 Jun 2012 18:11:31 +0000 (11:11 -0700)]
merge in jb-release history after reset to jb-dev
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.
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
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.
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:
6713932,
6712555
Change-Id: I9d64d8bbdcd4ec0dc9a447a51d50f88ff27363b4
The Android Open Source Project [Fri, 22 Jun 2012 22:20:45 +0000 (15:20 -0700)]
Reconcile with jb-release
Change-Id: Ica9e5255d9ea862cb24ef52d69545881147a2a26
The Android Automerger [Fri, 22 Jun 2012 22:08:45 +0000 (15:08 -0700)]
merge in jb-release history after reset to jb-dev
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
Ying Wang [Fri, 22 Jun 2012 17:54:51 +0000 (10:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I49c07cd7b3bde69fb0b2b09c298710cae6d2a91f
The Android Open Source Project [Fri, 22 Jun 2012 15:17:20 +0000 (08:17 -0700)]
Reconcile with jb-release
Change-Id: I20961dda95f0a5b0b580b73de5e8b09434eaaa44
The Android Automerger [Thu, 21 Jun 2012 21:20:58 +0000 (14:20 -0700)]
merge in jb-release history after reset to jb-dev
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
Eric Fischer [Thu, 21 Jun 2012 18:01:30 +0000 (11:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife7bedf0d5a4ef1a25a0474b56773da7c635317e
The Android Automerger [Thu, 21 Jun 2012 14:03:46 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
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
Eric Fischer [Thu, 21 Jun 2012 01:44:55 +0000 (18:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I74d3d343c159a47c3375fbbb28b2579034d33d72
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.
Wei Huang [Wed, 20 Jun 2012 18:35:46 +0000 (11:35 -0700)]
Merge "Fade in/out the undo bar." into jb-dev
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
Ying Wang [Wed, 20 Jun 2012 16:42:55 +0000 (09:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7b28f69652740d7e0f0a9e55ec40c9b710986391
The Android Open Source Project [Wed, 20 Jun 2012 15:26:03 +0000 (08:26 -0700)]
Reconcile with jb-release
Change-Id: I38e3c46db8518d6c3d45afcf7b1d99421d95811d
The Android Automerger [Wed, 20 Jun 2012 14:03:33 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
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
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
Eric Fischer [Tue, 19 Jun 2012 20:23:08 +0000 (13:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibcd085099f2a66292ff49a84cf05910b430fe147
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
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.
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
The Android Open Source Project [Tue, 19 Jun 2012 14:16:01 +0000 (07:16 -0700)]
Reconcile with jb-release
Change-Id: I0763b67b445b03b74c5a873a5373d30528acebf9
The Android Automerger [Tue, 19 Jun 2012 14:04:48 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Tue, 19 Jun 2012 13:13:51 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: Ice7fa76d34e7120514e558cc86fd1b76ae718074
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
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.
Wei Huang [Tue, 19 Jun 2012 06:15:18 +0000 (23:15 -0700)]
Merge "Fix Gallery glitch due to ColorTexture." into jb-dev
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
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
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.
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.
Ying Wang [Mon, 18 Jun 2012 17:22:03 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I68a09a0a51b46c4929d725dbd22d2176fadba8c6
Chih-Chung Chang [Mon, 18 Jun 2012 09:24:58 +0000 (17:24 +0800)]
Fix scaling gesture responsiveness.
Bug:
6632011
Change-Id: I9cfeafa4365354a631565f8ee4a9b53df76d06e9
Chih-Chung Chang [Thu, 7 Jun 2012 12:09:13 +0000 (20:09 +0800)]
Add swipe-to-delete gesture.
Change-Id: I992e59702f9dfff17da2f4464e48c9228d42b1b3
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
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
Jean-Baptiste Queru [Thu, 14 Jun 2012 18:28:31 +0000 (11:28 -0700)]
Merge "Gallery2: 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
The Android Automerger [Wed, 13 Jun 2012 15:45:06 +0000 (08:45 -0700)]
merge in jb-release history after reset to jb-dev
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
Ying Wang [Tue, 12 Jun 2012 18:50:53 +0000 (11:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id76289427ddecca985371b6d11e3e1fcb7f8b49f
The Android Automerger [Tue, 12 Jun 2012 18:24:10 +0000 (11:24 -0700)]
merge in jb-release history after reset to jb-dev
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
The Android Open Source Project [Mon, 11 Jun 2012 16:22:41 +0000 (09:22 -0700)]
Reconcile with jb-release
Change-Id: I4eaf451a2a61d0fa8fc37a1a045ab02ca4ae0711
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.
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
Jean-Baptiste Queru [Mon, 11 Jun 2012 14:40:17 +0000 (07:40 -0700)]
Merge "Gallery2: Use ICS alert drawable"
The Android Automerger [Mon, 11 Jun 2012 14:03:51 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
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
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
Eric Fischer [Fri, 8 Jun 2012 23:26:27 +0000 (16:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e067ce23fd1d27086b2a8b60e7532f6aa8f7601
The Android Open Source Project [Thu, 7 Jun 2012 14:51:25 +0000 (07:51 -0700)]
Reconcile with jb-release
Change-Id: I617695b74de11b9aec6d4b4355d6859f0ada53e8
The Android Automerger [Thu, 7 Jun 2012 14:03:57 +0000 (07:03 -0700)]
merge in jb-release history after reset to 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.
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
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
Eric Fischer [Wed, 6 Jun 2012 17:56:12 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I543c2eab5652cf2f6ad3534ce9d59bd3a973e74b
The Android Automerger [Wed, 6 Jun 2012 14:03:47 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
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
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.
Wei Huang [Tue, 5 Jun 2012 18:07:14 +0000 (11:07 -0700)]
Merge "Update drawable for the new resize handles." into jb-dev
OSDN Git Service
