OSDN Git Service
Doris Liu [Sat, 26 Oct 2013 01:17:15 +0000 (18:17 -0700)]
am
cf940d9e: am
5737b932: Fix skipped hide review layout calls
* commit '
cf940d9e40cdc9a8876b9484153eedced654fc75':
Fix skipped hide review layout calls
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:57:01 +0000 (12:57 -0700)]
am
865c72a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
865c72a4a44db92422beaa450b4c7ea652e9d36d':
Import translations. DO NOT MERGE
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:54:45 +0000 (13:54 -0700)]
am
080fb578: am
156ea57c: Merge "Bump version number for MR1" into gb-ub-photos-carlsbad
* commit '
080fb578bb826dc2e699aed357ece289433e0524':
Bump version number for MR1
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
Erin Dahlgren [Mon, 21 Oct 2013 20:51:07 +0000 (13:51 -0700)]
am
4432abe0: am
65e2389b: Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad
* commit '
4432abe0aeda12707267dbbb8882406819e125e8':
Update preview controls on deleting all items.
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:31:46 +0000 (13:31 -0700)]
am
b67d1401: am
68c1c1e0: The initial focus value should be true.
* commit '
b67d140189756a48f755130404235cb14b636850':
The initial focus value should be true.
ztenghui [Mon, 21 Oct 2013 20:31:46 +0000 (13:31 -0700)]
am
f1d7d405: am
56e44af2: Don\'t call onCurrentDataChanged for CameraPreview when reloading.
* commit '
f1d7d405a95e5901898f906e96f8d1731b745909':
Don't call onCurrentDataChanged for CameraPreview when reloading.
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:44:30 +0000 (17:44 -0700)]
am
8be9183c: am
891a8075: Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad
* commit '
8be9183ceb856a8933394238996f4d364e45c3e1':
Fix SRI orientation on manta
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:47:38 +0000 (11:47 -0700)]
am
734d2e67: am
464f2201: Don\'t crash when preview surface could not be set.
* commit '
734d2e6791891dda7ca2a23d38d828b9765569b9':
Don't crash when preview surface could not be set.
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:14:45 +0000 (14:14 -0700)]
am
a6e7579c: am
f302a391: Update HDR/HDR+ arc menu hover messages.
* commit '
a6e7579cf9b3daeb0b81a395b097b988d07614a1':
Update HDR/HDR+ arc menu hover messages.
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:51:59 +0000 (10:51 -0700)]
am
9ff2635a: am
8470cae9: Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad
* commit '
9ff2635aaad021813484fd32491c5d41e9e21a20':
Show a preview cover until real preview is ready
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
ztenghui [Thu, 17 Oct 2013 17:47:39 +0000 (10:47 -0700)]
am
b1c2d554: am
f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad
* commit '
b1c2d5544ae5c4ba2f3e3fe7e8baf357581cfbed':
Don't allow swipe into the film strip view when swipe is disabled
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:21:50 +0000 (10:21 -0700)]
am
a7d9bf6c: (-s ours) am
270b64e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
a7d9bf6cac9f8fa82aee368d2a3db8713b79cdea':
Import translations. DO NOT MERGE
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:23:00 +0000 (08:23 -0700)]
am
3cdc6f0a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
3cdc6f0aab59309eba73ada1319cf3fb75124ec9':
Import translations. DO NOT MERGE
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:51:54 +0000 (17:51 -0700)]
am
071cfe6c: merge in klp-release (no-op)
* commit '
071cfe6c640c014bb9503a049ec5b20e26684860':
Only delete the Uri coming from onMediaSaved
Avoid unnecessary bringChildToFront() calls.
Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file.
Add missing crop message.
Prevent NPE in gesture handling.
Restore HQ preference in GCam module.
Fix memory leak of context in LocalMediaObserver
Add HQ icon indicator support.
Remove PopupManager to remove a memory leak
Make ROI size 1/8 of longer edge of the image
Sort and select the preview fps range for still image.
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:37:45 +0000 (16:37 -0700)]
am
089c19ac: am
9db92826: Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad
* commit '
089c19ac2c59941224b9263946881d5659145ed0':
Send an message to decouple the gcam module change.
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
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:16:20 +0000 (15:16 -0700)]
am
7015ae63: am
66f39483: Merge "update camera launcher icon" into gb-ub-photos-carlsbad
* commit '
7015ae63cfad8305f85c3b55bfa0c12acb18020e':
update camera launcher icon
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 22:02:47 +0000 (15:02 -0700)]
am
1f4e2b9e: am
7bd95307: Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad
* commit '
1f4e2b9efbbcd4bcf565f1460907f94b999dacee':
Fix shutter covering pie menu
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:58:05 +0000 (14:58 -0700)]
am
4baeda1f: am
5e82f81a: Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad
* commit '
4baeda1f643005e11cd2bb4b1103fe487f95ec66':
gcam: Fix AF spinner not to reset when changing position
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:05:44 +0000 (13:05 -0700)]
am
6cf14f19: am
08749a4e: Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad
* commit '
6cf14f191d4f590ef564f113856ae6e46704f0ed':
Dismiss switcher popup when shutter button is clicked
Igor Murashkin [Tue, 15 Oct 2013 20:02:17 +0000 (13:02 -0700)]
am
eb1538d7: am
d3e75bd7: Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad
* commit '
eb1538d75e47ed344265aafa1286a192adcb581e':
CameraUtil: add float clamp function
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:48:30 +0000 (12:48 -0700)]
am
f983b7b3: 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 '
f983b7b3afdf30de9261f2a6d4c6a4ddb4447c84':
Do not show any bottom controls in secure camera to prevent launching out of app behavior.
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:05:10 +0000 (11:05 -0700)]
am
5e07d4fc: am
487200db: Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad
* commit '
5e07d4fc1a03fcad526d0718ceab11a99f7f8698':
Prevent crash after deleting album from Gallery by checking for more null pointers.
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:15:34 +0000 (10:15 -0700)]
am
df36ec57: am
0e6efbcc: Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad
* commit '
df36ec57043d160dd6191acd9d7d9100314d78b6':
NPE fix when we failed to open the camera
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:12:37 +0000 (22:12 -0700)]
am
5152eb13: am
4f4a1678: Fix Camera2 build.
* commit '
5152eb131ed75629746b1bbc0302cb0f5c56c214':
Fix Camera2 build.
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:39:19 +0000 (21:39 -0700)]
am
5782f4c1: am
2d939fe7: Use Gallery intents by default.
* commit '
5782f4c1fedf9e608a2aa6e42c7d933a665ca842':
Use Gallery intents by default.
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:44:58 +0000 (20:44 -0700)]
am
85beb3cb: am
d8b555b8: Merge "Updating shutter button resources" into gb-ub-photos-carlsbad
* commit '
85beb3cb658799492ccb08828ea85bf1eab09d57':
Updating shutter button resources
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 [Tue, 15 Oct 2013 00:19:52 +0000 (17:19 -0700)]
am
dfca664a: am
831da613: Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad
* commit '
dfca664afdd86ef55c00cca88fca64c980cf6c4f':
Set camera controls visibility based on whether the camera preview is centered.
Baligh Uddin [Tue, 15 Oct 2013 00:19:51 +0000 (17:19 -0700)]
am
62cfac54: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
62cfac546902d151682e873d83c34e42fa17fee1':
Import translations. DO NOT MERGE
Sascha Haeberling [Tue, 15 Oct 2013 00:18:54 +0000 (17:18 -0700)]
am
147887f4: am
2670f3e4: Updating button assets, follow-up to ag/373177
* commit '
147887f44ab581a6260e8b1f56cf17642befaa72':
Updating button assets, follow-up to http://ag/373177
Doris Liu [Tue, 15 Oct 2013 00:18:49 +0000 (17:18 -0700)]
am
713cb961: am
ce75de57: Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad
* commit '
713cb9613607b64276edb2bf0c27afd399bc0cdf':
Fix SRI upside down preview in reverse landscape and reverse portrait
ztenghui [Tue, 15 Oct 2013 00:18:38 +0000 (17:18 -0700)]
am
46132e66: am
b27668f0: Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad
* commit '
46132e66c8bb467843a13cc0b8d45a13dbe382b8':
Only delete the Uri coming from onMediaSaved
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