OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoGuard android.media.effect.Effect with TargetApi.
Wu-cheng Li [Fri, 10 Aug 2012 07:46:25 +0000 (15:46 +0800)]
Guard android.media.effect.Effect with TargetApi.

bug:6927717
Change-Id: I25f881ab449ea4cb26a41c5219884d93725a1693

11 years agoMerge "Hold WakeLock during MTP import" into gb-ub-photos-arches
Bobby Georgescu [Thu, 9 Aug 2012 05:20:53 +0000 (22:20 -0700)]
Merge "Hold WakeLock during MTP import" into gb-ub-photos-arches

11 years agoMerge "Rotate the texture in building PhotoFallbackEffect" into gb-ub-photos-arches
Owen Lin [Thu, 9 Aug 2012 02:53:30 +0000 (19:53 -0700)]
Merge "Rotate the texture in building PhotoFallbackEffect" into gb-ub-photos-arches

11 years agoDon't use getPreferredPreviewSizeForVideo and getSupportedVideoSizes before api 11.
Pin Ting [Wed, 8 Aug 2012 18:50:31 +0000 (11:50 -0700)]
Don't use getPreferredPreviewSizeForVideo and getSupportedVideoSizes before api 11.

Bug:6927815
Change-Id: Ifaa154c93536cfcc65fb1c67834dc737f2065f11

11 years agoRotate the texture in building PhotoFallbackEffect
Owen Lin [Wed, 8 Aug 2012 10:47:33 +0000 (18:47 +0800)]
Rotate the texture in building PhotoFallbackEffect

bug: 6525127
Change-Id: Iba348450b62190a1a2149cf0d7f20f19625cb6cf

11 years agoChange minSdkVersion to 10.
Wu-cheng Li [Wed, 8 Aug 2012 09:19:51 +0000 (17:19 +0800)]
Change minSdkVersion to 10.

bug:6927809
Change-Id: I6dcea54d3204bca71975a2600ee704a7161bf0bc

11 years agoHold WakeLock during MTP import
Bobby Georgescu [Wed, 8 Aug 2012 07:09:50 +0000 (00:09 -0700)]
Hold WakeLock during MTP import

 Bug: 6680729
 Bug: 6827858

Change-Id: Ida82db3288a429dacc5830b82ec6bbd954f75cf1

11 years agoGuard the usage of MenuItem.setShowAsAction in MenuHelper.
Owen Lin [Tue, 7 Aug 2012 09:38:47 +0000 (17:38 +0800)]
Guard the usage of MenuItem.setShowAsAction in MenuHelper.

bug: 6927642
Change-Id: I3907ac2f86d38c15b681185abee5906ce243339a

11 years agoHide effect recording UI in ICS api level.
Pin Ting [Tue, 7 Aug 2012 22:53:18 +0000 (15:53 -0700)]
Hide effect recording UI in ICS api level.

Bug:6913179
Change-Id: I76e533fa04ac35a1e5b1ee54b9e120434e96ebbf

11 years agoMerge "Move motion event related methods to class MotionEventHelper." into gb-ub...
Wu-Cheng Li [Tue, 7 Aug 2012 10:31:25 +0000 (03:31 -0700)]
Merge "Move motion event related methods to class MotionEventHelper." into gb-ub-photos-arches

11 years agoMerge "1. add interoperability ifd in exif test and 2. add some log" into gb-ub-photo...
Owen Lin [Tue, 7 Aug 2012 10:10:44 +0000 (03:10 -0700)]
Merge "1. add interoperability ifd in exif test and 2. add some log" into gb-ub-photos-arches

11 years agoMerge "Change Thumbnail test for ExifParser when there is no thumbnail or thumbnail...
Owen Lin [Tue, 7 Aug 2012 10:10:07 +0000 (03:10 -0700)]
Merge "Change Thumbnail test for ExifParser when there is no thumbnail or thumbnail's information" into gb-ub-photos-arches

