OSDN Git Service
The Android Open Source Project [Wed, 22 Aug 2012 22:36:16 +0000 (15:36 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ie28d5e0cd9d4f28edd7d13db377bf79979a27804
The Android Automerger [Wed, 22 Aug 2012 13:34:14 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Wu-Cheng Li [Wed, 22 Aug 2012 08:49:51 +0000 (01:49 -0700)]
Merge "Do not use Theme.Holo and Theme.Holo.Dialog on gingerbread." into gb-ub-photos-arches
Ahbong Chang [Tue, 21 Aug 2012 06:06:51 +0000 (14:06 +0800)]
Do not use Theme.Holo and Theme.Holo.Dialog on gingerbread.
Bug:
6982707
Change-Id: I84726bcd6cefcc3bd0f313306163a3d80d9cdade
Wu-cheng Li [Wed, 22 Aug 2012 07:43:56 +0000 (00:43 -0700)]
Merge "Add API check for view transformation properties." into gb-ub-photos-arches
Wu-cheng Li [Wed, 22 Aug 2012 07:31:01 +0000 (15:31 +0800)]
Add API check for view transformation properties.
Ex: View.setTranslationX, View.setPivotX, etc.
bug:
6982696
Change-Id: Ib9fc5f3d7c83d99ced47dcd79dfee430d7ad67c8
Yuli Huang [Wed, 22 Aug 2012 06:29:18 +0000 (23:29 -0700)]
Merge "Dismiss dialog in onPause() where we still have the window." into gb-ub-photos-arches
The Android Open Source Project [Tue, 21 Aug 2012 23:06:52 +0000 (16:06 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I2862f79047727bcf7d5bca5ba5f99b1cc820043d
Baligh Uddin [Tue, 21 Aug 2012 19:28:29 +0000 (12:28 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Bobby Georgescu [Tue, 21 Aug 2012 18:30:06 +0000 (11:30 -0700)]
Merge "Improvements in animation from album page to photo page" into gb-ub-photos-arches
Bobby Georgescu [Mon, 20 Aug 2012 23:26:26 +0000 (16:26 -0700)]
Improvements in animation from album page to photo page
Bug:
6631829
Bug:
6979922
Change-Id: I99fd330f3ec8bf363f8602a2f893167ca2a9c71b
Baligh Uddin [Tue, 21 Aug 2012 16:48:43 +0000 (09:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I480220fd3cdfc17f37ecd73179e4e827f2f6effa
Auto-generated-cl: translation import
The Android Automerger [Tue, 21 Aug 2012 13:34:52 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Yuli Huang [Tue, 21 Aug 2012 08:39:50 +0000 (16:39 +0800)]
Dismiss dialog in onPause() where we still have the window.
bug:
6561957
Change-Id: I652c4ec1dd64c650c29f3e4e36ae1200da691694
Wu-cheng Li [Tue, 21 Aug 2012 08:04:20 +0000 (01:04 -0700)]
Merge "Add an API check for starting preview in Jpeg callback." into gb-ub-photos-arches
Hung-ying Tyan [Tue, 21 Aug 2012 07:21:00 +0000 (00:21 -0700)]
Merge "Move ThreadPool to gallerycommon for picasasync and picasastore." into gb-ub-photos-arches
Wu-cheng Li [Tue, 21 Aug 2012 07:05:17 +0000 (15:05 +0800)]
Add an API check for starting preview in Jpeg callback.
The CTS was added in ICS.
8fe4f547c45
bug:
6996830
Change-Id: I89a5ef4f542b4c5d75da042fe1e6e481a5fe5c89
Ahbong Chang [Mon, 20 Aug 2012 09:35:08 +0000 (17:35 +0800)]
Do not use android:attr/dividerHorizontal.
And copy the specific drawables from the framework.
Bug:
7016227
Change-Id: Ie0ac3cad351aac1974b964f6690856cd344fb27f
Hung-ying Tyan [Tue, 21 Aug 2012 05:02:43 +0000 (13:02 +0800)]
Move ThreadPool to gallerycommon for picasasync and picasastore.
Bug:
7005321
Change-Id: I7ae4bafed141be03bca74772a261c7c2fb3036c4
Baligh Uddin [Mon, 20 Aug 2012 15:35:02 +0000 (08:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I958d1958822bc3c608ae3d16f7e0ade0bb156e93
Auto-generated-cl: translation import
The Android Automerger [Mon, 20 Aug 2012 13:35:29 +0000 (06:35 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Wu-cheng Li [Sun, 19 Aug 2012 09:04:02 +0000 (17:04 +0800)]
Rotate the camera screen nail correctly in gingerbread.
In gingerbread, camera screen nail is a static image.
Handle its rotation like a bitmap screen nail.
bug:
6927809
Change-Id: I554483e58fc9e32399acb20f426d7ec35631b7ac
Ahbong Chang [Mon, 20 Aug 2012 03:51:55 +0000 (11:51 +0800)]
Divider and cancel button now show in the dialog picker.
The root node of the included gl_root_group is "merge", whose attributes
can not be overriden by any "include" tag since it will be dropped.
All of the children inside gl_root_group have no weight. This makes
the first object occupy the whole space. We use a weighted frame layout
to wrap gl_root_group.
Bug:
7016213
Change-Id: I758806848f6af3eff2f7746c6ef949ce639c7f6e
George Mount [Thu, 16 Aug 2012 18:06:42 +0000 (11:06 -0700)]
Clear activity result when launching from lock screen.
Bug
6710029
When the screen is locked during video play, the activity result
from that play will be triggered immediately when unlocking to
camera. The result must be destroyed on unlock so that the resume
goes to the camera rather than to the video display.
Change-Id: Ifa6f00fa1cba119d5fc6e762d1757bd6aac576f4
Baligh Uddin [Fri, 17 Aug 2012 17:09:29 +0000 (10:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I68a4bea7aa4cd7720cca2c2b45fbf8a37121d8cd
Auto-generated-cl: translation import
Owen Lin [Fri, 17 Aug 2012 07:28:22 +0000 (15:28 +0800)]
Fix NPE when view a single photo.
bug:
6995776
Change-Id: Iba213dfefcab04f2c856f55dc3446e3314f30a6f
Owen Lin [Fri, 17 Aug 2012 04:44:23 +0000 (21:44 -0700)]
Merge "Load AsyncTask class in UI thread." into gb-ub-photos-arches
Bobby Georgescu [Fri, 17 Aug 2012 03:02:42 +0000 (20:02 -0700)]
Merge "Revert Gallery ActionBar theme change pending UX input" into gb-ub-photos-arches
Owen Lin [Thu, 16 Aug 2012 09:17:52 +0000 (17:17 +0800)]
Load AsyncTask class in UI thread.
bug:
7005321
Change-Id: I4f8806553aee34fb2ebeaef010c14c88679a7f72
The Android Open Source Project [Fri, 17 Aug 2012 02:11:05 +0000 (19:11 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I149dfaf17bb62bf665598dfd43ccffdaa5699d5e
Bobby Georgescu [Thu, 16 Aug 2012 23:30:57 +0000 (16:30 -0700)]
Revert Gallery ActionBar theme change pending UX input
Bug:
6996822
Change-Id: I984864101013ade438b97f36c3ac168260d9bb80
Baligh Uddin [Thu, 16 Aug 2012 19:44:18 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iec65ab66d059dab9d58032ae84ec2302742a0a5b
Auto-generated-cl: translation import
Doris Liu [Thu, 16 Aug 2012 16:54:02 +0000 (09:54 -0700)]
Merge "More on content description for photo editor butns" into gb-ub-photos-arches
The Android Automerger [Thu, 16 Aug 2012 13:34:28 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Owen Lin [Thu, 16 Aug 2012 07:18:46 +0000 (00:18 -0700)]
Merge "Fix some bugs introduced by the ActionBarWrapper." into gb-ub-photos-arches
Doris Liu [Thu, 16 Aug 2012 07:15:59 +0000 (00:15 -0700)]
More on content description for photo editor butns
Incorporated Yuli's suggestions on the naming of some of the photo effects buttons.
Change-Id: Iec5f50f7537d12b9a77f65ee76f758642b2b2838
Owen Lin [Thu, 16 Aug 2012 03:28:58 +0000 (11:28 +0800)]
Fix some bugs introduced by the ActionBarWrapper.
bug:
6927267
Change-Id: If05082a4fec25f93d38c6096ebacc5a82e7e7c2e
Ahbong Chang [Thu, 16 Aug 2012 06:04:40 +0000 (14:04 +0800)]
Check if actionbar exists at ActionBarUtils.getActionBar().
Bug:
6927267
Change-Id: I85645f25879ced48a85a2bef4f55f1c34b8806ec
Baligh Uddin [Wed, 15 Aug 2012 21:14:34 +0000 (14:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie5b5a5aefade4c45e3270fddbaced7b30ea6cc08
Auto-generated-cl: translation import
Doris Liu [Wed, 15 Aug 2012 17:21:03 +0000 (10:21 -0700)]
Adding content description to effect buttons
This CL adds content description/accessiblity label to the special effects buttons in photo editor.
Bug:
6676889
Change-Id: I5446c95b5ec6a1084d82feb102e11b3b722254d1
The Android Open Source Project [Wed, 15 Aug 2012 15:28:26 +0000 (08:28 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: If4e80006b1f802a7bca33bb10253f09c2b10ac73
The Android Automerger [Wed, 15 Aug 2012 13:34:50 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Owen Lin [Wed, 15 Aug 2012 09:10:19 +0000 (02:10 -0700)]
Merge "Add SimpleMenuXXX implementation for the Gingerbread platform." into gb-ub-photos-arches
Owen Lin [Wed, 15 Aug 2012 09:10:14 +0000 (02:10 -0700)]
Merge "Extract the action bar interface." into gb-ub-photos-arches
Owen Lin [Tue, 17 Jul 2012 08:50:31 +0000 (16:50 +0800)]
Add SimpleMenuXXX implementation for the Gingerbread platform.
1. Add a SimpleMenuInflator to parse the res/menu/xxx.xml files.
2. Add minimal code to show the menu.
**NOTE**
This change is going to be replaced by the ActionBar compat library
when it gets ready and integrated. The purpose of this change is making
Gallery/Camera run on GB.
Change-Id: Ia7d402c82a6da1b9558ebbd103e161d2471b34dd
Owen Lin [Fri, 13 Jul 2012 09:23:05 +0000 (17:23 +0800)]
Extract the action bar interface.
So that we can use different implementation for different API levels.
**NOTE**
This change is going to be replaced by the ActionBar compat library
when it gets ready. The purpose of this change is making Gallery/Camera
run on GB.
bug:
6927267
Change-Id: Ic8bb2518918168ea889db6452d6760de390d96b2
Owen Lin [Wed, 15 Aug 2012 06:29:26 +0000 (23:29 -0700)]
Merge "A simple ExifReader and its test" into gb-ub-photos-arches
Earl Ou [Thu, 9 Aug 2012 06:17:33 +0000 (14:17 +0800)]
A simple ExifReader and its test
Change-Id: I1a30d24591bbdab288e04e3705ece388b533f247
Bobby Georgescu [Tue, 14 Aug 2012 20:32:46 +0000 (13:32 -0700)]
Merge "Gallery reskin: album list spacing, action bar theme" into gb-ub-photos-arches
Bobby Georgescu [Mon, 13 Aug 2012 21:27:08 +0000 (14:27 -0700)]
Gallery reskin: album list spacing, action bar theme
Change-Id: Ic556f22bd25c57ddd0b659a7f43a7a1afbdcb8df
Ying Wang [Tue, 14 Aug 2012 17:33:44 +0000 (10:33 -0700)]
Retire LOCAL_NDK_VERSION.
Bug:
6932421
Change-Id: I9e5e8fba22ac235701c002e27012bb3954896140
The Android Automerger [Tue, 14 Aug 2012 14:07:47 +0000 (07:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Wu-cheng Li [Tue, 14 Aug 2012 08:21:00 +0000 (16:21 +0800)]
Rename ThemeCamera to Theme.Camera to be consistent.
bug:
6982707
Change-Id: Ic82f542ee8aafdf6c49344887459e75303ca5df8
Wu-cheng Li [Tue, 14 Aug 2012 05:02:40 +0000 (22:02 -0700)]
Merge "Make a copy of MotionEvent in MotionEventHelper.transform." into gb-ub-photos-arches
Owen Lin [Tue, 14 Aug 2012 04:08:17 +0000 (21:08 -0700)]
Merge "Remove the previewImage and staticWallpaperPreview." into gb-ub-photos-arches
Owen Lin [Mon, 13 Aug 2012 07:34:59 +0000 (15:34 +0800)]
Remove the previewImage and staticWallpaperPreview.
Change-Id: I804ea494efdcca5fa70944f29e92c5f022f622c1
fix:
6974862
Owen Lin [Tue, 14 Aug 2012 03:49:31 +0000 (20:49 -0700)]
Merge "Extract EXIF info only for JPEG files" into gb-ub-photos-arches
Bobby Georgescu [Mon, 13 Aug 2012 20:30:02 +0000 (13:30 -0700)]
Show album counts in Gallery & other small reskin fixes
Bug:
6975144
Change-Id: I2f12c6482cc009aecbca3e26482ebd8944f01bb8
Bobby Georgescu [Mon, 13 Aug 2012 18:01:10 +0000 (11:01 -0700)]
Fix white viewfinder flash introduced by Gallery UI reskin
Bug:
6974088
Change-Id: Id6269fdbe4b5cf0d5befee800ff3c57c3b501448
The Android Automerger [Mon, 13 Aug 2012 15:09:56 +0000 (08:09 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Wu-cheng Li [Mon, 13 Aug 2012 09:31:22 +0000 (17:31 +0800)]
Make a copy of MotionEvent in MotionEventHelper.transform.
RotateLayout transforms the event in dispatchTouchEvent.
If the event is not handled, the parent of RotateLayout
may send the transformed event to other views and the
coordinates will be wrong. Make a copy of MotionEvent in
transform. This also makes the behavior consistent in
different API levels.
bug:
6974916
Change-Id: Id835767cc9be3f244e5abe2b855e5188045adedc
Owen Lin [Thu, 9 Aug 2012 10:22:40 +0000 (18:22 +0800)]
Extract EXIF info only for JPEG files
bug:
6489840
Change-Id: I0ad682bffa5374d0d61ebaa502cc8b90e469b4c8
Bobby Georgescu [Fri, 10 Aug 2012 17:45:55 +0000 (10:45 -0700)]
Merge "First gallery reskin iteration." into gb-ub-photos-arches
The Android Open Source Project [Fri, 10 Aug 2012 15:53:39 +0000 (08:53 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I970a76de7ddcd1ac415dff3eee35e7de33675c19
Wu-cheng Li [Fri, 10 Aug 2012 09:10:15 +0000 (02:10 -0700)]
Merge "Guard android.media.effect.Effect with TargetApi." into gb-ub-photos-arches
Wu-cheng Li [Fri, 10 Aug 2012 08:25:09 +0000 (01:25 -0700)]
Merge "Guard SurfaceTextureScreenNail with TargetApi." into gb-ub-photos-arches
Owen Lin [Fri, 10 Aug 2012 08:22:32 +0000 (01:22 -0700)]
Merge "Check if the ExifParser paser every part in the test" into gb-ub-photos-arches
Owen Lin [Fri, 10 Aug 2012 08:22:12 +0000 (01:22 -0700)]
Merge "Fix ExifParser bug when APP0 exists in Jpeg file" into gb-ub-photos-arches
Owen Lin [Fri, 10 Aug 2012 08:20:03 +0000 (01:20 -0700)]
Merge "ignore uncompressed thumbnail when test exif thumbnail" into gb-ub-photos-arches
Owen Lin [Fri, 10 Aug 2012 08:17:00 +0000 (01:17 -0700)]
Merge "Handle error when string length=0 in IfdParser" into gb-ub-photos-arches
Wu-cheng Li [Fri, 10 Aug 2012 08:03:23 +0000 (16:03 +0800)]
Guard SurfaceTextureScreenNail with TargetApi.
bug:
6927809
Change-Id: If03ffbcbf908a960f00bba97be0cdbf317ecabe8
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
Bobby Georgescu [Wed, 8 Aug 2012 23:33:28 +0000 (16:33 -0700)]
First gallery reskin iteration.
Change-Id: I2b79ca9f40346a777141562c9a4762d7a8b460f6
The Android Automerger [Thu, 9 Aug 2012 16:29:57 +0000 (09:29 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Bobby Georgescu [Thu, 9 Aug 2012 05:20:53 +0000 (22:20 -0700)]
Merge "Hold WakeLock during MTP import" 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
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
The Android Open Source Project [Wed, 8 Aug 2012 15:17:54 +0000 (08:17 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I27aa18fe1f65a6c91d030dbae65c185c9b1680aa
The Android Automerger [Wed, 8 Aug 2012 13:47:51 +0000 (06:47 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Owen Lin [Wed, 8 Aug 2012 10:47:33 +0000 (18:47 +0800)]
Rotate the texture in building PhotoFallbackEffect
bug:
6525127
Change-Id: Iba348450b62190a1a2149cf0d7f20f19625cb6cf
Wu-cheng Li [Wed, 8 Aug 2012 09:19:51 +0000 (17:19 +0800)]
Change minSdkVersion to 10.
bug:
6927809
Change-Id: I6dcea54d3204bca71975a2600ee704a7161bf0bc
Earl Ou [Tue, 7 Aug 2012 12:12:42 +0000 (20:12 +0800)]
Check if the ExifParser paser every part in the test
Change-Id: I1c58dfbbf74ada1d7f3d629ace4851d5022170f6
Earl Ou [Tue, 7 Aug 2012 11:15:31 +0000 (19:15 +0800)]
Fix ExifParser bug when APP0 exists in Jpeg file
Change-Id: If5843757e00bc12bc50003eef3d78b9c3cedf69e
Earl Ou [Wed, 8 Aug 2012 07:20:01 +0000 (15:20 +0800)]
ignore uncompressed thumbnail when test exif thumbnail
Change-Id: I32baae44994f3b113405082f55539e1a2a3db8bb
Earl Ou [Wed, 8 Aug 2012 07:19:13 +0000 (15:19 +0800)]
Handle error when string length=0 in IfdParser
Change-Id: I3a51e85060f3acd5026555e5f8d21f8cb2e0641e
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
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
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
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
The Android Open Source Project [Tue, 7 Aug 2012 18:04:42 +0000 (11:04 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I32a5c466b503dd385266bdad3f4f003140a8df6c
The Android Automerger [Tue, 7 Aug 2012 13:34:56 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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
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
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
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
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
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
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
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
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
OSDN Git Service
