summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-06-01am dd168c0a: Merge from gingerbreadHEADandroid-sdk-tools_r12android-sdk-adt_r12mastermainJean-Baptiste Queru
* commit 'dd168c0afe58b87f67066e1f259fd3ed998a4d22':
2011-06-01Merge from gingerbreadJean-Baptiste Queru
Change-Id: I7c675656cd203ebf2b3adc9396bc84f76495a6ed
2011-05-26am 5379cd3f: Merge "Fix 4442284 Android Picasa sync over HTTP - data and ↵Nick Kralevich
credentials sent in clear text. DO NOT MERGE." into gingerbread * commit '5379cd3f586062b9e0a2f31058326097dc727bfe': Fix 4442284 Android Picasa sync over HTTP - data and credentials sent in clear text. DO NOT MERGE.
2011-05-26Merge "Fix 4442284 Android Picasa sync over HTTP - data and credentials sent ↵android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10gingerbreadNick Kralevich
in clear text. DO NOT MERGE." into gingerbread
2011-05-26am 60b67e27: Merge "fix scrolling bug upon pinch-zoom" into gingerbreadJean-Baptiste Queru
* commit '60b67e274a7f4b57a6fedbf6eb3bafdf1cf738ab': fix scrolling bug upon pinch-zoom
2011-05-26am 61ab647c: Merge "Fixed the issue that media sets still appear after ↵Jean-Baptiste Queru
deleting all albums in Gallery3D." into gingerbread * commit '61ab647c5ad9a101a01fff7f677fead8d37ebfba': Fixed the issue that media sets still appear after deleting all albums in Gallery3D.
2011-05-26am f54826e4: Merge "Fixed the issue that the same album gets duplicated in ↵Jean-Baptiste Queru
Gallery3D" into gingerbread * commit 'f54826e41455af5f59d6fb6ba804cfd57be992ff': Fixed the issue that the same album gets duplicated in Gallery3D
2011-05-26am d9b4225d: Merge "Fixed the "Select All" issue in Gallery3D" into gingerbreadJean-Baptiste Queru
* commit 'd9b4225d9571de1cb70a3909723896e707b392e2': Fixed the "Select All" issue in Gallery3D
2011-05-26Merge "fix scrolling bug upon pinch-zoom" into gingerbreadJean-Baptiste Queru
2011-05-26Merge "Fixed the issue that media sets still appear after deleting all ↵Jean-Baptiste Queru
albums in Gallery3D." into gingerbread
2011-05-26Merge "Fixed the issue that the same album gets duplicated in Gallery3D" ↵Jean-Baptiste Queru
into gingerbread
2011-05-26Merge "Fixed the "Select All" issue in Gallery3D" into gingerbreadJean-Baptiste Queru
2011-05-20Fix 4442284 Android Picasa sync over HTTP - data and credentials sent in ↵Ray Chen
clear text. DO NOT MERGE. Change-Id: I15c3ac48b05a50eb61324eeffbc29dfa7a64879f
2011-04-27am a2c6e06d: Merge "Fixing a couple of crashes when mContentUri is null."Conley Owens
* commit 'a2c6e06dfa4e83925a9af7d3b455b48e5e97f067': Fixing a couple of crashes when mContentUri is null.
2011-04-27Merge "Fixing a couple of crashes when mContentUri is null."Conley Owens
2011-04-21Fixed the issue that media sets still appear after deleting all albums in ↵Qi Ling
Gallery3D. If we delete all media sets in Gallery3D by "Selecte All" and "Delete" (basically, making Gallery3D empty through one shot delete), next time we enter Gallery3D we can see delted albums are still there. The cause of this issue is when the number of media sets becomes zero (e.g., after one shot delete), the original logic skips checking for any deleted sets. We should check if there is any change in media sets (including the case it is totally gone), regardless of the current number of media sets Change-Id: I9bc45fb13925b5ca9176d88fcfead0690c69ba63 Signed-off-by: madan ankapura <mankapur@sta.samsung.com>
2011-04-21Fixed the issue that the same album gets duplicated in Gallery3DQi Ling
If we take a photo in camera and then go directly into Gallery album view by touching the folder icon twice (located in the upper left corner of image review screen), the same "Camera" Album is being displayed twice. In this case, the addMediaSet() is called twice with the same setid and datasource, which refers to the same "Camera" album. We avoid the same album being added into mMediaSets. Change-Id: I19fe227c6a036de262825ba11bbbf13c25271471 Signed-off-by: madan ankapura <mankapur@sta.samsung.com>
2011-04-21Fixed the "Select All" issue in Gallery3DQi Ling
Two issues: 1) "Select All" doesn't select all videos and photos in one album 2) "Select All" deselects some items previously selected The problem is caused by the same IDs in the image table and video table in database. The ID generation for each item is fine. But we cannot use ID as the only criteria for the uniqueness of items. If one image has the id "100" in the image table and one video has the id "100" in the video table, and both of them happen to be in the same bucket, then only one will be selected when we do "Select All". Change-Id: I6431827779a43dfaaf57338627ae3572f1b7a58b Signed-off-by: madan ankapura <mankapur@sta.samsung.com>
2011-04-12Fixing a couple of crashes when mContentUri is null.Kun Wang
There are some corner cases in the gallery where it is trying to display new images that has not been fully prepared yet. Change-Id: I47e87faeee3edac6afe0ead46f4773e01e52f59e
2011-03-18am edbc64ba: Import revised translations. DO NOT MERGEEric Fischer
* commit 'edbc64baf2f8f9f743df5ac005ff27d06e7aac36': Import revised translations. DO NOT MERGE
2011-03-18Import revised translations. DO NOT MERGEandroid-sdk-2.3.4_r1android-cts-2.3_r3Eric Fischer
Change-Id: I2ef5d8d92842ad703ad4467777d75ddea5669841
2011-02-08am 586c41f0: Import revised translations. DO NOT MERGEEric Fischer
* commit '586c41f0a6e871dd606830bfbac5e7460bb8d53b': Import revised translations. DO NOT MERGE
2011-02-07Import revised translations. DO NOT MERGEandroid-cts-2.3_r2Eric Fischer
Change-Id: I678a3ead5633746e1a9256ed831ef656dc75deca
2011-02-04fix scrolling bug upon pinch-zoomRitu Srivastava
when the user is using two fingers to pinch-zoom a photo, the screen will keep scrolling to the upper-left direction even when the two fingers are stationary . Change-Id: I5db1af75ed9fd1e031bee92b1c0d8ac91fa6e0ff Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
2011-01-28am 08861481: Import revised translations. DO NOT MERGEEric Fischer
* commit '088614818b249b93f52bf98939a0a7b48a013cf1': Import revised translations. DO NOT MERGE
2011-01-28Import revised translations. DO NOT MERGEEric Fischer
Change-Id: I43fce461046893fd34bf4efdc9cadb0e5d1fe33a
2011-01-27am 7034d29c: Import revised translations. DO NOT MERGEEric Fischer
* commit '7034d29c23774158e480dd21fa539aa5a6219fea': Import revised translations. DO NOT MERGE
2011-01-27Import revised translations. DO NOT MERGEEric Fischer
Change-Id: Iee9254025e4e7264c398d5af4c54553b9f8d0214
2011-01-07am 8fea88a4: Import translations for additional languages.Eric Fischer
* commit '8fea88a44b4783a4fbe97bdf6d89a82951ee9baf': Import translations for additional languages.
2011-01-06Import translations for additional languages.Eric Fischer
Change-Id: I8219b6133082d5bc1de53b53b73e38b78d59a596
2010-12-28Merge "Make the get/deletePhoto queries locale safe."Jean-Baptiste Queru
2010-12-17Make the get/deletePhoto queries locale safe.Johan Redestig
The get/deletePhoto queries were using String.format with default locale, which is not locale safe. Switching to selection args to build the queries. Change-Id: I60fab493b54f398864e3e923218d0f8f3d67be82
2010-11-24am a123fb47: Merge "Fix for crash in PathBarLayer::recomputeComponents"Jean-Baptiste Queru
* commit 'a123fb474de7b49c067e3e812129495a5cacd103': Fix for crash in PathBarLayer::recomputeComponents
2010-11-24Merge "Fix for crash in PathBarLayer::recomputeComponents"tools_r9tools_r8froyo-plus-aospJean-Baptiste Queru
2010-11-24Fix for crash in PathBarLayer::recomputeComponentsWang Kun
The crash is triggered by our stability test suite. Adding a test for null on the component to follow the pattern from elsewhere in the class. java.lang.NullPointerException atcom.cooliris.media.PathBarLayer.recomputeComponents(PathBarLayer.java:255) atcom.cooliris.media.PathBarLayer.pushLabel(PathBarLayer.java:27) atcom.cooliris.media.GridLayer.setState(GridLayer.java:316) atcom.cooliris.media.GridInputProcessor.setCurrentSelectedSlot(GridInputProcessor.java:113) atcom.cooliris.media.GridLayer.setSingleImage(GridLayer.java:1492) atcom.cooliris.media.Gallery$1.run(Gallery.java:194) Change-Id: I0c088de34026e0be039e76e0a6107eac093a313e
2010-11-22am 6e031150: Merge "Gallery3D: Remove unnecessary variables"Jack Palevich
* commit '6e031150ce7926b5e90046508d8e6964cf14e166': Gallery3D: Remove unnecessary variables
2010-11-22Merge "Gallery3D: Remove unnecessary variables"Jack Palevich
2010-11-22Gallery3D: Remove unnecessary variablesRodrigo Obregon
This patch removes the variables isTouchPressed and isBarDragged introduced in the patch "Gallery3D: Add depth component to icon animation". This variables are no longer used in the current version of the patch. Change-Id: I5c35d1f7e39b45ea13cff4a430ca35e668cef53c Signed-off-by: Rodrigo Obregon <robregon@ti.com>
2010-11-22am 4b445dfd: Merge "Gallery3D: Add depth component to icon animation"Jack Palevich
* commit '4b445dfd349a40d51c85070451518374306eda96': Gallery3D: Add depth component to icon animation
2010-11-22Merge "Gallery3D: Add depth component to icon animation"Jack Palevich
2010-11-22Gallery3D: Add depth component to icon animationRodrigo Obregon
When the Gallery application positions the thumbnails in a GridView, they are placed in the same z-plane. When a configuration change occurs the icons present a z-fighting visual artifact. This patch adds a z component to the thumbnails when they are animated as to mitigate this effect. This is specially noticeable in a GPU architecture using deferred rendering. Change-Id: Icc9bb782b420697f282ed2b10a699b36d09c7abf Signed-off-by: Rodrigo Obregon <robregon@ti.com>
2010-11-19am 4b47e1bb: Merge "Revert "Gallery3D: Add depth component to icon animation""Jack Palevich
* commit '4b47e1bb8512b46555bc0bb863a72c593dbc3735': Revert "Gallery3D: Add depth component to icon animation"
2010-11-19Merge "Revert "Gallery3D: Add depth component to icon animation""Jack Palevich
2010-11-19Revert "Gallery3D: Add depth component to icon animation"Jack Palevich
This reverts commit f3a57d42104c5df77624d38813747b1279525d50.
2010-11-19am aa6b30c7: Merge "Gallery3D: Add depth component to icon animation"Jack Palevich
* commit 'aa6b30c7d17f7d4ef197b4a4c8aec29ce9c6b5a7': Gallery3D: Add depth component to icon animation
2010-11-19Merge "Gallery3D: Add depth component to icon animation"Jack Palevich
2010-11-18Gallery3D: Add depth component to icon animationRodrigo Obregon
When the Gallery application positions the thumbnails in a GridView, they are placed in the same z-plane. When a configuration change occurs the icons present a z-fighting visual artifact. This patch adds a z component to the thumbnails when they are animated as to mitigate this effect. This is specially noticeable in a GPU architecture using deferred rendering. Change-Id: If78232058b71d482cde0dbb55a038ded9fdbdf76 Signed-off-by: Rodrigo Obregon <robregon@ti.com>
2010-11-10am cee7f831: Orientation change should not trigger the video playback to ↵James Dong
start from the very beginning. * commit 'cee7f831205fb7b29a05199fc0c32ee459fde3b1': Orientation change should not trigger the video playback to start from the very beginning.
2010-11-08Orientation change should not trigger the video playback to start from the ↵android-cts-2.3_r1android-2.3_r1android-2.3.2_r1android-2.3.1_r1James Dong
very beginning. Without android:configChanges field in the AndroidManifest.xml, every time that the orientation changes, the MovieView activity restarts. That is why the video plays from the very beginning. bug - 3177061 Change-Id: I71fa08b35991a213a99795d804def28aff045de5
2010-11-06am 2906ad26: Allows the movie view to change orientation and not use fixed ↵James Dong
landscape mode * commit '2906ad26866f433e665970df8e2dc8f9b60879ae': Allows the movie view to change orientation and not use fixed landscape mode
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 13:55:43 +0000