11 years agoMerge "Use hex to represent unknown type and byte type for ExifParser debugging"...
Owen Lin [Tue, 7 Aug 2012 10:06:01 +0000 (03:06 -0700)]
Merge "Use hex to represent unknown type and byte type for ExifParser debugging" into gb-ub-photos-arches

11 years agoMerge "1. Use xml to record true data for ExifParserTest 2. A ExifTestRunner" into...
Owen Lin [Tue, 7 Aug 2012 10:05:28 +0000 (03:05 -0700)]
Merge "1. Use xml to record true data for ExifParserTest 2. A ExifTestRunner" into gb-ub-photos-arches

11 years agoMove motion event related methods to class MotionEventHelper.
Ahbong Chang [Tue, 7 Aug 2012 08:46:09 +0000 (16:46 +0800)]
Move motion event related methods to class MotionEventHelper.

Bug: 6943189
Change-Id: I9084cc8ebb501a5b772ed4e00bd64a3b2e8bafb3

11 years ago1. add interoperability ifd in exif test and 2. add some log
Earl Ou [Tue, 7 Aug 2012 06:43:53 +0000 (14:43 +0800)]
1. add interoperability ifd in exif test and 2. add some log

Change-Id: I888d856a17e59754d5a43b10ec8c4d30b582c503

11 years agoChange Thumbnail test for ExifParser when there is no thumbnail or thumbnail's inform...
Earl Ou [Tue, 7 Aug 2012 06:40:56 +0000 (14:40 +0800)]
Change Thumbnail test for ExifParser when there is no thumbnail or thumbnail's information

Change-Id: Iabd632612895051ee73b776616355bf5e3680d34

11 years agoUse hex to represent unknown type and byte type for ExifParser debugging
Earl Ou [Tue, 7 Aug 2012 06:33:12 +0000 (14:33 +0800)]
Use hex to represent unknown type and byte type for ExifParser debugging

Change-Id: I1d63698a34cc2c582e3c9c1a117231489ea9e3a2

11 years ago1. Use xml to record true data for ExifParserTest 2. A ExifTestRunner
Earl Ou [Mon, 6 Aug 2012 07:13:24 +0000 (15:13 +0800)]
1. Use xml to record true data for ExifParserTest 2. A ExifTestRunner

Change-Id: I6f0133a42670f5f4cbfa37a06bac41a8f6beceef

11 years agoAdd check for using SurfaceTexture when recording.
Angus Kong [Tue, 7 Aug 2012 09:15:14 +0000 (17:15 +0800)]
Add check for using SurfaceTexture when recording.

bug:6839752
Change-Id: Iafc6535fe057c7cd34264c6b104d2326e2f56a89

11 years agoDo not show photo editor before api level 14.
Yuli Huang [Mon, 6 Aug 2012 09:55:30 +0000 (17:55 +0800)]
Do not show photo editor before api level 14.

bug:6927717
Change-Id: Iab0fddaa169e03b65dd0a987ee8b5c892f971000

11 years agoAdd API check for surface texture.
Wu-cheng Li [Tue, 7 Aug 2012 07:07:42 +0000 (15:07 +0800)]
Add API check for surface texture.

bug:6927809

Change-Id: I4b08df6670337592bb0ac1c2cf1235af085e9a1d

11 years agoAdd all ExifTag constant
Earl Ou [Mon, 6 Aug 2012 10:29:41 +0000 (18:29 +0800)]
Add all ExifTag constant

Change-Id: I8a5309cdb1d216c80df9b88973a3b72a5cf9a80f

11 years agoMerge "use InstrumentationTestCase for ExifParserTest" into gb-ub-photos-arches
Owen Lin [Tue, 7 Aug 2012 02:56:21 +0000 (19:56 -0700)]
Merge "use InstrumentationTestCase for ExifParserTest" into gb-ub-photos-arches

11 years agoMerge "Remove TYPE_SUB_IFD for next() in IfdParser" into gb-ub-photos-arches
Owen Lin [Tue, 7 Aug 2012 02:56:03 +0000 (19:56 -0700)]
Merge "Remove TYPE_SUB_IFD for next() in IfdParser" into gb-ub-photos-arches

