OSDN Git Service
Yuli Huang [Mon, 2 Jul 2012 02:50:22 +0000 (19:50 -0700)]
Merge "Do not use NfcAdapter API in old platforms."
Ying Wang [Fri, 29 Jun 2012 17:13:45 +0000 (10:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7eac634e7f838f0eea492ec6b01fec518a7a3b39
Auto-generated-cl: translation import
The Android Open Source Project [Fri, 29 Jun 2012 15:19:39 +0000 (08:19 -0700)]
The Android Open Source Project [Fri, 29 Jun 2012 15:14:13 +0000 (08:14 -0700)]
Reconcile with jb-release
Change-Id: Iba9ed40f75d1d8519d5052fa4dd5fd6796cf8e24
Yuli Huang [Fri, 29 Jun 2012 10:59:17 +0000 (18:59 +0800)]
Do not use NfcAdapter API in old platforms.
bug:
6698904
Change-Id: I8cab312a212e4cba43187a73bc76d3f2164527a9
Wu-cheng Li [Fri, 29 Jun 2012 10:21:15 +0000 (18:21 +0800)]
Make gallery/camera build in JB API level.
Bug:
4965992
Change-Id: I91e56aacb5447c811aafce756292ab5ee0636cee
Owen Lin [Fri, 29 Jun 2012 09:43:22 +0000 (02:43 -0700)]
Merge "Remove hardwired strings for no external storage."
Hung-ying Tyan [Fri, 29 Jun 2012 05:48:03 +0000 (22:48 -0700)]
Merge "Pass correct intent to IntentService in PackagesMonitor"
Owen Lin [Fri, 29 Jun 2012 05:45:26 +0000 (22:45 -0700)]
Merge "Don't use Build.VERSION_CODES."
Owen Lin [Fri, 29 Jun 2012 05:33:34 +0000 (22:33 -0700)]
Merge "Don't reuse bitmaps in BitmapRegionDecoder before JB."
Hung-ying Tyan [Fri, 29 Jun 2012 04:11:54 +0000 (12:11 +0800)]
Pass correct intent to IntentService in PackagesMonitor
Bug:
6755040
Change-Id: I073f4acd026cfcae3e2f4759657324f48b7238c4
Owen Lin [Fri, 29 Jun 2012 03:38:15 +0000 (20:38 -0700)]
Merge "Don't use Display.getSize()."
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:19:20 +0000 (10:19 -0700)]
am
51e332a8: (-s ours) am
7aeb8cd4: Import translations. DO NOT MERGE
* commit '
51e332a88899b86c2f706e8ad164877665fe319a':
Import translations. DO NOT MERGE
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:12:25 +0000 (10:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4ea9a929181ee1b09cdd4628af095ffaa86646e3
Auto-generated-cl: translation import
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
Owen Lin [Thu, 28 Jun 2012 03:10:02 +0000 (11:10 +0800)]
Don't use Build.VERSION_CODES.
Since they won't be available on old platform.
bug:
6752318
Change-Id: I55a9e83dbf05b93c83c68cb31f6edcbc29793283
Owen Lin [Wed, 27 Jun 2012 11:01:21 +0000 (19:01 +0800)]
Don't reuse bitmaps in BitmapRegionDecoder before JB.
Change-Id: I8a2f520f98116af6861fa2cd1460e6f848bbb4e4
Hung-ying Tyan [Thu, 28 Jun 2012 02:16:12 +0000 (19:16 -0700)]
Merge "Replace BroadcastReceiver.goAsync() with IntentService"
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:35:31 +0000 (12:35 -0700)]
am
c9cd45b3: (-s ours) am
d857f776: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
c9cd45b321a834d20629ff9dc91fec2ccce79f7c':
Import translations. DO NOT MERGE
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:31:01 +0000 (12:31 -0700)]
Merge "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:49:45 +0000 (11:49 -0700)]
am
3326551f: (-s ours) am
c00af20f: Import translations. DO NOT MERGE
* commit '
3326551f504f48073c7083738e1f58f4cf7a3f49':
Import translations. DO NOT MERGE
Ying Wang [Wed, 27 Jun 2012 18:48:17 +0000 (11:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: If975fd0d8a50a650b05756ba1a3202ac49df4748
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:44 +0000 (11:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2dc6d5f32fc724c03e0f3a628590f6f07f87357
Ying Wang [Wed, 27 Jun 2012 18:23:07 +0000 (11:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5df2833519f46df2d6d9b5e290b605b0811d397f
Hung-ying Tyan [Wed, 27 Jun 2012 10:25:47 +0000 (18:25 +0800)]
Replace BroadcastReceiver.goAsync() with IntentService
to make Gallery run on older API.
Change-Id: I30dacb38eb4e70ed3f89135544d6c514d0379add
Owen Lin [Wed, 27 Jun 2012 07:28:07 +0000 (15:28 +0800)]
Don't use Display.getSize().
Change-Id: I9b5c9021bae2b58d2815a909c97104f215d4d2e8
Chih-Chung Chang [Wed, 27 Jun 2012 07:10:33 +0000 (00:10 -0700)]
am
acd75301: am
bb52543c: Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev
* commit '
acd753010dcf6d8079e4620722921694cb041dbf':
Show undo option for 3 seconds after the last picture is deleted.
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:47:29 +0000 (23:47 -0700)]
am
52d51fff: am
fc826a5f: Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev
* commit '
52d51fff7affd82bc69b025d261ebf19b25728c2':
Migrate local-album gallery widgets from pre-JB.
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:47:37 +0000 (10:47 -0700)]
am
27a76801: am
c7e89dae: Update thumbnail if a picture is deleted in background.
* commit '
27a768018b18f45b9dd912bafd09dea64460f852':
Update thumbnail if a picture is deleted in background.
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:42:04 +0000 (03:42 -0700)]
am
64cebdd1: am
6118af9d: Fix the behavior of deleting the last picture.
* commit '
64cebdd1eebd2c001e6680f247c6f741889ad989':
Fix the behavior of deleting the last picture.
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
Pin Ting [Tue, 26 Jun 2012 06:07:05 +0000 (23:07 -0700)]
Merge "Use public OverScroller() instead of a hidden one.."
Owen Lin [Tue, 26 Jun 2012 04:08:56 +0000 (21:08 -0700)]
Merge "Use another version of setRemoteViews for backward compatibility."
Owen Lin [Tue, 26 Jun 2012 04:08:20 +0000 (21:08 -0700)]
Merge "Use MediaColumns.WIDTH and MediaColumns.HEIGHT only when they are available."
Pin Ting [Wed, 20 Jun 2012 10:39:57 +0000 (18:39 +0800)]
Use public OverScroller() instead of a hidden one..
Bug:
6698374
Change-Id: I3a97d0b4bbfb5e2a1e9f4a656d39db636defcdbd
The Android Open Source Project [Fri, 22 Jun 2012 22:23:50 +0000 (15:23 -0700)]
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:30:22 +0000 (12:30 -0700)]
am
ea34811c: (-s ours) am
55fad05e: Import translations. DO NOT MERGE
* commit '
ea34811c9e7e301c1deba0fedd331101cfe7ce5f':
Import translations. DO NOT MERGE
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:55:29 +0000 (10:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: If644f38aa01a00a9eb6906f487ec46c0f1a0d532
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:20:21 +0000 (08:20 -0700)]
The Android Open Source Project [Fri, 22 Jun 2012 15:17:20 +0000 (08:17 -0700)]
Reconcile with jb-release
Change-Id: I20961dda95f0a5b0b580b73de5e8b09434eaaa44
Owen Lin [Fri, 22 Jun 2012 07:33:53 +0000 (15:33 +0800)]
Use another version of setRemoteViews for backward compatibility.
bug:
6706684
Change-Id: I6fd77845d64cfb9e6830c1eabdcb5c2e9a7df854
Owen Lin [Fri, 22 Jun 2012 04:31:33 +0000 (12:31 +0800)]
Use MediaColumns.WIDTH and MediaColumns.HEIGHT only when they are available.
bug:
6698720
Change-Id: Iaabfd1d5fe16b5d89f564d688a78e773ad36c8bd
Owen Lin [Thu, 21 Jun 2012 09:05:10 +0000 (17:05 +0800)]
Remove hardwired strings for no external storage.
bug:
6682495
Change-Id: I68652d6b01842a42907b953574d563cf98e65219
Owen Lin [Wed, 20 Jun 2012 08:54:24 +0000 (16:54 +0800)]
Guard the use of SYSTEM_UI_FLAG_XXXX with TargetApi
bug:
6698718
Change-Id: I6962f0128ce2bd57658b7f3b77d2bc150eff1f60
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 19:03:47 +0000 (12:03 -0700)]
am
3ca90d33: (-s ours) am
424df443: Import translations. DO NOT MERGE
* commit '
3ca90d33f83ba529349a4c1e577879af8220a33a':
Import translations. DO NOT MERGE
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:02:05 +0000 (11:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib58116d9f2da412110e7a45fe8c41eea73f771b1
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
Wu-cheng Li [Thu, 21 Jun 2012 08:45:55 +0000 (16:45 +0800)]
Use View.setBackgroundDrawable instead of setBackground.
View.setBackground was added in API 16. Use setBackgroundDrawable
instead.
bug:
6698428
Change-Id: I1346ba4c640ae98d76e333779b4620cdc48b6a3a
Eric Fischer [Thu, 21 Jun 2012 05:34:25 +0000 (22:34 -0700)]
am
2e671684: (-s ours) am
2574da18: Import translations. DO NOT MERGE
* commit '
2e67168492d5453876e913937ed1e36111fc2e48':
Import translations. DO NOT MERGE
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:45:30 +0000 (18:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: If82aede2b76dc81e117d9b6e62bb21c96aaf8914
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:41:47 +0000 (11:41 -0700)]
am
254a6b42: am
82220026: Merge "Fade in/out the undo bar." into jb-dev
* commit '
254a6b42372179bcc9cf6166639325d11411be77':
Fade in/out the undo bar.
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:25:21 +0000 (10:25 -0700)]
am
f058c3e7: (-s ours) am
705d8085: Import translations. DO NOT MERGE
* commit '
f058c3e790e5d5d811a925808111abf4671f439e':
Import translations. DO NOT MERGE
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:43:37 +0000 (09:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie875f22d881a5f35fce1484e0cfe6237b15699f7
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:31:47 +0000 (08:31 -0700)]
am
377329db: Reconcile with jb-release
* commit '
377329db75cc550ed78418c0c6a04a5ac534e5ba':
Make SystemUI always consists with the contrller overlay.
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
Owen Lin [Wed, 20 Jun 2012 05:55:16 +0000 (13:55 +0800)]
Move LongSparseArray into Gallery for unbundling.
Change-Id: Ifa0d06818a2d21bd8ddeabe808d792f39c31322f
Eric Fischer [Tue, 19 Jun 2012 20:27:21 +0000 (13:27 -0700)]
am
2e3a1767: (-s ours) am
8c93a140: Import translations. DO NOT MERGE
* commit '
2e3a1767f4e0b7769f0726795efba3a8f7c1de1f':
Import translations. DO NOT MERGE
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:58 +0000 (13:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: If311f3cbb087651e37b00789c69cd4035ec03e02
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:27:42 +0000 (11:27 -0700)]
am
382feb11: am
885f729f: Merge "Make SystemUI always consists with the contrller overlay." into jb-dev
* commit '
382feb11b767600d6aed8ad97d08d9de7a8673e0':
Make SystemUI always consists with the contrller overlay.
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:20:42 +0000 (07:20 -0700)]
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:16:19 +0000 (06:16 -0700)]
OSDN Git Service
