OSDN Git Service
The Android Open Source Project [Tue, 31 Jul 2012 14:52:25 +0000 (07:52 -0700)]
Sync with jb-mr1-dev
Change-Id: I9a32d6562c1db5031763241e8624be666624b3e4
Ed Heyl [Thu, 26 Jul 2012 14:39:34 +0000 (07:39 -0700)]
Merge remote-tracking branch 'goog/master' into jb-mr1-dev
Owen Lin [Thu, 26 Jul 2012 09:12:24 +0000 (02:12 -0700)]
Merge "Add @TargetApi for all Mtp related code." into gb-ub-photos-arches
Angus Kong [Thu, 26 Jul 2012 01:12:15 +0000 (18:12 -0700)]
Merge "Add check for camera focus/metering area." into gb-ub-photos-arches
Bobby Georgescu [Thu, 26 Jul 2012 00:50:47 +0000 (17:50 -0700)]
Merge "Only give haptic feedback when enabled in system settings" into gb-ub-photos-arches
Angus Kong [Tue, 24 Jul 2012 17:51:19 +0000 (01:51 +0800)]
Add check for camera focus/metering area.
bug:
6881073
Change-Id: I6ea851befc9f95d4b3def3e7d04da7285be5a755
Angus Kong [Wed, 25 Jul 2012 20:55:15 +0000 (13:55 -0700)]
Merge "Rename to HAS_ZOOM_WHEN_RECORDING." into gb-ub-photos-arches
Angus Kong [Tue, 24 Jul 2012 18:05:19 +0000 (02:05 +0800)]
Rename to HAS_ZOOM_WHEN_RECORDING.
Rename HAS_CAMCORDER_ZOOM to HAS_ZOOM_WHEN_RECORDING.
bug:
6838676
Change-Id: I12446f62810b391b1f40944ee93258efe1689a93
Bobby Georgescu [Wed, 25 Jul 2012 17:20:19 +0000 (10:20 -0700)]
Fix for monkey-generated NPE in PhotoView from bug
6848371
In other parts of the code, there are checks for getGLRoot
returning null, and one was missing here.
Bug:
6848371
Change-Id: I3a7a1e1ea9847a43f4791de84f5f70cc27d53a1a
Bobby Georgescu [Tue, 24 Jul 2012 18:48:45 +0000 (11:48 -0700)]
Only give haptic feedback when enabled in system settings
Bug:
6866688
Change-Id: I4e349fe666244ef5459dd591c8141768b24c910a
Owen Lin [Tue, 24 Jul 2012 08:42:52 +0000 (16:42 +0800)]
Add @TargetApi for all Mtp related code.
These classes should not be called since the MtpSource won't be
registered to DataManager.
Change-Id: I3f88dc24f295af3d9e18218f56e6c30731c1e328
Owen Lin [Tue, 24 Jul 2012 07:34:20 +0000 (15:34 +0800)]
Use our own OverScroller for backward compatibility.
Change-Id: Ibcf48a638ab716116d1ce2ff8c2686741ca0a996
Owen Lin [Tue, 24 Jul 2012 06:34:07 +0000 (14:34 +0800)]
Avoid using class defined in API level 14.
Change-Id: Ia6385f98b048292de70c6e8aa628a2e6fc629485
Andrew Hsieh [Mon, 23 Jul 2012 17:10:11 +0000 (10:10 -0700)]
Merge "Fixed x86 build" into gb-ub-photos-arches
Andrew Hsieh [Wed, 18 Jul 2012 23:40:14 +0000 (16:40 -0700)]
Fixed x86 build
NDK supports x86 from r6. Without setting correct LOCAL_NDK_VERSION
build may fail to add library path for "-llog" and "-lEGL"
Change-Id: I863e20e434d274b5d8924eafcf1f5e1d0b05f90d
Wu-cheng Li [Sat, 21 Jul 2012 08:41:58 +0000 (16:41 +0800)]
Fix crash on launch for tablet devices.
bug:
6851887
Change-Id: I18c956c6727d10fcc1045d7ec0010d30a16acfc2
Ying Wang [Fri, 20 Jul 2012 17:39:51 +0000 (10:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1b238d3cc489879b18c835d7e8e23431c92efdd1
Auto-generated-cl: translation import
Wu-cheng Li [Fri, 20 Jul 2012 11:23:57 +0000 (19:23 +0800)]
Update gallery launcher icons.
bug:
6845667
Change-Id: I4f3b87415bb9786732fff375afd8eccaeb7ef1d8
Wu-cheng Li [Fri, 20 Jul 2012 08:28:21 +0000 (01:28 -0700)]
Merge "Do not use listPreferredItemHeightSmall before API 14." into gb-ub-photos-arches
Wu-cheng Li [Thu, 19 Jul 2012 10:35:30 +0000 (18:35 +0800)]
Do not use listPreferredItemHeightSmall before API 14.
bug:
6706647
Change-Id: I9ebdb299e16bdf467cc46b3d094306d93147ee64
Angus Kong [Fri, 20 Jul 2012 07:59:50 +0000 (15:59 +0800)]
Add check for camcorder zoom.
bug:
6838676
Change-Id: I9aeda27cf55ded444841ade40ea1eb1b91da01cb
Chih-Chung Chang [Fri, 20 Jul 2012 03:38:48 +0000 (11:38 +0800)]
Only make time lapse recording available on and after Honeycomb.
Change-Id: Ia5b2f69a3c0feb9e0219118a7dd372a09cf2da73
Jean-Baptiste Queru [Thu, 19 Jul 2012 17:56:47 +0000 (10:56 -0700)]
Fix non-ARM builds - use the proper way to reference libraries
Change-Id: Ibd84af84861d1cbaa8203e4b287cb20f5e9027a0
Wu-cheng Li [Thu, 19 Jul 2012 09:31:31 +0000 (17:31 +0800)]
Change minSdkVersion to 13.
bug:
6706723
Change-Id: I3bb7cfa173f6fdd2ba9df4bda96ea31349b5bd5c
Ying Wang [Wed, 18 Jul 2012 18:46:12 +0000 (11:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2090d15e5bdf9944b8300748da4f8eca4b797709
Auto-generated-cl: translation import
Ying Wang [Wed, 18 Jul 2012 18:45:10 +0000 (11:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7c0a46f58b9086734ec66568601cb5efd536bcd6
Auto-generated-cl: translation import
Owen Lin [Wed, 18 Jul 2012 02:44:44 +0000 (19:44 -0700)]
Merge "Make CustomMenu compatible with API level 10." into gb-ub-photos-arches
Ying Wang [Tue, 17 Jul 2012 17:22:53 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I46832a8f8bd16162a91401670eea64278e7806d1
Auto-generated-cl: translation import
Ying Wang [Tue, 17 Jul 2012 17:22:16 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7211ff883bfdf8f5483d4b2f19f7f3572116335a
Auto-generated-cl: translation import
Owen Lin [Wed, 11 Jul 2012 03:20:00 +0000 (11:20 +0800)]
Make CustomMenu compatible with API level 10.
bug:
6802855
Change-Id: I230c91bd9744935a181881131dcd2275ed89d819
Ahbong Chang [Tue, 17 Jul 2012 09:19:40 +0000 (02:19 -0700)]
Merge "Add checker for panorama supporting." into gb-ub-photos-arches
Ahbong Chang [Tue, 17 Jul 2012 08:58:17 +0000 (16:58 +0800)]
Add checker for panorama supporting.
Bug:
6816669
Change-Id: I34f80485d46f04f7adc49e2fd49dea1a08a72af9
Ying Wang [Mon, 16 Jul 2012 18:46:43 +0000 (11:46 -0700)]
Merge "Import translations. DO NOT MERGE"
Ying Wang [Mon, 16 Jul 2012 18:10:27 +0000 (11:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f824e4ef25030fa326c33bf2e29a75a8b588e39
Auto-generated-cl: translation import
Ying Wang [Mon, 16 Jul 2012 17:11:05 +0000 (10:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib588a4ce4dc897fbf676781e9a08ac5718b543aa
Auto-generated-cl: translation import
Ying Wang [Mon, 16 Jul 2012 17:10:33 +0000 (10:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3252729107c7525ca5d208ba106a10a0e9917661
Auto-generated-cl: translation import
Ying Wang [Fri, 13 Jul 2012 19:18:35 +0000 (12:18 -0700)]
am
2936da9b: (-s ours) am
8c1fe6d3: Import translations. DO NOT MERGE
* commit '
2936da9b396a5c2286f61e20fe9f4a21bbc4534d':
Import translations. DO NOT MERGE
Ying Wang [Fri, 13 Jul 2012 19:16:41 +0000 (12:16 -0700)]
am
8c1fe6d3: Import translations. DO NOT MERGE
* commit '
8c1fe6d39f511c60f03763c1c905a437fc02c3ab':
Import translations. DO NOT MERGE
Ying Wang [Fri, 13 Jul 2012 18:14:48 +0000 (11:14 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Ying Wang [Fri, 13 Jul 2012 18:06:46 +0000 (11:06 -0700)]
Merge "Change "current" sdk version to 16 as it becomes official" into gb-ub-photos-arches
Ed Heyl [Fri, 13 Jul 2012 17:42:03 +0000 (10:42 -0700)]
Merge remote-tracking branch 'goog/master' into gb-ub-photos-arches
Ying Wang [Fri, 13 Jul 2012 17:29:34 +0000 (10:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ied8634473195dea6df909dd08bdb2da16d99788c
Auto-generated-cl: translation import
Ying Wang [Fri, 13 Jul 2012 17:28:52 +0000 (10:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2d34057147bfe8ae4d4698e43c41aed9c2b9f71e
Auto-generated-cl: translation import
Ying Wang [Fri, 13 Jul 2012 17:27:25 +0000 (10:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic33cc9dc568e0acf7d12f5d743801689647ea916
Auto-generated-cl: translation import
Ying Wang [Fri, 13 Jul 2012 17:19:43 +0000 (10:19 -0700)]
Change "current" sdk version to 16 as it becomes official
Change-Id: I09c13b99ff1bc368e1fa335f2efc4cba5410d2f5
Chih-Chung Chang [Fri, 13 Jul 2012 06:57:26 +0000 (14:57 +0800)]
Only use SurfaceTexture.release and setIconAttribute on newer platforms.
Bug:
6706784
Change-Id: Ic1bb2bb27c3184d791de566d88dbade039fb9d87
Angus Kong [Fri, 13 Jul 2012 03:54:05 +0000 (11:54 +0800)]
Add the method for hidden fields.
bug:
6698375
Change-Id: I5feb3fdd680fec0d745bd3176f4676c16484d4ed
Ahbong Chang [Wed, 11 Jul 2012 05:56:46 +0000 (13:56 +0800)]
Add existence check for face detection methods.
android.hardware.Camera.setFaceDetectionListener()
android.hardware.Camera.startFaceDetection()
android.hardware.Camera.stopFaceDetection()
android.hardware.Camera.Parameters.getMaxNumDetectedFaces()
Bug:
6707152
Change-Id: Ia6b54246273548db44ec28c40f9efe49048ea8d5
Wu-cheng Li [Wed, 11 Jul 2012 11:56:54 +0000 (04:56 -0700)]
Merge "Make jni build against NDK." into gb-ub-photos-arches
Wu-cheng Li [Wed, 4 Jul 2012 08:32:57 +0000 (16:32 +0800)]
Make jni build against NDK.
bug:
6698708
Change-Id: I913e2f29657abc0af79223ba49148a6080d39ba7
Hung-ying Tyan [Tue, 10 Jul 2012 09:04:40 +0000 (02:04 -0700)]
Merge "Add existence check for DevicePolicyManager.getCameraDisabled()"
Hung-ying Tyan [Mon, 9 Jul 2012 06:59:51 +0000 (14:59 +0800)]
Add existence check for DevicePolicyManager.getCameraDisabled()
Bug:
6706695
Change-Id: Ib8ea8805a4bea862c8407f8c73a6e5ba1e0f49d3
Ying Wang [Mon, 9 Jul 2012 17:25:49 +0000 (10:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I93d4e9712d9e6dc0fb8035e222982b5fcd0955a5
Auto-generated-cl: translation import
Ying Wang [Mon, 9 Jul 2012 17:24:15 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1b461a3723c5439fefd54362be20a4a0100be5c8
Auto-generated-cl: translation import
Yuli Huang [Fri, 6 Jul 2012 07:12:26 +0000 (15:12 +0800)]
Avoid using setSystemUiVisibility in old platforms.
bug:
6785569
Change-Id: I0a19ab2818b6f34d530c5d65e781d3168533d44f
Owen Lin [Thu, 5 Jul 2012 09:06:56 +0000 (17:06 +0800)]
Don't test the EXTRA_LOCAL_ONLY before HC.
Change-Id: Idebb2aba994e38cf7eead795f1834ff98eaec27d
Owen Lin [Thu, 5 Jul 2012 04:16:40 +0000 (12:16 +0800)]
Use different back algorithm for Gallery's widget after JB.
Change-Id: I1c3c6eea4e5794555a36179b295b15d9dba6de74
Owen Lin [Wed, 4 Jul 2012 10:20:13 +0000 (18:20 +0800)]
Don't show the shuffle and album widget for old platforms
Change-Id: Ide7074025aefe289bf6c71d623eac5100ab72932
Owen Lin [Wed, 4 Jul 2012 07:48:59 +0000 (15:48 +0800)]
Don't use invalidateOptionsMenu before API level 11.
Change-Id: If46d46e44797b2bd4f66235eca0954a55d0008cf
Chih-Chung Chang [Wed, 4 Jul 2012 08:54:02 +0000 (16:54 +0800)]
Don't use AutoFocusMoveCallback on older platforms.
Change-Id: I281888ee88c08b1caf4754e714f0f42c75e26dd9
Chih-Chung Chang [Tue, 3 Jul 2012 11:33:46 +0000 (19:33 +0800)]
Use MTP only if the MTP API is available.
Change-Id: I5c747d0da2905eb344c56dfab6333034dd5eecc3
Hung-ying Tyan [Wed, 4 Jul 2012 02:48:31 +0000 (19:48 -0700)]
Merge "Add ExifTags to hold tag names that are not available in ExifInterface"
Ying Wang [Tue, 3 Jul 2012 17:49:16 +0000 (10:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5ecde362be1d6e55ecc5e6fe5f449a3e435080f8
Auto-generated-cl: translation import
Ying Wang [Tue, 3 Jul 2012 17:47:44 +0000 (10:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I502e70e7b7acf9821cdefdc92352924c8fa9ba99
Auto-generated-cl: translation import
Hung-ying Tyan [Tue, 3 Jul 2012 10:55:25 +0000 (18:55 +0800)]
Add ExifTags to hold tag names that are not available in ExifInterface
prior to API level 11.
Bug:
6775786
Change-Id: Iab564f577d9a0b87c8fb7b91eda6cabc12b5a11a
Chih-Chung Chang [Tue, 3 Jul 2012 04:49:45 +0000 (12:49 +0800)]
Remove dependencies on APIs only exist on newer platforms.
Change-Id: I606a23863247454051dd183ddf6b77f6bc882685
Owen Lin [Thu, 28 Jun 2012 09:12:20 +0000 (17:12 +0800)]
Don't reuse bitmap before HoneyComb.
Change-Id: I0df9bf0a8f43e28ed25b436d4c584dc3ceb43c1d
The Android Open Source Project [Fri, 29 Jun 2012 15:19:39 +0000 (08:19 -0700)]
Avoid using View.SYSTEM_UI_FLAG_LOW_PROFILE.
Use View.STATUS_BAR_HIDDEN instead.
Bug:
6706727
Change-Id: I0324a251b10eba11350f1813ee975d493bbcfafa
Eric Fischer [Mon, 2 Jul 2012 18:11:42 +0000 (11:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d153253458dc03fab2e24a08c9208eec6552bdd
Auto-generated-cl: translation import
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
OSDN Git Service