11 years agoMerge "Check number of exif tag in test" into gb-ub-photos-arches
Owen Lin [Tue, 7 Aug 2012 02:55:41 +0000 (19:55 -0700)]
Merge "Check number of exif tag in test" into gb-ub-photos-arches

11 years agoMerge "Test read thumbnail" into gb-ub-photos-arches
Owen Lin [Tue, 7 Aug 2012 02:55:33 +0000 (19:55 -0700)]
Merge "Test read thumbnail" into gb-ub-photos-arches

11 years agoMerge "fix next ifd bug in ExifParser" into gb-ub-photos-arches
Owen Lin [Tue, 7 Aug 2012 02:52:26 +0000 (19:52 -0700)]
Merge "fix next ifd bug in ExifParser" into gb-ub-photos-arches

11 years agoMerge "Fix bug when call next() after nextidf in exif parser" into gb-ub-photos-arches
Owen Lin [Tue, 7 Aug 2012 02:52:08 +0000 (19:52 -0700)]
Merge "Fix bug when call next() after nextidf in exif parser" into gb-ub-photos-arches

11 years agoMerge "Test only keep some exif tags for value" into gb-ub-photos-arches
Owen Lin [Tue, 7 Aug 2012 02:51:30 +0000 (19:51 -0700)]
Merge "Test only keep some exif tags for value" into gb-ub-photos-arches

11 years agouse InstrumentationTestCase for ExifParserTest
Earl Ou [Fri, 3 Aug 2012 06:10:46 +0000 (14:10 +0800)]
use InstrumentationTestCase for ExifParserTest

because we don't need to test Activity

Change-Id: I3d21f7f5ca05cffba3bd2cd54c5899255e1103c1

11 years agoRemove TYPE_SUB_IFD for next() in IfdParser
Earl Ou [Fri, 3 Aug 2012 05:26:35 +0000 (13:26 +0800)]
Remove TYPE_SUB_IFD for next() in IfdParser

We should not read the offset because there are
too many exception. Users should check the id of the tag
and decide how to read the block by themselves.

Change-Id: Ie3f162c5c6dc25f15107e193adc080c7b51112b5

11 years agoCheck number of exif tag in test
Earl Ou [Fri, 3 Aug 2012 04:28:17 +0000 (12:28 +0800)]
Check number of exif tag in test

Change-Id: Ic84c7c004fe0ab5fcea9a0cc6e7f9d86db61abd8

11 years agoTest read thumbnail
Earl Ou [Fri, 3 Aug 2012 04:22:56 +0000 (12:22 +0800)]
Test read thumbnail

Change-Id: I2f7add7e3c9fc6ffe8c75f191f4b0322bc3047d5

11 years agofix next ifd bug in ExifParser
Earl Ou [Fri, 3 Aug 2012 04:20:49 +0000 (12:20 +0800)]
fix next ifd bug in ExifParser

Originally if we don't read value of tag we won't get 'NEXT_IFD'

Change-Id: I235977b3b482fbc4736c244d280c384c26df6483

11 years agoFix bug when call next() after nextidf in exif parser
Earl Ou [Wed, 1 Aug 2012 10:02:07 +0000 (18:02 +0800)]
Fix bug when call next() after nextidf in exif parser

Change-Id: Ibb0204627418f8fa650ce32e798a768da7762d59

11 years agoExplicitly export content providers
Nick Kralevich [Fri, 3 Aug 2012 22:50:39 +0000 (15:50 -0700)]
Explicitly export content providers

In a future version of Android, the default value for
<provider android:exported> will change from true to false.
Explicitly set android:exported="true"

Bug: 3306452
Change-Id: Ic5d3152988ed6a576501830338ec324f056921c4

11 years agoMerge "Add logging for monkey" into gb-ub-photos-arches
Doris Liu [Fri, 3 Aug 2012 16:35:40 +0000 (09:35 -0700)]
Merge "Add logging for monkey" into gb-ub-photos-arches

