OSDN Git Service
Baligh Uddin [Fri, 6 Sep 2013 04:40:31 +0000 (21:40 -0700)]
am
8ebeb744: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
8ebeb744d8c5e7ea71c7a0482f18a7755301fe5a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 6 Sep 2013 04:38:03 +0000 (04:38 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Doris Liu [Thu, 5 Sep 2013 21:52:11 +0000 (14:52 -0700)]
am
364295ed: am
fffc6a5a: Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad
* commit '
364295ed6c6c6a872cd7cc0c72597814f47d6b2d':
Fix black screen in mode switching
Doris Liu [Thu, 5 Sep 2013 21:47:55 +0000 (14:47 -0700)]
am
fffc6a5a: Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad
* commit '
fffc6a5a3458cd0a29a49f10ff5ea1834c1c98fc':
Fix black screen in mode switching
Doris Liu [Thu, 5 Sep 2013 21:44:50 +0000 (21:44 +0000)]
Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad
Doris Liu [Thu, 5 Sep 2013 21:15:09 +0000 (14:15 -0700)]
Fix black screen in mode switching
Bug:
10632592
Change-Id: I3c8bc1f6a17709d39ec88b51a22edfbbab828bde
Baligh Uddin [Thu, 5 Sep 2013 20:23:43 +0000 (13:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7290132a6577d8e8b5658dfcaaeb250c3d096f07
Auto-generated-cl: translation import
Angus Kong [Thu, 5 Sep 2013 04:52:08 +0000 (21:52 -0700)]
am
4aac7d25: am
33bb2d47: Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad
* commit '
4aac7d254d464e1659320c9b32d6fc080ec27dd8':
Bring back wide angle panorama.
Angus Kong [Thu, 5 Sep 2013 04:49:40 +0000 (21:49 -0700)]
am
33bb2d47: Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad
* commit '
33bb2d47fa5850c14f7fe42e07ab6f21585efade':
Bring back wide angle panorama.
Angus Kong [Thu, 5 Sep 2013 04:47:51 +0000 (04:47 +0000)]
Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad
Alan Newberger [Thu, 5 Sep 2013 04:28:18 +0000 (21:28 -0700)]
am
364f1200: am
1ef76d4c: reintroduce action bar hiding for onDataChanged
* commit '
364f12004622ff16ae16ef0f10d8c101c16597ec':
reintroduce action bar hiding for onDataChanged
Alan Newberger [Thu, 5 Sep 2013 04:26:32 +0000 (21:26 -0700)]
am
1ef76d4c: reintroduce action bar hiding for onDataChanged
* commit '
1ef76d4cbd73c02cb8d02cf4cde3f4cee81548d6':
reintroduce action bar hiding for onDataChanged
Alan Newberger [Thu, 5 Sep 2013 02:01:59 +0000 (19:01 -0700)]
reintroduce action bar hiding for onDataChanged
this code was present but got inadvertently removed by a subsequent
change Icb07e9e890a72bec6ed3b4c5a7e33400be3446f8.
Change-Id: If6c0f31497406fc3056dbb48d67b195342f6d10f
Sascha Haeberling [Thu, 5 Sep 2013 00:04:31 +0000 (17:04 -0700)]
am
540f719a: am
5633994e: Increase char limit.
* commit '
540f719ab58d0a4776b0eb419a3b5f24738fb7f8':
Increase char limit.
Sascha Haeberling [Thu, 5 Sep 2013 00:02:55 +0000 (17:02 -0700)]
am
5633994e: Increase char limit.
* commit '
5633994ecddb26bdd7a577a5b015b95bcb33e309':
Increase char limit.
Sascha Haeberling [Wed, 4 Sep 2013 23:59:43 +0000 (16:59 -0700)]
Increase char limit.
Bug:
10590844
Change-Id: Ib30d348c1806e5c1b174bdd5198b880a2dca14e5
Mangesh Ghiware [Wed, 4 Sep 2013 23:38:03 +0000 (16:38 -0700)]
am
631c94a8: am
33035c19: Bring back \'share 360 photosphere\' to filmstrip
* commit '
631c94a8928b864bc5429bf14b275dc36292fedc':
Bring back 'share 360 photosphere' to filmstrip
Mangesh Ghiware [Wed, 4 Sep 2013 23:36:48 +0000 (16:36 -0700)]
am
33035c19: Bring back \'share 360 photosphere\' to filmstrip
* commit '
33035c19cc47adfb738c20cef66652ae451c8e10':
Bring back 'share 360 photosphere' to filmstrip
Mangesh Ghiware [Fri, 23 Aug 2013 20:28:21 +0000 (13:28 -0700)]
Bring back 'share 360 photosphere' to filmstrip
Bug:
10367406
Change-Id: Icb07e9e890a72bec6ed3b4c5a7e33400be3446f8
Doris Liu [Wed, 4 Sep 2013 23:29:25 +0000 (16:29 -0700)]
am
194d84f1: am
121022cb: Double tap to zoom all the way in and out
* commit '
194d84f16271cb86069145deae2fbd16841b15ce':
Double tap to zoom all the way in and out
Doris Liu [Wed, 4 Sep 2013 23:27:41 +0000 (16:27 -0700)]
am
121022cb: Double tap to zoom all the way in and out
* commit '
121022cb590955e37f1264f77190ce4711159976':
Double tap to zoom all the way in and out
Doris Liu [Tue, 3 Sep 2013 23:03:16 +0000 (16:03 -0700)]
Double tap to zoom all the way in and out
Bug:
10308195
Change-Id: Id6c1bd6c95a812c3aae0c292ca53e3de6eea2d55
Angus Kong [Mon, 19 Aug 2013 22:06:12 +0000 (15:06 -0700)]
Bring back wide angle panorama.
bug:
10293937
Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05
Baligh Uddin [Wed, 4 Sep 2013 05:09:25 +0000 (22:09 -0700)]
am
0ab8fabb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
0ab8fabbb3ee7bc575fc7127a209b4fc6c396933':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Sep 2013 05:09:25 +0000 (22:09 -0700)]
am
fb56e3fe: (-s ours) am
7ff7b04d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
fb56e3fe13d4aa24c9ff09dd28d9e0d8e05e2ae3':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Sep 2013 05:07:35 +0000 (05:07 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 4 Sep 2013 05:05:44 +0000 (22:05 -0700)]
am
7ff7b04d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
7ff7b04dd187b2662c9faeb58f660a248b3764a7':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Sep 2013 05:03:40 +0000 (05:03 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 4 Sep 2013 00:19:31 +0000 (17:19 -0700)]
am
52a0a4f0: am
26145e56: Use app_name label now that we have the correct translations.
* commit '
52a0a4f0be9226fac107346d1010d139f93cc050':
Use app_name label now that we have the correct translations.
Sascha Haeberling [Wed, 4 Sep 2013 00:14:01 +0000 (17:14 -0700)]
am
26145e56: Use app_name label now that we have the correct translations.
* commit '
26145e56f6e98733569b7093573fc26f44d3cfa5':
Use app_name label now that we have the correct translations.
Sascha Haeberling [Wed, 4 Sep 2013 00:02:11 +0000 (17:02 -0700)]
Use app_name label now that we have the correct translations.
Bug:
10509882
Change-Id: I58e7d26afb5636fa156ec22b7c1cfa21262dd9f7
Baligh Uddin [Tue, 3 Sep 2013 21:41:09 +0000 (14:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iad77e8a0d648ed7b2bb3205e1d6ab1e73dafde76
Auto-generated-cl: translation import
Baligh Uddin [Tue, 3 Sep 2013 21:39:33 +0000 (14:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib04bd2f74b2812001a26d50dfca2a27351e6cbe3
Auto-generated-cl: translation import
ztenghui [Tue, 3 Sep 2013 21:39:20 +0000 (14:39 -0700)]
am
6d7237f2: am
269c824d: Merge "Don\'t show the action bar in the capture intent." into gb-ub-photos-carlsbad
* commit '
6d7237f2d34f0d4f9bf24c14dddee123d6caa488':
Don't show the action bar in the capture intent.
ztenghui [Tue, 3 Sep 2013 21:34:25 +0000 (14:34 -0700)]
am
269c824d: Merge "Don\'t show the action bar in the capture intent." into gb-ub-photos-carlsbad
* commit '
269c824d720b2e902c4ad6c3bb23422644da1f41':
Don't show the action bar in the capture intent.
ztenghui [Tue, 3 Sep 2013 21:33:14 +0000 (21:33 +0000)]
Merge "Don't show the action bar in the capture intent." into gb-ub-photos-carlsbad
ztenghui [Tue, 3 Sep 2013 21:29:12 +0000 (14:29 -0700)]
am
1247a8bc: am
2c3d9a58: Don\'t show action bar when in camera preview.
* commit '
1247a8bc53cd391d0b21c06adbf63e4b621c5bc8':
Don't show action bar when in camera preview.
ztenghui [Tue, 3 Sep 2013 21:27:17 +0000 (14:27 -0700)]
am
2c3d9a58: Don\'t show action bar when in camera preview.
* commit '
2c3d9a58d8942f73bc16c71e57584e4d89410185':
Don't show action bar when in camera preview.
ztenghui [Tue, 3 Sep 2013 18:27:21 +0000 (11:27 -0700)]
Don't show action bar when in camera preview.
There are 3 cases we need to toggle the action bar.
1. Touch in full screen mode. onToggleActionBarVisibility()
2. Swipe back and forth to film stripe from preview. onSwitchMode()
3. In full screen mode, current data becomes the preview.
onCurrentDataChanged()
bug:
10563392
Change-Id: I576c49b767cd863da725cf991238c27440d85b9b
ztenghui [Tue, 3 Sep 2013 18:30:11 +0000 (11:30 -0700)]
Don't show the action bar in the capture intent.
bug:
10571262
Change-Id: I85ed9c632f76084db95ce24277fb303c67c3949f
Baligh Uddin [Sat, 31 Aug 2013 01:54:42 +0000 (18:54 -0700)]
am
95dd838a: (-s ours) am
5457782d: (-s ours) Import translations. DO NOT MERGE
* commit '
95dd838ab3d0768de66b67763a7aa46706e1305f':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 31 Aug 2013 01:53:38 +0000 (18:53 -0700)]
am
5457782d: (-s ours) Import translations. DO NOT MERGE
* commit '
5457782daf2d03bdc1ac8f6b7143c92c62c3cfd0':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 31 Aug 2013 01:48:09 +0000 (18:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia4ef8cf1acece5a8413feffbbecc2e3713e28332
Auto-generated-cl: translation import
Sascha Haeberling [Sat, 31 Aug 2013 01:35:59 +0000 (18:35 -0700)]
am
cb46d560: am
1d9a8d7a: Rename renering message from panorama to photo sphere.
* commit '
cb46d560990d7b39d0d341a89028a1b886acfb4c':
Rename renering message from panorama to photo sphere.
Sascha Haeberling [Sat, 31 Aug 2013 01:33:31 +0000 (18:33 -0700)]
am
1d9a8d7a: Rename renering message from panorama to photo sphere.
* commit '
1d9a8d7a0fa22e66aa2efdcf35aca57f7ffa432a':
Rename renering message from panorama to photo sphere.
Sascha Haeberling [Sat, 31 Aug 2013 01:11:20 +0000 (18:11 -0700)]
Rename renering message from panorama to photo sphere.
Bug:
7695145
Change-Id: Ibfd083d4a879eda5dbf866e3a22df651166ea315
Doris Liu [Sat, 31 Aug 2013 00:39:55 +0000 (17:39 -0700)]
am
14f85082: am
0dff7ce1: Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad
* commit '
14f85082d9aba3819fd8f0f64bf5aaf28a2fbe9b':
Reset zoom view when user exits app or rotate device
Angus Kong [Sat, 31 Aug 2013 00:39:55 +0000 (17:39 -0700)]
am
6e9cfebc: am
b2f0968c: Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad
* commit '
6e9cfebc56b703ba2057061ba9a9f192e645d437':
Make the preview thumbnail clicable after scaling.
Doris Liu [Sat, 31 Aug 2013 00:37:10 +0000 (17:37 -0700)]
am
0dff7ce1: Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad
* commit '
0dff7ce1f701816b4a634b612bcaaaae6de0da34':
Reset zoom view when user exits app or rotate device
Angus Kong [Sat, 31 Aug 2013 00:37:09 +0000 (17:37 -0700)]
am
b2f0968c: Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad
* commit '
b2f0968c90a352cca43f508d216c3f28c3d2cc16':
Make the preview thumbnail clicable after scaling.
Doris Liu [Sat, 31 Aug 2013 00:34:33 +0000 (00:34 +0000)]
Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad
Angus Kong [Sat, 31 Aug 2013 00:34:22 +0000 (00:34 +0000)]
Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad
Angus Kong [Sat, 31 Aug 2013 00:09:46 +0000 (17:09 -0700)]
Make the preview thumbnail clicable after scaling.
bug:
10552110
Change-Id: I81abd96ad971543412597dbe8f7f57eeb6d3c1fa
Doris Liu [Fri, 30 Aug 2013 23:20:58 +0000 (16:20 -0700)]
Reset zoom view when user exits app or rotate device
Bug:
10308195
Change-Id: Icf1acc4b17611b28a9c65ec809083ac58da5bd8f
Sascha Haeberling [Fri, 30 Aug 2013 23:41:40 +0000 (16:41 -0700)]
am
0ee2d8c1: am
72a57ddf: Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbad
* commit '
0ee2d8c14d2a75f8616b98a026a5c9429dd3e397':
Automatic versioning for Camera.
Doris Liu [Fri, 30 Aug 2013 23:41:40 +0000 (16:41 -0700)]
am
f55555e0: am
750e73c4: Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad
* commit '
f55555e0ad5aad15813ce2c2fb57552fdb6c01b2':
Measure all children to ensure correct layout position
Angus Kong [Fri, 30 Aug 2013 23:41:39 +0000 (16:41 -0700)]
am
a5624237: am
8d2c6b83: Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad
* commit '
a562423733af58910e301c00c90f26b5f5a2052f':
Skip bitmaps with 0 dimension.
Sascha Haeberling [Fri, 30 Aug 2013 23:37:58 +0000 (16:37 -0700)]
am
72a57ddf: Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbad
* commit '
72a57ddf178b410ffb3c4532fc4e56b8b1d99706':
Automatic versioning for Camera.
Sascha Haeberling [Fri, 30 Aug 2013 23:35:52 +0000 (23:35 +0000)]
Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbad
Doris Liu [Fri, 30 Aug 2013 23:32:53 +0000 (16:32 -0700)]
am
750e73c4: Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad
* commit '
750e73c4a4b04a5695540d3c982774662307b58e':
Measure all children to ensure correct layout position
Doris Liu [Fri, 30 Aug 2013 23:30:18 +0000 (23:30 +0000)]
Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad
Angus Kong [Fri, 30 Aug 2013 23:27:48 +0000 (16:27 -0700)]
am
8d2c6b83: Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad
* commit '
8d2c6b830131a3d2e6ec7f2f8158b37506403dbd':
Skip bitmaps with 0 dimension.
Angus Kong [Fri, 30 Aug 2013 23:26:15 +0000 (23:26 +0000)]
Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad
Doris Liu [Fri, 30 Aug 2013 23:25:00 +0000 (16:25 -0700)]
Measure all children to ensure correct layout position
Bug:
10412775
Change-Id: Ia64d6d4d0d023b208edb70066b4d4670e4ad2bbb
Alan Newberger [Fri, 30 Aug 2013 23:22:34 +0000 (16:22 -0700)]
am
5fff50b6: am
5f6b50de: Add back button handlng to CameraActivity.
* commit '
5fff50b6b4e467ad59363637bf525c9c0f662145':
Add back button handlng to CameraActivity.
Alan Newberger [Fri, 30 Aug 2013 23:17:43 +0000 (16:17 -0700)]
am
5f6b50de: Add back button handlng to CameraActivity.
* commit '
5f6b50deaf46fb546ebf6d0d6244ebf7fb79c7ca':
Add back button handlng to CameraActivity.
Angus Kong [Fri, 30 Aug 2013 22:10:38 +0000 (15:10 -0700)]
Skip bitmaps with 0 dimension.
bug:
10514553
Change-Id: I0d26a324ede55b281e60cedc174869f5b863ca31
Alan Newberger [Fri, 30 Aug 2013 22:58:43 +0000 (15:58 -0700)]
am
0b51d31c: am
2581af9b: Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad
* commit '
0b51d31cbf028f1065dcf2cfa724080ac0f89c18':
add up button support for filmstrip
Sascha Haeberling [Fri, 30 Aug 2013 22:58:43 +0000 (15:58 -0700)]
am
c36e3561: am
1b44336b: Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad
* commit '
c36e3561ea1a8145b9d3482afe4682f56f82386f':
Let the Camera app remember which mode it was started in last.
Baligh Uddin [Fri, 30 Aug 2013 22:58:42 +0000 (15:58 -0700)]
am
5c285d9c: (-s ours) am
6447ef1e: (-s ours) Import translations. DO NOT MERGE
* commit '
5c285d9c8dcef8855463875966fb9a644aed5c59':
Import translations. DO NOT MERGE
Doris Liu [Fri, 30 Aug 2013 22:58:42 +0000 (15:58 -0700)]
am
d24a8d30: am
b3d4d8e5: Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbad
* commit '
d24a8d307e34451fb027519c4b7a9d71119a5eab':
Fix gap between camera controls and nav bar
Sascha Haeberling [Fri, 30 Aug 2013 22:58:42 +0000 (15:58 -0700)]
am
4feab753: am
c09c5f03: Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad
* commit '
4feab7531dfdfe26e023670c3c4493a2bee45788':
Fix of memory issues with bitmaps in filmstrip.
Alan Newberger [Fri, 30 Aug 2013 22:56:30 +0000 (15:56 -0700)]
am
2581af9b: Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad
* commit '
2581af9b08ac913465303795745c3ce24eb0f20c':
add up button support for filmstrip
Sascha Haeberling [Fri, 30 Aug 2013 22:56:30 +0000 (15:56 -0700)]
am
1b44336b: Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad
* commit '
1b44336b29d2145eaaf0786be47c08e2b5304bcf':
Let the Camera app remember which mode it was started in last.
Baligh Uddin [Fri, 30 Aug 2013 22:56:29 +0000 (15:56 -0700)]
am
6447ef1e: (-s ours) Import translations. DO NOT MERGE
* commit '
6447ef1e7cef4dad424f9e91c8fb730a6c8d0376':
Import translations. DO NOT MERGE
Doris Liu [Fri, 30 Aug 2013 22:56:29 +0000 (15:56 -0700)]
am
b3d4d8e5: Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbad
* commit '
b3d4d8e58831f6fffc078c8a6ee750dfe0f2a123':
Fix gap between camera controls and nav bar
Sascha Haeberling [Fri, 30 Aug 2013 22:56:28 +0000 (15:56 -0700)]
am
c09c5f03: Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad
* commit '
c09c5f0328a28ccfe9a0a9b37d028e91a94ded94':
Fix of memory issues with bitmaps in filmstrip.
Alan Newberger [Fri, 30 Aug 2013 22:19:48 +0000 (15:19 -0700)]
Add back button handlng to CameraActivity.
This CL first detects whether user is in filmstrip mode i.e. not in Camera,
if so brings user back to the first item which is the Camera. If in Camera,
we route back handling to the current Camera module which enables already-
written module handling for back button e.g. backing out of pie menus.
Bug:
8781981
Change-Id: I18377ea5fbdcd8bd8c6fc3af9cb5322d5f5a889a
Alan Newberger [Fri, 30 Aug 2013 21:22:55 +0000 (21:22 +0000)]
Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad
Alan Newberger [Fri, 23 Aug 2013 17:10:30 +0000 (10:10 -0700)]
add up button support for filmstrip
This CL adds up affordance handling to CameraActivity. There was no working call to reset the filmstrip back to the camera, so this CL adds a controller which then calls reload, which is itself fixed to work as desired. Note that during testing I identified issue
10563392, I've decided to file that separately since it is orthogonal to up button function, but it does affect the overall experience and should be fixed.
Bug:
10414498
Change-Id: I1ee914dc1d264adb1fb5a363c2d6174070cd7b71
Sascha Haeberling [Fri, 30 Aug 2013 17:24:38 +0000 (17:24 +0000)]
Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad
Baligh Uddin [Fri, 30 Aug 2013 03:32:08 +0000 (20:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27af5d736c885d9dbadfb635c5c6ea3a8f570543
Auto-generated-cl: translation import
Doris Liu [Fri, 30 Aug 2013 01:54:47 +0000 (01:54 +0000)]
Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbad
Doris Liu [Fri, 30 Aug 2013 01:06:45 +0000 (18:06 -0700)]
Fix gap between camera controls and nav bar
Bug:
10097187
Change-Id: I9918a09a1e0b2d3c5a89330b800a9b7f2c2a6408
Sascha Haeberling [Fri, 30 Aug 2013 00:47:49 +0000 (00:47 +0000)]
Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad
Sascha Haeberling [Fri, 30 Aug 2013 00:28:49 +0000 (17:28 -0700)]
Fix of memory issues with bitmaps in filmstrip.
Bug:
10495593
We should use the bigger scale factor of the two, and not the smaller.
Change-Id: I5a1ff6fe7d6b50c0128ff17709daa94cef9cb65b
Sascha Haeberling [Fri, 30 Aug 2013 00:23:29 +0000 (17:23 -0700)]
am
3a5c8362: am
f3d3a5c6: Merge "Disable shutter button while picture is being taken." into gb-ub-photos-carlsbad
* commit '
3a5c836282033c1fb0eea8cc2d1883540ab50efa':
Disable shutter button while picture is being taken.
Sascha Haeberling [Fri, 30 Aug 2013 00:22:08 +0000 (17:22 -0700)]
am
f3d3a5c6: Merge "Disable shutter button while picture is being taken." into gb-ub-photos-carlsbad
* commit '
f3d3a5c63bd0d88882f0180ac79186c03c644c70':
Disable shutter button while picture is being taken.
Sascha Haeberling [Fri, 30 Aug 2013 00:20:15 +0000 (00:20 +0000)]
Merge "Disable shutter button while picture is being taken." into gb-ub-photos-carlsbad
Doris Liu [Thu, 29 Aug 2013 21:49:29 +0000 (14:49 -0700)]
am
b7a8e45e: am
8de13111: 1:1 zoom integration
* commit '
b7a8e45e727ef2a3e57ae6a9aea96eb23b3e7039':
1:1 zoom integration
Doris Liu [Thu, 29 Aug 2013 21:47:26 +0000 (14:47 -0700)]
am
8de13111: 1:1 zoom integration
* commit '
8de13111cc4e62da3462ea321d18c7951282e0d0':
1:1 zoom integration
Doris Liu [Fri, 23 Aug 2013 20:35:24 +0000 (13:35 -0700)]
1:1 zoom integration
Bug:
10308195
Change-Id: I940891f6aa3e24575174ff888c384fddaaa5b3c8
Sascha Haeberling [Thu, 29 Aug 2013 00:49:00 +0000 (17:49 -0700)]
Disable shutter button while picture is being taken.
Bug:
7328018
Change-Id: I98160d52c542186aa9f2d85f66a4e0120a917e38
Doris Liu [Thu, 29 Aug 2013 00:07:27 +0000 (17:07 -0700)]
am
734c25b9: am
0df03318: Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad
* commit '
734c25b9c17e5f824863c24843c7265d37bda1d5':
Flip capture thumb when using front facing camera
Doris Liu [Thu, 29 Aug 2013 00:04:12 +0000 (17:04 -0700)]
am
0df03318: Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad
* commit '
0df03318d36f77aaec11238854921bd45f50c035':
Flip capture thumb when using front facing camera
Doris Liu [Thu, 29 Aug 2013 00:02:22 +0000 (00:02 +0000)]
Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad
Doris Liu [Wed, 28 Aug 2013 21:28:45 +0000 (14:28 -0700)]
Flip capture thumb when using front facing camera
Bug:
10495008
Change-Id: I9f444625e64be35afe44b0d7f50d81fbd1936ae8
Sascha Haeberling [Wed, 28 Aug 2013 22:28:57 +0000 (15:28 -0700)]
Let the Camera app remember which mode it was started in last.
Bug:
7320368
Change-Id: Ia2ae47693f453c9bcff315af87fe1e5a44b6e5c7
Sascha Haeberling [Wed, 28 Aug 2013 21:51:53 +0000 (14:51 -0700)]
Automatic versioning for Camera.
Bug:
10461009
This is the scheme copied from GMS Core and modified by Babel, which
allows us to generate version number more easily and also incorporate
build numbers into it.
Change-Id: I6ed4bf03e545a22423cb9936a5fcb67a50133490
ztenghui [Wed, 28 Aug 2013 20:56:10 +0000 (13:56 -0700)]
am
72b0220a: am
2d1c49c2: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad
* commit '
72b0220acf98afae4c1b9a3ba8f32f62e20b7159':
Add rotate support in Film Strip
OSDN Git Service
