OSDN Git Service
Andy Huibers [Wed, 30 Oct 2013 00:40:33 +0000 (17:40 -0700)]
am
cec75e40: Fix rotation bug for animated thumbnail shown after capture.
* commit '
cec75e408a2d451b90bac5f06e10906ffcafff33':
Fix rotation bug for animated thumbnail shown after capture.
Andy Huibers [Tue, 29 Oct 2013 23:03:58 +0000 (16:03 -0700)]
Fix rotation bug for animated thumbnail shown after capture.
Bug:
11420737
Change-Id: I55b90137b362d0b3b98aba34114537e0f6107b8c
Doris Liu [Tue, 29 Oct 2013 00:28:46 +0000 (17:28 -0700)]
am
af714f9e: Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad
* commit '
af714f9ec3264211cb00139ffe0f05d55085ffc2':
Fix the mapping between preview UI and camera sensor
Doris Liu [Tue, 29 Oct 2013 00:27:08 +0000 (00:27 +0000)]
Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad
ztenghui [Mon, 28 Oct 2013 22:57:58 +0000 (15:57 -0700)]
am
e546d48b: Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad
* commit '
e546d48b4acfbf2441b685b2c7d6a4e14241f34b':
Fix crash when trying to reopen the camera.
ztenghui [Mon, 28 Oct 2013 22:57:00 +0000 (22:57 +0000)]
Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad
ztenghui [Mon, 28 Oct 2013 22:27:02 +0000 (15:27 -0700)]
Fix crash when trying to reopen the camera.
In this case, another app is using the Camera, such that the camera.open will
hit an exception. We should show an dialog here.
bug:
11258139
Change-Id: I0bd2d05fe4d4d9c5e4b87b39f3ef48910cfb7111
Doris Liu [Mon, 28 Oct 2013 21:44:24 +0000 (14:44 -0700)]
Fix the mapping between preview UI and camera sensor
Bug:
11409659
Change-Id: I46ae3d7797590d59befbdc394d5304f14a212a80
Ruben Brunk [Mon, 28 Oct 2013 18:45:51 +0000 (11:45 -0700)]
am
0a64e00e: Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad
* commit '
0a64e00e88514ae07c3514e19126c166dda0ca82':
gcam: Add placeholder image.
Ruben Brunk [Mon, 28 Oct 2013 18:44:08 +0000 (18:44 +0000)]
Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad
Ruben Brunk [Thu, 17 Oct 2013 22:41:44 +0000 (15:41 -0700)]
gcam: Add placeholder image.
Bug:
11050749
Change-Id: I374c5919d6da0609fccd21c09775fa91894d5a24
ztenghui [Mon, 28 Oct 2013 18:11:24 +0000 (11:11 -0700)]
am
5250fb28: Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad
* commit '
5250fb28143d45c41673a572b4c5b350e6563eb0':
Fix memory leak due to inner class for handler.
Doris Liu [Mon, 28 Oct 2013 18:11:23 +0000 (11:11 -0700)]
am
d053a5b2: Update aspect ratio when preview aspect ratio changes
* commit '
d053a5b2aa8cd9cb09bd40962b305ef34e7d404b':
Update aspect ratio when preview aspect ratio changes
ztenghui [Mon, 28 Oct 2013 18:09:51 +0000 (18:09 +0000)]
Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad
ztenghui [Fri, 25 Oct 2013 21:56:32 +0000 (14:56 -0700)]
Fix memory leak due to inner class for handler.
To keep the existing interface, we just overwrite the handler here.
bug:
11336965
Change-Id: I77b2f577279244439ee9f81344f47bf5773e527b
Doris Liu [Sat, 26 Oct 2013 03:20:43 +0000 (20:20 -0700)]
Update aspect ratio when preview aspect ratio changes
Bug:
11250125
Change-Id: If4047860f056cd81bf7d74045a68f5c0b85ad067
Doris Liu [Sat, 26 Oct 2013 01:11:06 +0000 (18:11 -0700)]
am
5737b932: Fix skipped hide review layout calls
* commit '
5737b93254f451859c7924792c46354d385da946':
Fix skipped hide review layout calls
Doris Liu [Fri, 25 Oct 2013 20:38:54 +0000 (13:38 -0700)]
Fix skipped hide review layout calls
Bug:
11338381
Change-Id: I39c9541638f3e8c2a2f96ae4b1be7692a6db0e1c
Baligh Uddin [Tue, 22 Oct 2013 19:55:17 +0000 (19:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Sascha Haeberling [Mon, 21 Oct 2013 20:52:07 +0000 (13:52 -0700)]
am
156ea57c: Merge "Bump version number for MR1" into gb-ub-photos-carlsbad
* commit '
156ea57cd76cc96c507e3ded946cc9ce48647153':
Bump version number for MR1
Sascha Haeberling [Mon, 21 Oct 2013 20:50:13 +0000 (20:50 +0000)]
Merge "Bump version number for MR1" into gb-ub-photos-carlsbad
Sascha Haeberling [Mon, 21 Oct 2013 20:33:28 +0000 (13:33 -0700)]
Bump version number for MR1
Bug:
11240056
Change-Id: Ia3ad9f86516eed5ca60e8707d53139d54e3ee562
Erin Dahlgren [Mon, 21 Oct 2013 20:49:00 +0000 (13:49 -0700)]
am
65e2389b: Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad
* commit '
65e2389b3de5992c49732d95902e6e742e44821b':
Update preview controls on deleting all items.
Erin Dahlgren [Mon, 21 Oct 2013 20:47:33 +0000 (20:47 +0000)]
Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad
Erin Dahlgren [Mon, 21 Oct 2013 17:08:54 +0000 (10:08 -0700)]
Update preview controls on deleting all items.
Bug:
11219537
Change-Id: I897b65bd7c594b904aa29462e056a10d0e9c52a2
ztenghui [Mon, 21 Oct 2013 20:29:37 +0000 (13:29 -0700)]
am
68c1c1e0: The initial focus value should be true.
* commit '
68c1c1e02143e3d2c2dbc658645a3a981f58cdd5':
The initial focus value should be true.
ztenghui [Mon, 21 Oct 2013 20:29:37 +0000 (13:29 -0700)]
am
56e44af2: Don\'t call onCurrentDataChanged for CameraPreview when reloading.
* commit '
56e44af257d65d730f04d1e90c87f5674abd7f26':
Don't call onCurrentDataChanged for CameraPreview when reloading.
Baligh Uddin [Mon, 21 Oct 2013 18:29:15 +0000 (11:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6731c0dc80337184cc87329ca824164899563b5f
Auto-generated-cl: translation import
ztenghui [Mon, 21 Oct 2013 17:33:40 +0000 (10:33 -0700)]
The initial focus value should be true.
Every time when we enter the wide angel (SRI) module, the preview should be
in focus.
bug:
11234723
Change-Id: I218573946609f1e0e4415621a71b96a20775237d
ztenghui [Tue, 15 Oct 2013 22:31:00 +0000 (15:31 -0700)]
Don't call onCurrentDataChanged for CameraPreview when reloading.
In this case, camera preview didn't change, so there is no need to call
onCurrentDataChanged.
bug:
11237255
Change-Id: I788a2ee4e7337721d0bbd6aa75e7da6d382bf282
Doris Liu [Sat, 19 Oct 2013 00:42:29 +0000 (17:42 -0700)]
am
891a8075: Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad
* commit '
891a80756166a8621f063c727000c9a943cf5465':
Fix SRI orientation on manta
Doris Liu [Sat, 19 Oct 2013 00:39:54 +0000 (00:39 +0000)]
Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad
Doris Liu [Sat, 19 Oct 2013 00:15:30 +0000 (17:15 -0700)]
Fix SRI orientation on manta
Bug:
11292213
Change-Id: I7977de4c5bb906eec5431e706e28118837a682e7
Sascha Haeberling [Fri, 18 Oct 2013 18:44:40 +0000 (11:44 -0700)]
am
464f2201: Don\'t crash when preview surface could not be set.
* commit '
464f22013750a416f9fc9a1e32007576d0b655d6':
Don't crash when preview surface could not be set.
Sascha Haeberling [Thu, 17 Oct 2013 22:29:38 +0000 (15:29 -0700)]
Don't crash when preview surface could not be set.
Bug:
11021188
Change-Id: Idfc1cf5c50ac1f3f46956079c3231cbdda32e1a4
Sascha Haeberling [Thu, 17 Oct 2013 21:10:24 +0000 (14:10 -0700)]
am
f302a391: Update HDR/HDR+ arc menu hover messages.
* commit '
f302a391dfcb435660e18d3111c4e1a618c0cf6e':
Update HDR/HDR+ arc menu hover messages.
Sascha Haeberling [Thu, 17 Oct 2013 20:51:23 +0000 (13:51 -0700)]
Update HDR/HDR+ arc menu hover messages.
Bug :
11185194
Change-Id: Ie26e9a225dffa0a8ccd9e99fff3d7264b079ac62
Doris Liu [Thu, 17 Oct 2013 17:49:23 +0000 (10:49 -0700)]
am
8470cae9: Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad
* commit '
8470cae9049959ee6bb28cde1c53185f2ffd10a1':
Show a preview cover until real preview is ready
Doris Liu [Thu, 17 Oct 2013 17:46:48 +0000 (17:46 +0000)]
Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad
ztenghui [Thu, 17 Oct 2013 17:43:17 +0000 (10:43 -0700)]
am
f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad
* commit '
f149ec53a0fa3330617ce01751964662d3273c88':
Don't allow swipe into the film strip view when swipe is disabled
ztenghui [Thu, 17 Oct 2013 17:40:20 +0000 (17:40 +0000)]
Merge "Don't allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 17 Oct 2013 17:19:04 +0000 (10:19 -0700)]
am
270b64e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
270b64e950ce8bfd137398df83e8fcb2f9b0ce4d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:16:59 +0000 (17:16 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 17 Oct 2013 15:19:10 +0000 (15:19 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 17 Oct 2013 07:28:18 +0000 (00:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I50a68a5ff367a08ae06bd84c83e1035b9fb0bdd5
Auto-generated-cl: translation import
Baligh Uddin [Thu, 17 Oct 2013 07:27:38 +0000 (00:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie510117ceb7dacad642d2fb87c81aa3aa0ff3e89
Auto-generated-cl: translation import
Ed Heyl [Thu, 17 Oct 2013 00:45:03 +0000 (17:45 -0700)]
merge in klp-release (no-op)
ztenghui [Wed, 16 Oct 2013 23:32:59 +0000 (16:32 -0700)]
am
9db92826: Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad
* commit '
9db9282667d9e272702cd2ee32d7415204084530':
Send an message to decouple the gcam module change.
ztenghui [Wed, 16 Oct 2013 23:10:39 +0000 (23:10 +0000)]
Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad
ztenghui [Wed, 16 Oct 2013 21:43:26 +0000 (14:43 -0700)]
Send an message to decouple the gcam module change.
In this particular case, we try to enter GCam module directly which cause the
mCameraDevice to become null for photo module.
Therefore we post a message to switch into GCam to make sure current mode
switch complete first.
bug:
11252237
Change-Id: Ibd33815e7bee74425faa758247e1dec85a2f17cb
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:13:53 +0000 (15:13 -0700)]
am
66f39483: Merge "update camera launcher icon" into gb-ub-photos-carlsbad
* commit '
66f3948315b6bf851dcd5d618d96d6fcda49f159':
update camera launcher icon
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:11:27 +0000 (22:11 +0000)]
Merge "update camera launcher icon" into gb-ub-photos-carlsbad
Doris Liu [Wed, 16 Oct 2013 21:59:36 +0000 (14:59 -0700)]
am
7bd95307: Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad
* commit '
7bd95307ecdca5c7661bc3fb1765313ceb62e92a':
Fix shutter covering pie menu
Doris Liu [Wed, 16 Oct 2013 21:57:32 +0000 (21:57 +0000)]
Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad
Doris Liu [Wed, 16 Oct 2013 19:51:02 +0000 (12:51 -0700)]
Fix shutter covering pie menu
Bug:
11247988
Change-Id: I2018075a0b8adf7cacb302774ed64df92fc2fa7c
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 17:34:29 +0000 (10:34 -0700)]
update camera launcher icon
fixed b/
11252230
Change-Id: I78ef2c748246d7c30849ece2b029150096bc1227
Doris Liu [Wed, 16 Oct 2013 02:10:28 +0000 (19:10 -0700)]
Show a preview cover until real preview is ready
Bug:
11211650
Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
The Android Automerger [Tue, 15 Oct 2013 22:55:46 +0000 (15:55 -0700)]
merge in klp-release history after reset to klp-dev
Igor Murashkin [Tue, 15 Oct 2013 21:54:09 +0000 (14:54 -0700)]
am
5e82f81a: Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad
* commit '
5e82f81a7c7daaf8ac86dbd688b344027f97ff64':
gcam: Fix AF spinner not to reset when changing position
Igor Murashkin [Tue, 15 Oct 2013 21:51:39 +0000 (21:51 +0000)]
Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad
ztenghui [Tue, 15 Oct 2013 21:13:26 +0000 (14:13 -0700)]
Don't allow swipe into the film strip view when swipe is disabled
The swipe is supposed to be intercepted by FilmStripView, however, when the
children is not handling the scroll / fling gestures, FilmStripView will still
has to handle it.
In this case, we need to detect whether or not the swipe has been disabled.
bug:
11234333
bug:
11221594
Change-Id: I1d0fbac65050aef225fb880a41df735e98bf48db
Igor Murashkin [Tue, 15 Oct 2013 20:43:31 +0000 (13:43 -0700)]
gcam: Fix AF spinner not to reset when changing position
Bug:
10936156
Change-Id: If9b73415e95684e2acbcbc15457e865bd133f366
Doris Liu [Tue, 15 Oct 2013 20:01:11 +0000 (13:01 -0700)]
am
08749a4e: Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad
* commit '
08749a4ed22c5001aa476a9a30df323b00a6df7d':
Dismiss switcher popup when shutter button is clicked
Doris Liu [Tue, 15 Oct 2013 19:58:43 +0000 (19:58 +0000)]
Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad
Igor Murashkin [Tue, 15 Oct 2013 19:58:05 +0000 (12:58 -0700)]
am
d3e75bd7: Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad
* commit '
d3e75bd748ce2be8fdcb30575bbde9bd07536bd3':
CameraUtil: add float clamp function
Igor Murashkin [Tue, 15 Oct 2013 19:55:18 +0000 (19:55 +0000)]
Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad
Doris Liu [Tue, 15 Oct 2013 19:51:47 +0000 (12:51 -0700)]
Dismiss switcher popup when shutter button is clicked
Bug:
11224722
Change-Id: Id9813c83e22e951f06cb7a885fdb34820f62b545
Erin Dahlgren [Tue, 15 Oct 2013 19:44:49 +0000 (12:44 -0700)]
am
177c4b05: Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad
* commit '
177c4b05ed8e9f71afc526e5cad339f245563450':
Do not show any bottom controls in secure camera to prevent launching out of app behavior.
Erin Dahlgren [Tue, 15 Oct 2013 19:35:10 +0000 (19:35 +0000)]
Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad
Erin Dahlgren [Tue, 15 Oct 2013 16:50:54 +0000 (09:50 -0700)]
Do not show any bottom controls in secure camera to prevent launching out of app behavior.
Bug:
11235651
Change-Id: Iafc0b7930c8c016bd6ab11b13d6572241c5ef074
Erin Dahlgren [Tue, 15 Oct 2013 18:00:27 +0000 (11:00 -0700)]
am
487200db: Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad
* commit '
487200db7f4d73e85ae568221d268b46fad19726':
Prevent crash after deleting album from Gallery by checking for more null pointers.
Erin Dahlgren [Tue, 15 Oct 2013 17:57:17 +0000 (17:57 +0000)]
Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad
ztenghui [Tue, 15 Oct 2013 17:12:09 +0000 (10:12 -0700)]
am
0e6efbcc: Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad
* commit '
0e6efbccdb196ef0847e00b23165ed94a77c9f3d':
NPE fix when we failed to open the camera
ztenghui [Tue, 15 Oct 2013 17:08:44 +0000 (17:08 +0000)]
Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad
Erin Dahlgren [Tue, 15 Oct 2013 00:35:23 +0000 (17:35 -0700)]
Prevent crash after deleting album from Gallery by checking for more null pointers.
Bug:
10950130
Change-Id: I284e2016676e15c7f2ad23de71a965ab50c5d743
The Android Automerger [Tue, 15 Oct 2013 13:01:02 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Mangesh Ghiware [Tue, 15 Oct 2013 05:11:28 +0000 (22:11 -0700)]
am
4f4a1678: Fix Camera2 build.
* commit '
4f4a16782537f6eb08c5cc3ed76831312770e170':
Fix Camera2 build.
Mangesh Ghiware [Tue, 15 Oct 2013 05:05:16 +0000 (22:05 -0700)]
Fix Camera2 build.
Bug:
11226016
Change-Id: Ib667e52a150ffad44575ea97174f9d13de1d7b5e
Mangesh Ghiware [Tue, 15 Oct 2013 04:38:07 +0000 (21:38 -0700)]
am
2d939fe7: Use Gallery intents by default.
* commit '
2d939fe70e52ba4805c6783b01530c8c1c67fb33':
Use Gallery intents by default.
Mangesh Ghiware [Tue, 15 Oct 2013 04:19:22 +0000 (21:19 -0700)]
Use Gallery intents by default.
Bug:
11226016
Change-Id: I4f6a5856dd8141930fb0fef19b9ded0b37ea1ce5
Sascha Haeberling [Tue, 15 Oct 2013 03:41:50 +0000 (20:41 -0700)]
am
d8b555b8: Merge "Updating shutter button resources" into gb-ub-photos-carlsbad
* commit '
d8b555b801c5e57bfbeca27ef38bea7688286c3c':
Updating shutter button resources
Sascha Haeberling [Tue, 15 Oct 2013 03:39:29 +0000 (03:39 +0000)]
Merge "Updating shutter button resources" into gb-ub-photos-carlsbad
Erin Dahlgren [Mon, 14 Oct 2013 23:45:19 +0000 (16:45 -0700)]
am
831da613: Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad
* commit '
831da6132122d9d9a35183ef832994be659c3740':
Set camera controls visibility based on whether the camera preview is centered.
Baligh Uddin [Mon, 14 Oct 2013 23:42:37 +0000 (23:42 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Erin Dahlgren [Mon, 14 Oct 2013 23:42:13 +0000 (23:42 +0000)]
Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad
ztenghui [Mon, 14 Oct 2013 22:25:16 +0000 (15:25 -0700)]
NPE fix when we failed to open the camera
At the same time, some error check code never get turned on.
Remove those stale codes and make sure we check the CameraDevice for null
correctly.
We didn't intensively log the error here since they should be logged by
the CameraOpenErrorCallback already.
bug:
11215576
Change-Id: Ib1e1b9011a169607b719c833d6d5eddbd9be8a9d
Baligh Uddin [Mon, 14 Oct 2013 23:21:39 +0000 (16:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80c7902d8de92127a13f6d2f66452c876090a7ac
Auto-generated-cl: translation import
ztenghui [Mon, 14 Oct 2013 18:15:44 +0000 (11:15 -0700)]
Only delete the Uri coming from onMediaSaved
The incoming Uri can be null, or a file Uri, which we don't want to delete.
The Uri from onMediaSaved has been inserted to the MediaStore and pass null
check.
bug:
11218007
Change-Id: Ie4b08cae94e22a8014ea2436f0a82eba2541a667
Sascha Haeberling [Mon, 14 Oct 2013 22:06:29 +0000 (15:06 -0700)]
Updating shutter button resources
Bug:
11155984
Change-Id: I178938250d2f99e32c9c339f3ffdf4495c053361
Igor Murashkin [Mon, 14 Oct 2013 21:57:30 +0000 (14:57 -0700)]
CameraUtil: add float clamp function
Bug:
10936156
Change-Id: I5fbaf399ed8ca0206d23aa7d0af11c9b8a1debe5
Sascha Haeberling [Mon, 14 Oct 2013 21:11:50 +0000 (14:11 -0700)]
am
2670f3e4: Updating button assets, follow-up to ag/373177
* commit '
2670f3e45f5818f7c1074b10ef336df30af74583':
Updating button assets, follow-up to http://ag/373177
Sascha Haeberling [Sun, 13 Oct 2013 16:10:02 +0000 (09:10 -0700)]
Updating button assets, follow-up to ag/373177
Bug:
11155984
Change-Id: Ib1cbf5cf53f30e45751804f6d9d25afa127df99a
Doris Liu [Mon, 14 Oct 2013 20:50:30 +0000 (13:50 -0700)]
am
ce75de57: Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad
* commit '
ce75de57dca5398b7786ad7262cb016e5f6b24ee':
Fix SRI upside down preview in reverse landscape and reverse portrait
Doris Liu [Mon, 14 Oct 2013 20:47:39 +0000 (20:47 +0000)]
Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad
Erin Dahlgren [Fri, 11 Oct 2013 01:23:45 +0000 (18:23 -0700)]
Set camera controls visibility based on whether the camera preview is centered.
Bug:
10861015
Change-Id: Ib0c4945e35cee16b73a4bba913e11d0f79a26176
ztenghui [Mon, 14 Oct 2013 20:39:10 +0000 (13:39 -0700)]
am
b27668f0: Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad
* commit '
b27668f0d0a1d5049759a8448e1701e199e05c71':
Only delete the Uri coming from onMediaSaved
ztenghui [Mon, 14 Oct 2013 20:36:51 +0000 (20:36 +0000)]
Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad
ztenghui [Mon, 14 Oct 2013 18:15:44 +0000 (11:15 -0700)]
Only delete the Uri coming from onMediaSaved
The incoming Uri can be null, or a file Uri, which we don't want to delete.
The Uri from onMediaSaved has been inserted to the MediaStore and pass null
check.
bug:
11218007
Change-Id: Ie4b08cae94e22a8014ea2436f0a82eba2541a667
Doris Liu [Mon, 14 Oct 2013 19:06:20 +0000 (12:06 -0700)]
Fix SRI upside down preview in reverse landscape and reverse portrait
Also make sure preview is not upside down after device flip, and
fix camera controls jiggering during rotation
Bug:
11216647
Bug:
11174540
Change-Id: I764e5b86549fa87c2224d8e85ff06f57f0a315d1
The Android Automerger [Mon, 14 Oct 2013 13:00:32 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
OSDN Git Service