11 years agoTargetApi of ShareActionProvider should be ICS.
Wu-cheng Li [Fri, 3 Aug 2012 09:02:12 +0000 (17:02 +0800)]
TargetApi of ShareActionProvider should be ICS.

bug:6706723
Change-Id: I8d82662c4bdd44f970cb93b9986208e5f4db3c31

11 years agoAdd logging for monkey
Doris Liu [Fri, 3 Aug 2012 02:29:49 +0000 (19:29 -0700)]
Add logging for monkey

 Bug: 6495745

Change-Id: Ib24ba3dd6a887259c5e6083ca5eb270a0bd4e801

11 years agoShow the correct image on a ACTION_VIEW
Mangesh Ghiware [Fri, 27 Jul 2012 22:07:21 +0000 (15:07 -0700)]
Show the correct image on a ACTION_VIEW

Bug: 6819100
Change-Id: I7c381c506fa627c3f285fb6857b77cdb770addb7

11 years agoFix typo of datetaken field.
Wu-cheng Li [Wed, 1 Aug 2012 10:31:08 +0000 (18:31 +0800)]
Fix typo of datetaken field.

Change-Id: I3d53388696101178598910d0b73444988408cbc3

11 years agoMerge "Change minSdkVersion to 11." into gb-ub-photos-arches
Wu-cheng Li [Wed, 1 Aug 2012 10:14:40 +0000 (03:14 -0700)]
Merge "Change minSdkVersion to 11." into gb-ub-photos-arches

11 years agoTest only keep some exif tags for value
Earl Ou [Wed, 1 Aug 2012 09:19:49 +0000 (17:19 +0800)]
Test only keep some exif tags for value

Change-Id: I06962ffb4e1c6844cc8c0d24b686571483f16c22

11 years agoMerge "Test skip to next ifd in ExifParserTest" into gb-ub-photos-arches
Earl Ou [Wed, 1 Aug 2012 09:21:55 +0000 (02:21 -0700)]
Merge "Test skip to next ifd in ExifParserTest" into gb-ub-photos-arches

11 years agoMerge "ExifParserTest" into gb-ub-photos-arches
Earl Ou [Wed, 1 Aug 2012 09:21:38 +0000 (02:21 -0700)]
Merge "ExifParserTest" into gb-ub-photos-arches

11 years agoMerge "Add some constants for exif tag" into gb-ub-photos-arches
Earl Ou [Wed, 1 Aug 2012 09:21:21 +0000 (02:21 -0700)]
Merge "Add some constants for exif tag" into gb-ub-photos-arches

11 years agoMerge "Fix a bug in IfdParser" into gb-ub-photos-arches
Earl Ou [Wed, 1 Aug 2012 09:21:04 +0000 (02:21 -0700)]
Merge "Fix a bug in IfdParser" into gb-ub-photos-arches

11 years agoTest skip to next ifd in ExifParserTest
Earl Ou [Wed, 1 Aug 2012 08:46:06 +0000 (16:46 +0800)]
Test skip to next ifd in ExifParserTest

Change-Id: Icc53e75d563acb304c23349c28d604d439b4b314

11 years agoExifParserTest
Earl Ou [Wed, 1 Aug 2012 08:24:44 +0000 (16:24 +0800)]
ExifParserTest

test basic parse function of ExifParser

Change-Id: I4dbe9231917c205b0cb95aab639744ce0debbec8

11 years agoDon't use Files.getContentUri in previous API levels.
Owen Lin [Tue, 31 Jul 2012 06:22:02 +0000 (14:22 +0800)]
Don't use Files.getContentUri in previous API levels.

Change-Id: I4d096734d22c93b83b2bf8082450ad0d73ade837

11 years agoMerge "Remove /mtp from TOP_SET_PATH before HC." into gb-ub-photos-arches
Owen Lin [Wed, 1 Aug 2012 08:28:08 +0000 (01:28 -0700)]
Merge "Remove /mtp from TOP_SET_PATH before HC." into gb-ub-photos-arches

