summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't use AutoFocusMoveCallback on older platforms.Chih-Chung Chang2012-07-041-0/+3
| | | | Change-Id: I281888ee88c08b1caf4754e714f0f42c75e26dd9
* Use MTP only if the MTP API is available.Chih-Chung Chang2012-07-042-1/+7
| | | | Change-Id: I5c747d0da2905eb344c56dfab6333034dd5eecc3
* Merge "Add ExifTags to hold tag names that are not available in ExifInterface"Hung-ying Tyan2012-07-033-9/+38
|\
| * Add ExifTags to hold tag names that are not available in ExifInterfaceHung-ying Tyan2012-07-033-9/+38
| | | | | | | | | | | | | | prior to API level 11. Bug: 6775786 Change-Id: Iab564f577d9a0b87c8fb7b91eda6cabc12b5a11a
* | Remove dependencies on APIs only exist on newer platforms.Chih-Chung Chang2012-07-038-11/+1510
|/ | | | Change-Id: I606a23863247454051dd183ddf6b77f6bc882685
* Don't reuse bitmap before HoneyComb.Owen Lin2012-07-0314-92/+133
| | | | Change-Id: I0df9bf0a8f43e28ed25b436d4c584dc3ceb43c1d
* Avoid using View.SYSTEM_UI_FLAG_LOW_PROFILE.The Android Open Source Project2012-07-022-5/+3
| | | | | | | Use View.STATUS_BAR_HIDDEN instead. Bug:6706727 Change-Id: I0324a251b10eba11350f1813ee975d493bbcfafa
* Merge "Do not use NfcAdapter API in old platforms."Yuli Huang2012-07-012-15/+28
|\
| * Do not use NfcAdapter API in old platforms.Yuli Huang2012-06-292-15/+28
| | | | | | | | | | bug:6698904 Change-Id: I8cab312a212e4cba43187a73bc76d3f2164527a9
* | am 14b961f6: Reconcile with jb-releaseThe Android Open Source Project2012-06-290-0/+0
|\ \ | | | | | | | | | * commit '14b961f6ef4ab2177765c3e64676f0735d934158':
| * \ Reconcile with jb-releaseThe Android Open Source Project2012-06-290-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: Iba9ed40f75d1d8519d5052fa4dd5fd6796cf8e24
| | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-270-0/+0
| | |\ \
| | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-260-0/+0
| | | |\ \
* | | | \ \ Merge "Remove hardwired strings for no external storage."Owen Lin2012-06-291-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Remove hardwired strings for no external storage.Owen Lin2012-06-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 6682495 Change-Id: I68652d6b01842a42907b953574d563cf98e65219
* | | | | | 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-283-5/+64
|\| | | | | | | | |/ / / / / / |/| | | | | |
| * | | | | | Don't reuse bitmaps in BitmapRegionDecoder before JB.Owen Lin2012-06-283-5/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Replace BroadcastReceiver.goAsync() with IntentServiceHung-ying Tyan2012-06-271-14/+14
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to make Gallery run on older API. Change-Id: I30dacb38eb4e70ed3f89135544d6c514d0379add
* | | | | | 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 9334cdf3: Reconcile with jb-releaseThe Android Open Source Project2012-06-220-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | * commit '9334cdf3825667134a55b198568c76ae40fc4a57':
| * | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-220-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | Change-Id: I20961dda95f0a5b0b580b73de5e8b09434eaaa44
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-210-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | Guard the use of SYSTEM_UI_FLAG_XXXX with TargetApiOwen Lin2012-06-224-35/+102
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | bug: 6698718 Change-Id: I6962f0128ce2bd57658b7f3b77d2bc150eff1f60
* | | | | 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.