summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Use View.setBackgroundDrawable instead of setBackground.Wu-cheng Li2012-06-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | View.setBackground was added in API 16. Use setBackgroundDrawable instead. bug:6698428 Change-Id: I1346ba4c640ae98d76e333779b4620cdc48b6a3a
* | | | | am 254a6b42: am 82220026: Merge "Fade in/out the undo bar." into jb-devWei Huang2012-06-203-6/+115
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '254a6b42372179bcc9cf6166639325d11411be77': Fade in/out the undo bar.
| * | | | am 82220026: Merge "Fade in/out the undo bar." into jb-devWei Huang2012-06-203-6/+115
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '822200267879dfaaf77421007116e59c5bb372cd': Fade in/out the undo bar.
| | * | | Fade in/out the undo bar.Chih-Chung Chang2012-06-203-6/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fading out happens after 3 seconds or the user swipes away. Bug: 6610348 Change-Id: Icd4dea7b0396f26556240adab93b9e645a9f1e58
* | | | | am 377329db: Reconcile with jb-releaseThe Android Open Source Project2012-06-200-0/+0
|\| | | | | |_|_|/ |/| | | | | | | | | | | * commit '377329db75cc550ed78418c0c6a04a5ac534e5ba': Make SystemUI always consists with the contrller overlay.
| * | | Reconcile with jb-releaseThe Android Open Source Project2012-06-200-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I38e3c46db8518d6c3d45afcf7b1d99421d95811d
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-200-0/+0
| | |\ \ | | | |/ | | |/|
| | | * Make SystemUI always consists with the contrller overlay.Owen Lin2012-06-192-10/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I81f2a71fd38fc2588a9acb97b9d333978ffb5e48 fix: 6679875
* | | | Move LongSparseArray into Gallery for unbundling.Owen Lin2012-06-202-1/+369
| | | | | | | | | | | | | | | | Change-Id: Ifa0d06818a2d21bd8ddeabe808d792f39c31322f
* | | | am 382feb11: am 885f729f: Merge "Make SystemUI always consists with the ↵Wei Huang2012-06-192-10/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | contrller overlay." into jb-dev * commit '382feb11b767600d6aed8ad97d08d9de7a8673e0': Make SystemUI always consists with the contrller overlay.
| * | | am 885f729f: Merge "Make SystemUI always consists with the contrller ↵Wei Huang2012-06-192-10/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | overlay." into jb-dev * commit '885f729fa16f9a25e688b23f1f9a94ab1bc591d5': Make SystemUI always consists with the contrller overlay.
| | * | Merge "Make SystemUI always consists with the contrller overlay." into jb-devWei Huang2012-06-192-10/+2
| | |\ \
| | | * | Make SystemUI always consists with the contrller overlay.Owen Lin2012-06-192-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I81f2a71fd38fc2588a9acb97b9d333978ffb5e48 fix: 6679875
* | | | | am da1698d5: Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'da1698d5fd2606b56f51d82711e9bff5c5beb580':
| * | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Change-Id: I0763b67b445b03b74c5a873a5373d30528acebf9
| | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-190-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am 17f64cac: Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '17f64cac08778af45774f6d8a808381b0dc6f1a2':
| * | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: Ice7fa76d34e7120514e558cc86fd1b76ae718074
| | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-120-0/+0
| | |\ \ \ | | | |_|/ | | |/| |
* | | | | am 078be806: am d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." ↵Wei Huang2012-06-181-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '078be806c9caa4c750e17d44851e075e8cf09ef2': Fix Gallery glitch due to ColorTexture.
| * | | | am d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." into jb-devWei Huang2012-06-181-1/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit 'd937a2e931f222d2e60d9da007df4647b975eb7f': Fix Gallery glitch due to ColorTexture.
| | * | | Merge "Fix Gallery glitch due to ColorTexture." into jb-devWei Huang2012-06-181-1/+1
| | |\ \ \
| | | * | | Fix Gallery glitch due to ColorTexture.Owen Lin2012-06-191-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the initial value of mTextureTarget to GL_TEXTURE_2D, since it is default enabled. bug:6668616 Change-Id: I4bf475ca1a02fed3371e8223003a10e88ce8d519
* | | | | am f915fe3a: am 2ce59cbd: Fix scaling gesture responsiveness.Chih-Chung Chang2012-06-182-7/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'f915fe3aae9b44d7cdc96633a1b6ebe10bbb431e': Fix scaling gesture responsiveness.
| * | | | am 2ce59cbd: Fix scaling gesture responsiveness.Chih-Chung Chang2012-06-182-7/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '2ce59cbd4368eaf0f30cfea28891bd47155182cb': Fix scaling gesture responsiveness.
| | * | | Fix scaling gesture responsiveness.Chih-Chung Chang2012-06-182-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6632011 Change-Id: I9cfeafa4365354a631565f8ee4a9b53df76d06e9
* | | | | am 756359c0: am 6b891c6a: Add swipe-to-delete gesture.Chih-Chung Chang2012-06-1814-188/+1038
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '756359c0bb6aa1d97c48a621f6d0dda64c2ca055': Add swipe-to-delete gesture.
| * | | | am 6b891c6a: Add swipe-to-delete gesture.Chih-Chung Chang2012-06-1814-188/+1038
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '6b891c6a3739f8c49d42f9db6fc76cb92c7c5f25': Add swipe-to-delete gesture.
| | * | | Add swipe-to-delete gesture.Chih-Chung Chang2012-06-1814-188/+1038
| | |/ / | | | | | | | | | | | | Change-Id: I992e59702f9dfff17da2f4464e48c9228d42b1b3
* | | | am e0279d33: resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aospJean-Baptiste Queru2012-06-146-4/+53
|\| | | | | | | | | | | | | | | | | | | * commit 'e0279d33974a095b12abfe33f3e0be84b5e7b7d0': Gallery2: Check privative effects
| * | | resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aospJean-Baptiste Queru2012-06-146-4/+53
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I4d8d85960b5f0289ee442278db39b8f8c445d73e
| | * \ \ am 8d340042: Merge "Gallery2: Check privative effects"Jean-Baptiste Queru2012-06-146-6/+53
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '8d340042d2b79218b19f650803ea6a584c61f01f': Gallery2: Check privative effects
| | | * | | Gallery2: Check privative effectsJorge Ruesga2012-06-146-6/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 27d6bf93: am b62f354d: am 582c3bb9: Merge "Gallery2: Use ICS alert drawable"Jean-Baptiste Queru2012-06-111-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '27d6bf937c3d9934fed171ea69aafaf90c9463e6': Gallery2: Use ICS alert drawable
| * | | | | am b62f354d: am 582c3bb9: Merge "Gallery2: Use ICS alert drawable"Jean-Baptiste Queru2012-06-111-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b62f354d4f890a20f6bec37eac83226f75a4a475': Gallery2: Use ICS alert drawable
| | * | | | am 582c3bb9: Merge "Gallery2: Use ICS alert drawable"Jean-Baptiste Queru2012-06-111-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '582c3bb99cf58b55defa5f788d488c62f771b60e': Gallery2: Use ICS alert drawable
| | | * | | Gallery2: Use ICS alert drawableBjörn Lundén2012-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same bug here. It's using the old compability drawable instead of the Holo theme one. Change-Id: Ia84ce1d305ee63fc6bc1fdb407a91b3421842eb1
* | | | | | am 4712ffa6: am 132db75a: Don\'t display loading text when loading album sets.Yuli Huang2012-06-111-5/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4712ffa668e60c23418be104a66f07da57d64cc2': Don't display loading text when loading album sets.
| * | | | | am 132db75a: Don\'t display loading text when loading album sets.Yuli Huang2012-06-111-5/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '132db75a1fa9b41d3000c6cb29bd3d90a7d8ef28': Don't display loading text when loading album sets.
| | * | | | Don't display loading text when loading album sets.Yuli Huang2012-06-111-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6635606 Change-Id: I55f0dafd5ead8455ed8bee1f03c06ca03662ebbd
* | | | | | am e167e1cf: Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e167e1cf7f23f3605523c6c6808a1a39eecc74ef':
| * | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | Change-Id: I617695b74de11b9aec6d4b4355d6859f0ada53e8
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-070-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-050-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-030-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-310-0/+0
| | | | | |\ \ \
* | | | | | | | | am 5543eac3: am e6d36bb2: Merge "Check the offset of output rect when ↵Wei Huang2012-06-062-4/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cropping image." into jb-dev * commit '5543eac38b2bd0e0606deaf8da15d20f415c748f': Check the offset of output rect when cropping image.
| * | | | | | | | am e6d36bb2: Merge "Check the offset of output rect when cropping image." ↵Wei Huang2012-06-062-4/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'e6d36bb213c749a750bffd5e37ce85c232a64ff3': Check the offset of output rect when cropping image.
| | * | | | | | | Check the offset of output rect when cropping image.Owen Lin2012-06-062-4/+12
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 6568720 Change-Id: I36c98cab5830eaac15369ada1a1a988e10b0fbf4
* | | | | | | | am 2f6fb1ce: am 25a91535: Merge "Update the screen nail size even if screen ↵Wei Huang2012-06-041-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.