11 years agoAdd some constants for exif tag
Earl Ou [Wed, 1 Aug 2012 08:23:44 +0000 (16:23 +0800)]
Add some constants for exif tag

Change-Id: I236f8187668bb144f47214b7241a873223111f9e

11 years agoFix a bug in IfdParser
Earl Ou [Wed, 1 Aug 2012 08:19:39 +0000 (16:19 +0800)]
Fix a bug in IfdParser

Originally if we call next after the last tag without read the value,
we will receive a wrong tag.

Change-Id: Ib154d112a568c593270ee6676d4954a7c26567f2

11 years agoRemove /mtp from TOP_SET_PATH before HC.
Owen Lin [Wed, 1 Aug 2012 08:14:39 +0000 (16:14 +0800)]
Remove /mtp from TOP_SET_PATH before HC.

bug: 6913061
Change-Id: Iecdb6452035b83070502977265a3e0d526ea784c

11 years agoChange minSdkVersion to 11.
Wu-cheng Li [Wed, 1 Aug 2012 07:47:08 +0000 (15:47 +0800)]
Change minSdkVersion to 11.

Change-Id: If1f4ebb2850e80c965be4e664a67eb8023376926

11 years agoMerge "Suppress the warnings in EffectRecorder" into gb-ub-photos-arches
Owen Lin [Wed, 1 Aug 2012 07:32:12 +0000 (00:32 -0700)]
Merge "Suppress the warnings in EffectRecorder" into gb-ub-photos-arches

11 years agoMerge "Handle null item in findIndexOfPathInCache." into gb-ub-photos-arches
Chih-Chung Chang [Wed, 1 Aug 2012 07:19:27 +0000 (00:19 -0700)]
Merge "Handle null item in findIndexOfPathInCache." into gb-ub-photos-arches

11 years agoHandle null item in findIndexOfPathInCache.
Chih-Chung Chang [Wed, 1 Aug 2012 06:43:35 +0000 (14:43 +0800)]
Handle null item in findIndexOfPathInCache.

Bug: 6708911
Change-Id: Ifd1e8342906a3c61d30448ea6b0085c37ccdeb03

11 years agoSuppress the warnings in EffectRecorder
Owen Lin [Wed, 1 Aug 2012 05:32:34 +0000 (13:32 +0800)]
Suppress the warnings in EffectRecorder

Change-Id: I29d8348f40c35e720ab230e2c599bf8a8ff2a953

11 years agoDo not use ShareActionProvider before API 14.
Wu-cheng Li [Thu, 19 Jul 2012 09:11:06 +0000 (17:11 +0800)]
Do not use ShareActionProvider before API 14.

Use simple share intent before API 14.

bug:6706723

Change-Id: I47930f0b81c7c8c1943054964a093967a7704bf1

11 years agoManually transform the event coordinates on older platforms.
Chih-Chung Chang [Tue, 31 Jul 2012 05:03:24 +0000 (13:03 +0800)]
Manually transform the event coordinates on older platforms.

Change-Id: I070b27112ea028f2a1596dcdfa480537765174b9

11 years agoMerge "Fix bugs 6882711 and 6836814" into gb-ub-photos-arches
Bobby Georgescu [Tue, 31 Jul 2012 17:03:22 +0000 (10:03 -0700)]
Merge "Fix bugs 6882711 and 6836814" into gb-ub-photos-arches

11 years agoAdd API check for camera metering area.
Angus Kong [Tue, 31 Jul 2012 01:50:12 +0000 (09:50 +0800)]
Add API check for camera metering area.

bug:6881073
Change-Id: I08ea3bd8e6f128e8998f4048eb451cb80c342fe5

11 years agoMerge "Check api level before invoking setHomeButtonEnabled()." into gb-ub-photos...
Ahbong Chang [Tue, 31 Jul 2012 07:52:04 +0000 (00:52 -0700)]
Merge "Check api level before invoking setHomeButtonEnabled()." into gb-ub-photos-arches

