summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Pass correct intent to IntentService in PackagesMonitor"Hung-ying Tyan2012-06-281-1/+2
|\
| * Pass correct intent to IntentService in PackagesMonitorHung-ying Tyan2012-06-291-1/+2
| | | | | | | | | | Bug: 6755040 Change-Id: I073f4acd026cfcae3e2f4759657324f48b7238c4
* | Merge "Don't use Build.VERSION_CODES."Owen Lin2012-06-286-14/+20
|\ \
| * | Don't use Build.VERSION_CODES.Owen Lin2012-06-286-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | Since they won't be available on old platform. bug: 6752318 Change-Id: I55a9e83dbf05b93c83c68cb31f6edcbc29793283
* | | Merge "Don't reuse bitmaps in BitmapRegionDecoder before JB."Owen Lin2012-06-284-6/+65
|\| | | |/ |/|
| * Don't reuse bitmaps in BitmapRegionDecoder before JB.Owen Lin2012-06-284-6/+65
| | | | | | | | Change-Id: I8a2f520f98116af6861fa2cd1460e6f848bbb4e4
* | Merge "Don't use Display.getSize()."Owen Lin2012-06-282-4/+16
|\|
| * Don't use Display.getSize().Owen Lin2012-06-272-4/+16
| | | | | | | | Change-Id: I9b5c9021bae2b58d2815a909c97104f215d4d2e8
* | am 51e332a8: (-s ours) am 7aeb8cd4: Import translations. DO NOT MERGEEric Fischer2012-06-280-0/+0
|\ \ | | | | | | | | | | | | * commit '51e332a88899b86c2f706e8ad164877665fe319a': Import translations. DO NOT MERGE
| * \ am 7aeb8cd4: Import translations. DO NOT MERGEEric Fischer2012-06-281-1/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '7aeb8cd43cdf11aec3f925e76cf84b37fecdb260': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEEric Fischer2012-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I340bc2547295382bdbbf31b933e2facec181cbfc Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEEric Fischer2012-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4ea9a929181ee1b09cdd4628af095ffaa86646e3 Auto-generated-cl: translation import
* | | | Merge "Replace BroadcastReceiver.goAsync() with IntentService"Hung-ying Tyan2012-06-272-14/+15
|\ \ \ \
| * | | | Replace BroadcastReceiver.goAsync() with IntentServiceHung-ying Tyan2012-06-272-14/+15
| | |_|/ | |/| | | | | | | | | | | | | | | | | | to make Gallery run on older API. Change-Id: I30dacb38eb4e70ed3f89135544d6c514d0379add
* | | | am c9cd45b3: (-s ours) am d857f776: Merge "Import translations. DO NOT ↵Ying Wang2012-06-270-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | MERGE" into jb-dev * commit 'c9cd45b321a834d20629ff9dc91fec2ccce79f7c': Import translations. DO NOT MERGE
| * | | am d857f776: Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-270-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'd857f77613007fc2005903eb33e5315ed45368c4': Import translations. DO NOT MERGE
| | * | Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-270-0/+0
| | |\ \
| | | * | Import translations. DO NOT MERGEYing Wang2012-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I01abb0b9f6481a865cc3c796bc301f1a34c76be7
* | | | | Merge "Import translations. DO NOT MERGE"Ying Wang2012-06-270-0/+0
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEYing Wang2012-06-271-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Change-Id: If975fd0d8a50a650b05756ba1a3202ac49df4748
* | | | | am 3326551f: (-s ours) am c00af20f: Import translations. DO NOT MERGEYing Wang2012-06-270-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '3326551f504f48073c7083738e1f58f4cf7a3f49': Import translations. DO NOT MERGE
| * | | | am c00af20f: Import translations. DO NOT MERGEYing Wang2012-06-271-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'c00af20f0613cbfc2a2a650372840ac37789878f': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEYing Wang2012-06-271-1/+1
| | | |/ | | |/| | | | | | | | | Change-Id: I5df2833519f46df2d6d9b5e290b605b0811d397f
* | | | Import translations. DO NOT MERGEYing Wang2012-06-271-1/+1
| |_|/ |/| | | | | | | | Change-Id: Id2dc6d5f32fc724c03e0f3a628590f6f07f87357
* | | am acd75301: am bb52543c: Merge "Show undo option for 3 seconds after the ↵Chih-Chung Chang2012-06-272-1/+13
|\| | | | | | | | | | | | | | | | | | | | last picture is deleted." into jb-dev * commit 'acd753010dcf6d8079e4620722921694cb041dbf': Show undo option for 3 seconds after the last picture is deleted.
| * | am bb52543c: Merge "Show undo option for 3 seconds after the last picture is ↵Chih-Chung Chang2012-06-272-1/+13
| |\| | | | | | | | | | | | | | | | | | | deleted." into jb-dev * commit 'bb52543c6ba40749d7046f6ea9da4a8b30793f8d': Show undo option for 3 seconds after the last picture is deleted.
| | * Merge "Show undo option for 3 seconds after the last picture is deleted." ↵Chih-Chung Chang2012-06-272-1/+13
| | |\ | | | | | | | | | | | | into jb-dev
| | | * Show undo option for 3 seconds after the last picture is deleted.Chih-Chung Chang2012-06-272-1/+13
| | | | | | | | | | | | | | | | | | | | Bug: 6742326 Change-Id: I5008c1984fff0a2affaeabf2a195cfcdc517ebc2
* | | | am 52d51fff: am fc826a5f: Merge "Migrate local-album gallery widgets from ↵Hung-ying Tyan2012-06-263-6/+191
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | pre-JB." into jb-dev * commit '52d51fff7affd82bc69b025d261ebf19b25728c2': Migrate local-album gallery widgets from pre-JB.
| * | | am fc826a5f: Merge "Migrate local-album gallery widgets from pre-JB." into ↵Hung-ying Tyan2012-06-263-6/+191
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit 'fc826a5ff488e9e3b27d2a521518e0ae5346b9fe': Migrate local-album gallery widgets from pre-JB.
| | * | Merge "Migrate local-album gallery widgets from pre-JB." into jb-devHung-ying Tyan2012-06-263-6/+191
| | |\ \ | | | |/ | | |/|
| | | * Migrate local-album gallery widgets from pre-JB.Hung-ying Tyan2012-06-273-6/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 27a76801: am c7e89dae: Update thumbnail if a picture is deleted in ↵Chih-Chung Chang2012-06-264-0/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | background. * commit '27a768018b18f45b9dd912bafd09dea64460f852': Update thumbnail if a picture is deleted in background.
| * | | am c7e89dae: Update thumbnail if a picture is deleted in background.Chih-Chung Chang2012-06-264-0/+17
| |\| | | | | | | | | | | | | | | | | | * commit 'c7e89daeb178a895de211c411d09a822de52e4e9': Update thumbnail if a picture is deleted in background.
| | * | Update thumbnail if a picture is deleted in background.Chih-Chung Chang2012-06-264-0/+17
| | |/ | | | | | | | | | | | | Bug: 6712751 Change-Id: I17f56c9ff04441e51f28b3e3bec23b1ac308b70c
* | | am 64cebdd1: am 6118af9d: Fix the behavior of deleting the last picture.Chih-Chung Chang2012-06-263-69/+235
|\| | | | | | | | | | | | | | * commit '64cebdd1eebd2c001e6680f247c6f741889ad989': Fix the behavior of deleting the last picture.
| * | am 6118af9d: Fix the behavior of deleting the last picture.Chih-Chung Chang2012-06-263-69/+235
| |\| | | | | | | | | | | | | * commit '6118af9ddad8acc050133154f8f60c842c7f9bfa': Fix the behavior of deleting the last picture.
| | * Fix the behavior of deleting the last picture.Chih-Chung Chang2012-06-263-69/+235
| | | | | | | | | | | | | | | | | | | | | Also fix the jank while deleting multiple pictures quickly. Bug: 6713932, 6712555 Change-Id: I9d64d8bbdcd4ec0dc9a447a51d50f88ff27363b4
* | | Merge "Use public OverScroller() instead of a hidden one.."Pin Ting2012-06-251-8/+8
|\ \ \
| * | | Use public OverScroller() instead of a hidden one..Pin Ting2012-06-231-8/+8
| | | | | | | | | | | | | | | | | | | | Bug:6698374 Change-Id: I3a97d0b4bbfb5e2a1e9f4a656d39db636defcdbd
* | | | Merge "Use another version of setRemoteViews for backward compatibility."Owen Lin2012-06-251-1/+5
|\ \ \ \
| * | | | Use another version of setRemoteViews for backward compatibility.Owen Lin2012-06-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 6706684 Change-Id: I6fd77845d64cfb9e6830c1eabdcb5c2e9a7df854
* | | | | Merge "Use MediaColumns.WIDTH and MediaColumns.HEIGHT only when they are ↵Owen Lin2012-06-253-12/+39
|\| | | | | | | | | | | | | | | | | | | available."
| * | | | Use MediaColumns.WIDTH and MediaColumns.HEIGHT only when they are available.Owen Lin2012-06-223-12/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6698720 Change-Id: Iaabfd1d5fe16b5d89f564d688a78e773ad36c8bd
* | | | | am 57150b3c: Reconcile with jb-releaseThe Android Open Source Project2012-06-220-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | * commit '57150b3c30a066bdf7f346223bf0707a345c4e47':
| * | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-220-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ica9e5255d9ea862cb24ef52d69545881147a2a26
| | * \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-220-0/+0
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
* | | | | | am ea34811c: (-s ours) am 55fad05e: Import translations. DO NOT MERGEYing Wang2012-06-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea34811c9e7e301c1deba0fedd331101cfe7ce5f': Import translations. DO NOT MERGE
| * | | | | am 55fad05e: Import translations. DO NOT MERGEYing Wang2012-06-221-4/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '55fad05ef4a80b3a690d4748c5b90fb5c0488d22': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEYing Wang2012-06-221-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I49c07cd7b3bde69fb0b2b09c298710cae6d2a91f