11 years agoMerge "Fix some lint warnings in Gallery." into gb-ub-photos-arches
Owen Lin [Tue, 31 Jul 2012 07:36:10 +0000 (00:36 -0700)]
Merge "Fix some lint warnings in Gallery." into gb-ub-photos-arches

11 years agoCheck api level before invoking setHomeButtonEnabled().
Ahbong Chang [Tue, 31 Jul 2012 03:13:29 +0000 (11:13 +0800)]
Check api level before invoking setHomeButtonEnabled().

Bug: 6706785
Change-Id: I2ad4d4961705c38a4d1047732f45dc9c69580782

11 years agoMerge "Don't use QUALITY_xxxP and hasProfile prior to API level 11." into gb-ub-photo...
Pin Ting [Tue, 31 Jul 2012 04:39:26 +0000 (21:39 -0700)]
Merge "Don't use QUALITY_xxxP and hasProfile prior to API level 11." into gb-ub-photos-arches

11 years agoMerge "Fix Gallery2Tests Build" into gb-ub-photos-arches
Earl Ou [Tue, 31 Jul 2012 02:21:34 +0000 (19:21 -0700)]
Merge "Fix Gallery2Tests Build" into gb-ub-photos-arches

11 years agoFix Gallery2Tests Build
Earl Ou [Tue, 31 Jul 2012 00:50:59 +0000 (08:50 +0800)]
Fix Gallery2Tests Build

Remove dependancy of android-test-runner in Android.mk
Also LOCAL_SDK_VERSION is needed in Android.mk for unbundle-branches
to avoid hiden api

Change-Id: I38cef8261aab264fe5a109ca5a6857eee3dff11b

11 years agoDon't use QUALITY_xxxP and hasProfile prior to API level 11.
Pin Ting [Mon, 30 Jul 2012 23:11:24 +0000 (16:11 -0700)]
Don't use QUALITY_xxxP and hasProfile prior to API level 11.

Bug:6900688
Change-Id: I4b852a3727e46a9bd3ebb55c726e64519f9c2092

11 years agoFix bugs 6882711 and 6836814
Bobby Georgescu [Mon, 30 Jul 2012 18:12:58 +0000 (11:12 -0700)]
Fix bugs 6882711 and 6836814

 Bug: 6882711
 Bug: 6836814

 A number of issues surrounding the behavior after deleting
 the last photo from the camera roll within the Camera app,
 including occasional black screen & incorrectly persistent
 action bar.

Change-Id: Ib5f41a78c613da90bb844aab2d40f45e314d3ee3

11 years agoMerge "Remove dependency on android.widget.Switch." into gb-ub-photos-arches
Pin Ting [Mon, 30 Jul 2012 17:24:48 +0000 (10:24 -0700)]
Merge "Remove dependency on android.widget.Switch." into gb-ub-photos-arches

11 years agoDon't call Action.setLogo and Action.setHomeButtonEnabled in old API levels.
Owen Lin [Fri, 27 Jul 2012 03:46:50 +0000 (11:46 +0800)]
Don't call Action.setLogo and Action.setHomeButtonEnabled in old API levels.

bug: 6706724
bug: 6706785

Change-Id: I09e48b8a042c5ce84442dddaf4e4bdfd1960ec4f

11 years agoFix some lint warnings in Gallery.
Owen Lin [Thu, 26 Jul 2012 09:16:47 +0000 (17:16 +0800)]
Fix some lint warnings in Gallery.

1. Implement our own openPipeHelper
2. Add @TargetApi to TileImageViewAdapter

Change-Id: I74dca78c4c4f18e0f782afad02d5ba9b410a503e

11 years agoMerge "Code clean up." into gb-ub-photos-arches
Ahbong Chang [Mon, 30 Jul 2012 06:31:17 +0000 (23:31 -0700)]
Merge "Code clean up." into gb-ub-photos-arches

11 years agoMerge "Low-level exif parser" into gb-ub-photos-arches
Earl Ou [Mon, 30 Jul 2012 03:59:17 +0000 (20:59 -0700)]
Merge "Low-level exif parser" into gb-ub-photos-arches

11 years agoCode clean up.
Ahbong Chang [Mon, 30 Jul 2012 03:34:13 +0000 (11:34 +0800)]
Code clean up.

Remove unused imports.
Remove unused fields.
Remove unnecessary cast.
Add missing override annotations.

Change-Id: Idad2e587697a5015eb5363d7b71fab9de9cc8ffb

11 years agoLow-level exif parser
Earl Ou [Tue, 24 Jul 2012 09:54:09 +0000 (17:54 +0800)]
Low-level exif parser

Change-Id: I592184c79320d08a3cb871a63ea33742071876e3

11 years agoRemove dependency on android.widget.Switch.
Pin Ting [Thu, 26 Jul 2012 20:31:11 +0000 (13:31 -0700)]
Remove dependency on android.widget.Switch.

Bug:6706782

Change-Id: I9a86f9fbcb45c9def18f325e95ef6cfcd63edaff

11 years agoUse actual selection for album/photo details
Michael Kolb [Fri, 20 Jul 2012 19:23:09 +0000 (12:23 -0700)]
Use actual selection for album/photo details

  Bug: 6533154

Change-Id: I21ce95d79567396840f08095b986ecc54263a295

11 years agoMerge "Add @TargetApi for all Mtp related code." into gb-ub-photos-arches
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

11 years agoMerge "Add check for camera focus/metering area." 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

11 years agoMerge "Only give haptic feedback when enabled in system settings" into gb-ub-photos...
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

11 years agoAdd check for camera focus/metering area.
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

11 years agoMerge "Rename to HAS_ZOOM_WHEN_RECORDING." into gb-ub-photos-arches
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

11 years agoRename to HAS_ZOOM_WHEN_RECORDING.
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

11 years agoFix for monkey-generated NPE in PhotoView from bug 6848371
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

11 years agoOnly give haptic feedback when enabled in system settings
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

11 years agoAdd @TargetApi for all Mtp related code.
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

11 years agoUse our own OverScroller for backward compatibility.
Owen Lin [Tue, 24 Jul 2012 07:34:20 +0000 (15:34 +0800)]
Use our own OverScroller for backward compatibility.

Change-Id: Ibcf48a638ab716116d1ce2ff8c2686741ca0a996

11 years agoAvoid using class defined in API level 14.
Owen Lin [Tue, 24 Jul 2012 06:34:07 +0000 (14:34 +0800)]
Avoid using class defined in API level 14.

Change-Id: Ia6385f98b048292de70c6e8aa628a2e6fc629485

11 years agoMerge "Fixed x86 build" into gb-ub-photos-arches
Andrew Hsieh [Mon, 23 Jul 2012 17:10:11 +0000 (10:10 -0700)]
Merge "Fixed x86 build" into gb-ub-photos-arches

11 years agoFixed x86 build
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

11 years agoFix crash on launch for tablet devices.
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

11 years agoUpdate gallery launcher icons.
Wu-cheng Li [Fri, 20 Jul 2012 11:23:57 +0000 (19:23 +0800)]
Update gallery launcher icons.

bug:6845667
Change-Id: I4f3b87415bb9786732fff375afd8eccaeb7ef1d8

11 years agoMerge "Do not use listPreferredItemHeightSmall before API 14." into gb-ub-photos...
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

11 years agoDo not use listPreferredItemHeightSmall before API 14.
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

11 years agoAdd check for camcorder zoom.
Angus Kong [Fri, 20 Jul 2012 07:59:50 +0000 (15:59 +0800)]
Add check for camcorder zoom.

bug:6838676
Change-Id: I9aeda27cf55ded444841ade40ea1eb1b91da01cb

11 years agoOnly make time lapse recording available on and after Honeycomb.
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