OSDN Git Service
Sascha Haeberling [Tue, 27 May 2014 17:59:14 +0000 (17:59 +0000)]
am
d58c9ccb: Fix build by removing references to removed strings.
* commit '
d58c9ccba64914e2c7c98927a9aca8c673ba9172':
Fix build by removing references to removed strings.
Baligh Uddin [Tue, 27 May 2014 17:54:08 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Sascha Haeberling [Tue, 27 May 2014 17:53:50 +0000 (10:53 -0700)]
Fix build by removing references to removed strings.
These got removed in 469821 but the build didn't fail beause
we still had translations.
Change-Id: Id74cbff53bc1859c3f35083b2f167374c87775b1
Seth Raphael [Tue, 27 May 2014 17:35:31 +0000 (17:35 +0000)]
am
cbf2efe0: Merge "Fix NPE in CountdownSoundPlayer." into ub-camera-everglades
* commit '
cbf2efe047cc9db55076fca6e69116c32c72845a':
Fix NPE in CountdownSoundPlayer.
Baligh Uddin [Tue, 27 May 2014 17:35:31 +0000 (17:35 +0000)]
am
1b490ba4: (-s ours) Import translations. DO NOT MERGE
* commit '
1b490ba4f04c93cc58b5ffb3cb61eeef119cb762':
Import translations. DO NOT MERGE
Seth Raphael [Tue, 27 May 2014 17:33:59 +0000 (17:33 +0000)]
Merge "Fix NPE in CountdownSoundPlayer." into ub-camera-everglades
Seth Raphael [Tue, 27 May 2014 16:45:26 +0000 (09:45 -0700)]
Fix NPE in CountdownSoundPlayer.
Bug:
15222673
Change-Id: I7068bbc8f4c063691647131160bf53fa4dd5f0f3
Baligh Uddin [Mon, 26 May 2014 22:03:07 +0000 (15:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I401fc80ba039b72713163157c447761666734bb8
Auto-generated-cl: translation import
Baligh Uddin [Mon, 26 May 2014 22:02:23 +0000 (15:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I69865a9c8ae65cd6bdecea6b46de2f8518866e15
Auto-generated-cl: translation import
Angus Kong [Fri, 23 May 2014 22:53:28 +0000 (22:53 +0000)]
am
7dc0fade: Merge "Restore the flash setting after HDR is off." into ub-camera-everglades
* commit '
7dc0fade17f0ee776997b7400870265a65d52dd4':
Restore the flash setting after HDR is off.
Angus Kong [Fri, 23 May 2014 22:50:22 +0000 (22:50 +0000)]
Merge "Restore the flash setting after HDR is off." into ub-camera-everglades
Angus Kong [Fri, 23 May 2014 22:31:09 +0000 (15:31 -0700)]
Restore the flash setting after HDR is off.
bug:
15162517
Change-Id: I4b159b6f9067ddde975d3b7692b781a9b18c8eed
Sam Judd [Fri, 23 May 2014 21:50:33 +0000 (21:50 +0000)]
am
8f93077d: Merge "Include signature in cache keys for Glide." into ub-camera-everglades
* commit '
8f93077d99183cb0f4d1af365e696a251d89ec4d':
Include signature in cache keys for Glide.
Sam Judd [Fri, 23 May 2014 21:47:23 +0000 (21:47 +0000)]
Merge "Include signature in cache keys for Glide." into ub-camera-everglades
Sam Judd [Fri, 23 May 2014 20:43:33 +0000 (13:43 -0700)]
Include signature in cache keys for Glide.
Bug:
14625920
Change-Id: Id010bae14ac163523215e3afad712a423aad5875
Sascha Haeberling [Fri, 23 May 2014 20:44:44 +0000 (20:44 +0000)]
am
c02d0773: Merge "Don\'t use translated strings for video sized until they\'re sane." into ub-camera-everglades
* commit '
c02d077353bcfe92f1fe4b8c642e50d4689b3528':
Don't use translated strings for video sized until they're sane.
Sascha Haeberling [Fri, 23 May 2014 20:42:56 +0000 (20:42 +0000)]
Merge "Don't use translated strings for video sized until they're sane." into ub-camera-everglades
Sascha Haeberling [Fri, 23 May 2014 19:25:51 +0000 (12:25 -0700)]
Don't use translated strings for video sized until they're sane.
Bug:
15131043
Change-Id: Ib134bee9094cb082a37133942f0606f5fb638f21
Doris Liu [Fri, 23 May 2014 19:05:27 +0000 (12:05 -0700)]
resolved conflicts for merge of
26aa92bf to ub-camera-fishlake
Change-Id: Ifa2422c520a78357b6e920b88ec5a744bb694a95
Doris Liu [Fri, 23 May 2014 01:39:46 +0000 (18:39 -0700)]
Add cling for settings button
Bug:
14683799
Change-Id: Id3785036f2b1642963dfa43f3272da314d952f2d
Angus Kong [Thu, 22 May 2014 22:57:15 +0000 (22:57 +0000)]
am
293b9628: Merge "Disable flash when HDR mode is on." into ub-camera-everglades
* commit '
293b9628a54ee3871f448e6f66fdc00d82d4adf2':
Disable flash when HDR mode is on.
Angus Kong [Thu, 22 May 2014 22:54:31 +0000 (22:54 +0000)]
Merge "Disable flash when HDR mode is on." into ub-camera-everglades
Seth Raphael [Thu, 22 May 2014 22:42:00 +0000 (22:42 +0000)]
am
b0800488: Merge "Address some code style nits." into ub-camera-everglades
* commit '
b0800488c841a3bd5238e5f9015c941c2c4f8f8c':
Address some code style nits.
Seth Raphael [Thu, 22 May 2014 22:41:59 +0000 (22:41 +0000)]
am
75b16d7d: Merge "Convert camera size settings on upgrade" into ub-camera-everglades
* commit '
75b16d7da5922cec46c1385bc3c175a09cbb1b08':
Convert camera size settings on upgrade
Seth Raphael [Thu, 22 May 2014 21:54:03 +0000 (21:54 +0000)]
Merge "Address some code style nits." into ub-camera-everglades
Seth Raphael [Thu, 22 May 2014 21:53:56 +0000 (21:53 +0000)]
Merge "Convert camera size settings on upgrade" into ub-camera-everglades
Seth Raphael [Thu, 22 May 2014 17:37:22 +0000 (10:37 -0700)]
Address some code style nits.
Change-Id: I0672216f0d2ccbd7f708a974a573a46e732d4580
Seth Raphael [Thu, 22 May 2014 16:35:19 +0000 (09:35 -0700)]
Convert camera size settings on upgrade
In older versions of the camera, the settings
wsere stored as “small”, “medium”, or “default”.
Now the app expects absolute resolutions to be
stored in the settings.
Bug:
14617489
Change-Id: I9d9373b6bc98c1c2ba25cb51de122673b3edef6a
Angus Kong [Thu, 22 May 2014 21:42:45 +0000 (14:42 -0700)]
Disable flash when HDR mode is on.
bug:
15162517
Change-Id: Ia63b36e5c83e805080ed518a1d6a9bdf686b7d44
Sascha Haeberling [Thu, 22 May 2014 18:25:58 +0000 (18:25 +0000)]
am
3538157f: Merge "Add back contentDescription for the aspect ratio image buttons." into ub-camera-everglades
* commit '
3538157ff362d7c8a074220c88a547dd529526fe':
Add back contentDescription for the aspect ratio image buttons.
Sascha Haeberling [Thu, 22 May 2014 18:23:05 +0000 (18:23 +0000)]
Merge "Add back contentDescription for the aspect ratio image buttons." into ub-camera-everglades
Sascha Haeberling [Thu, 22 May 2014 18:10:28 +0000 (11:10 -0700)]
Add back contentDescription for the aspect ratio image buttons.
Bug:
15162440
Change-Id: I1ac11ebf7a666877a56a5e08da2dd7a2827f3125
Seth Raphael [Thu, 22 May 2014 17:39:31 +0000 (17:39 +0000)]
am
73b109e7: Merge "Fix jank when switching in and out of hdr+ Also, fix alignment of grid and progress indicator" into ub-camera-everglades
* commit '
73b109e793fb8ca3c894eb3df5ee42e1f2a7e27f':
Fix jank when switching in and out of hdr+ Also, fix alignment of grid and progress indicator
Seth Raphael [Thu, 22 May 2014 17:37:04 +0000 (17:37 +0000)]
Merge "Fix jank when switching in and out of hdr+ Also, fix alignment of grid and progress indicator" into ub-camera-everglades
Seth Raphael [Thu, 22 May 2014 00:11:53 +0000 (17:11 -0700)]
Fix jank when switching in and out of hdr+
Also, fix alignment of grid and progress indicator
Bug:
15140487
Bug:
14470553
Change-Id: I09303f16b01a380e617343fa0f3cbe2c12fda147
Andy Huibers [Thu, 22 May 2014 15:20:53 +0000 (08:20 -0700)]
Change naming to indicate that date taken is in milliseconds.
Change-Id: I5c78e897113c5b1405201b29b4f6f90850112ab6
Sascha Haeberling [Wed, 21 May 2014 22:44:46 +0000 (22:44 +0000)]
am
e177717d: Merge "Make video options translatable." into ub-camera-everglades
* commit '
e177717ddb644947b913c79ada37b7ceeb32a4e3':
Make video options translatable.
Andy Huibers [Wed, 21 May 2014 22:44:45 +0000 (22:44 +0000)]
am
404126e3: Merge "Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up opening of Settings page." into ub-camera-everglades
* commit '
404126e35045c82ca89a090407cd3ad4a8cf2c3b':
Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up opening of Settings page.
Sascha Haeberling [Wed, 21 May 2014 22:41:30 +0000 (22:41 +0000)]
Merge "Make video options translatable." into ub-camera-everglades
Sascha Haeberling [Wed, 21 May 2014 22:33:51 +0000 (15:33 -0700)]
Make video options translatable.
Bug:
15131043
Change-Id: I0613be0497c2a03d4c6483c070f4821fd33c5e10
Doris Liu [Wed, 21 May 2014 21:43:25 +0000 (21:43 +0000)]
am
6809eb84: Freeze the screen during camera switch to hide visual distraction
* commit '
6809eb840f358430d3032c0532fb42d6dcfd06ef':
Freeze the screen during camera switch to hide visual distraction
Spike Sprague [Wed, 21 May 2014 21:43:24 +0000 (21:43 +0000)]
am
42c07cc1: Merge "added Filmstrip viewtype tags for session, secure album placeholder, and camera preview" into ub-camera-everglades
* commit '
42c07cc1cca3460c67a4243747074c822e11025f':
added Filmstrip viewtype tags for session, secure album placeholder, and camera preview
Andy Huibers [Wed, 21 May 2014 21:43:23 +0000 (21:43 +0000)]
am
489293d4: Merge "Add timer duration to UsageStatistics." into ub-camera-everglades
* commit '
489293d47c7c9f8e63b3462c87fe8e30ebe138e8':
Add timer duration to UsageStatistics.
Angus Kong [Wed, 21 May 2014 21:43:23 +0000 (21:43 +0000)]
am
ff988f23: Merge "Reset the decoder in ZoomView when data updated." into ub-camera-everglades
* commit '
ff988f235df9d4d8c26a976be2c57ede41d7f7b6':
Reset the decoder in ZoomView when data updated.
Angus Kong [Wed, 21 May 2014 21:43:22 +0000 (21:43 +0000)]
am
cfe9acc2: Ignore metadata update callback after paused.
* commit '
cfe9acc23fcc5f2c00dde46e7e5c3c5192f5e9f0':
Ignore metadata update callback after paused.
Seth Raphael [Wed, 21 May 2014 21:43:22 +0000 (21:43 +0000)]
am
6fe6beb5: Merge "Fix the build" into ub-camera-everglades
* commit '
6fe6beb57c56547d88e96e312f623a9e1eeafad7':
Fix the build
Seth Raphael [Wed, 21 May 2014 21:40:56 +0000 (14:40 -0700)]
Merge commit '
3cfd962f' into manualmerge
Conflicts:
src/com/android/camera/app/CameraAppUI.java
Change-Id: I662798190c39dc889291a6eb3add77244875467f
Andy Huibers [Wed, 21 May 2014 21:40:08 +0000 (21:40 +0000)]
Merge "Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up opening of Settings page." into ub-camera-everglades
Baligh Uddin [Wed, 21 May 2014 21:29:01 +0000 (21:29 +0000)]
am
64776e64: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
* commit '
64776e64d758342f58252e17e8d86f76c18f23b3':
Import translations. DO NOT MERGE
Erin Dahlgren [Wed, 21 May 2014 21:29:01 +0000 (21:29 +0000)]
am
0b283b41: Merge "Maximize space for Large Text in aspect ratio dialog." into ub-camera-everglades
* commit '
0b283b41482254254f0a17ada6415f7cc8b8c46f':
Maximize space for Large Text in aspect ratio dialog.
Sascha Haeberling [Wed, 21 May 2014 21:29:00 +0000 (21:29 +0000)]
am
b514cdea: Merge "Show timer option in HDR+ mode and as disabled." into ub-camera-everglades
* commit '
b514cdeaffca52da323481293e3b9117de04d375':
Show timer option in HDR+ mode and as disabled.
Spike Sprague [Wed, 21 May 2014 21:28:59 +0000 (21:28 +0000)]
am
6522c97a: Merge "add null check to RadioOptions set selected option" into ub-camera-everglades
* commit '
6522c97a8bbbc7834dfd9f10dba4ddef910334a7':
add null check to RadioOptions set selected option
Doris Liu [Wed, 21 May 2014 20:16:59 +0000 (13:16 -0700)]
Freeze the screen during camera switch to hide visual distraction
Bug:
14818897
Change-Id: If6df2a6d0783e27807f01f8518244df33c24647f
Sam Hasinoff [Wed, 21 May 2014 20:27:45 +0000 (13:27 -0700)]
Rename HDR+ torch to flash
For consistency, and to better reflect the meaning of the
flash button in HDR+ mode, change the naming from 'torch'
to 'flash'.
Even though flash in HDR+ mode is implemented by turning
the flash on in torch mode for a burst of frames, HDR+ flash
is closer in meaning to a regular photographic flash than
a flashlight/torch.
Bug:
15133661
Change-Id: I3ac4bb3dac455be1341575966910c2a86e29644b
Andy Huibers [Wed, 21 May 2014 05:13:54 +0000 (22:13 -0700)]
Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up
opening of Settings page.
Bug:
15090067
Change-Id: I1eea24adbf55bf6a73b02b129b725415edca859c
Spike Sprague [Wed, 21 May 2014 19:47:47 +0000 (19:47 +0000)]
Merge "added Filmstrip viewtype tags for session, secure album placeholder, and camera preview" into ub-camera-everglades
Spike Sprague [Wed, 21 May 2014 19:13:51 +0000 (12:13 -0700)]
added Filmstrip viewtype tags for session, secure album placeholder, and camera preview
bug:
15136020
Change-Id: Ib9d4c93317a1c1603c6368e1f8bb03438922f4a8
Andy Huibers [Wed, 21 May 2014 18:41:43 +0000 (18:41 +0000)]
Merge "Add timer duration to UsageStatistics." into ub-camera-everglades
Angus Kong [Wed, 21 May 2014 18:41:05 +0000 (18:41 +0000)]
Merge "Reset the decoder in ZoomView when data updated." into ub-camera-everglades
Angus Kong [Tue, 20 May 2014 17:57:45 +0000 (10:57 -0700)]
Reset the decoder in ZoomView when data updated.
The BitmapRegionDecoder has to be reset to load the new bitmap when the data is
updated. Also recycle() should be called when the decoder is not used anymore.
bug:
14625920
Change-Id: Ib7284059320a71adb66204c4834e5b75802142fc
Angus Kong [Wed, 21 May 2014 17:54:03 +0000 (10:54 -0700)]
Ignore metadata update callback after paused.
bug:
14814811
Change-Id: Iaa2185ce533b88b75ec13840b30a6df7c04b0ddb
Seth Raphael [Wed, 21 May 2014 17:30:52 +0000 (17:30 +0000)]
Merge "Fix the build" into ub-camera-everglades
Seth Raphael [Wed, 21 May 2014 17:28:52 +0000 (10:28 -0700)]
Fix the build
Change-Id: Ib3cc2c6f63fae47d1c438525106a8dd4684e83af
Seth Raphael [Wed, 21 May 2014 17:20:18 +0000 (17:20 +0000)]
Merge "Add Letterboxing for HDR+" into ub-camera-everglades
Baligh Uddin [Wed, 21 May 2014 15:42:37 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
Baligh Uddin [Wed, 21 May 2014 15:42:34 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Seth Raphael [Tue, 20 May 2014 20:19:16 +0000 (13:19 -0700)]
Add Letterboxing for HDR+
Bug:
14470553
Change-Id: I37d9270b5ad2917c8c19a8aa4abc04967f03621c
Andy Huibers [Wed, 21 May 2014 06:03:18 +0000 (23:03 -0700)]
Add timer duration to UsageStatistics.
Bug:
14364757
Change-Id: I74505834d4d7b94154722c63cf52110d410c955b
Erin Dahlgren [Wed, 21 May 2014 01:11:30 +0000 (01:11 +0000)]
Merge "Maximize space for Large Text in aspect ratio dialog." into ub-camera-everglades
Erin Dahlgren [Wed, 21 May 2014 00:53:23 +0000 (17:53 -0700)]
Maximize space for Large Text in aspect ratio dialog.
This evenly places the vertical element in portrait mode of
the aspect ratio dialog. This gives the maximum space for
translations. If the translations don't fit, it is because
we are taking up all of the space on the screen.
Tested:
French, German, Turkish, English
In both Large Text and normal Text mode.
Bug:
14993598
Change-Id: I76ce1c00bbbb05733211d6e498a8bcf44777933a
Sascha Haeberling [Wed, 21 May 2014 00:41:07 +0000 (00:41 +0000)]
Merge "Show timer option in HDR+ mode and as disabled." into ub-camera-everglades
Sascha Haeberling [Tue, 20 May 2014 23:28:11 +0000 (16:28 -0700)]
Show timer option in HDR+ mode and as disabled.
Bug:
15089347
Change-Id: I366cd0b553808d55136c141bc1efec6ada9ee9b0
Spike Sprague [Wed, 21 May 2014 00:32:44 +0000 (00:32 +0000)]
Merge "add null check to RadioOptions set selected option" into ub-camera-everglades
Seth Raphael [Tue, 20 May 2014 23:45:36 +0000 (23:45 +0000)]
am
ffc06a4e: Merge "Preparatory commit for 16:9 hdr+" into ub-camera-everglades
* commit '
ffc06a4e9d20712c216b93878e16feaaa291bbf5':
Preparatory commit for 16:9 hdr+
Spike Sprague [Tue, 20 May 2014 23:45:35 +0000 (23:45 +0000)]
am
0bd76752: Merge "a little string resource cleanup" into ub-camera-everglades
* commit '
0bd76752a3bce1052cd6d12db6b310a201727aa9':
a little string resource cleanup
Doris Liu [Tue, 20 May 2014 23:45:34 +0000 (23:45 +0000)]
am
47b8baa1: Merge "Change timer icon position" into ub-camera-everglades
* commit '
47b8baa1b04e3da92b965b7d6b0929fc24ebc940':
Change timer icon position
Seth Raphael [Tue, 20 May 2014 23:43:44 +0000 (23:43 +0000)]
Merge "Preparatory commit for 16:9 hdr+" into ub-camera-everglades
Spike Sprague [Tue, 20 May 2014 22:36:52 +0000 (15:36 -0700)]
add null check to RadioOptions set selected option
bug:
15080601
Change-Id: Icbe0baedc0f629ec0946ea6f94862d29edbb4fce
Spike Sprague [Tue, 20 May 2014 23:30:53 +0000 (23:30 +0000)]
Merge "a little string resource cleanup" into ub-camera-everglades
Spike Sprague [Tue, 20 May 2014 23:07:12 +0000 (16:07 -0700)]
a little string resource cleanup
bug:
12894481
Change-Id: I7f5ac1fce49b875161c1b728c0f8a6bd09c2c3f6
Doris Liu [Tue, 20 May 2014 22:52:48 +0000 (22:52 +0000)]
Merge "Change timer icon position" into ub-camera-everglades
Doris Liu [Tue, 20 May 2014 22:48:48 +0000 (15:48 -0700)]
Change timer icon position
Bug:
15101701
Change-Id: I721ee385daacb104c6fd473d80b68792b56ad8ed
Doris Liu [Tue, 20 May 2014 22:28:10 +0000 (22:28 +0000)]
am
cf404d02: Merge "Fix mode list layout issue after initial aspect ratio selection" into ub-camera-everglades
* commit '
cf404d02a998629bda92a05dfb2bcb9c800e693a':
Fix mode list layout issue after initial aspect ratio selection
Doris Liu [Tue, 20 May 2014 22:24:42 +0000 (22:24 +0000)]
Merge "Fix mode list layout issue after initial aspect ratio selection" into ub-camera-everglades
Sascha Haeberling [Tue, 20 May 2014 22:17:02 +0000 (22:17 +0000)]
am
d849d5f0: Merge "Update cling in filmstrip at the right times." into ub-camera-everglades
* commit '
d849d5f00977194276053396d8bceb438b0bbea6':
Update cling in filmstrip at the right times.
Sascha Haeberling [Tue, 20 May 2014 22:14:46 +0000 (22:14 +0000)]
Merge "Update cling in filmstrip at the right times." into ub-camera-everglades
Doris Liu [Tue, 20 May 2014 22:03:24 +0000 (15:03 -0700)]
Fix mode list layout issue after initial aspect ratio selection
Bug:
15088302
Change-Id: I10e6dcc7ce026c3ebb3fa676ebf0b7d7e0eda732
Spike Sprague [Tue, 20 May 2014 22:07:54 +0000 (22:07 +0000)]
am
99ec3b37: Merge "make recycleView() look at the view type passed in (via a view tag) instead of relying on the data adapter" into ub-camera-everglades
* commit '
99ec3b376058a7beef96490fda29cea987ee7b04':
make recycleView() look at the view type passed in (via a view tag) instead of relying on the data adapter
Spike Sprague [Tue, 20 May 2014 22:05:24 +0000 (22:05 +0000)]
Merge "make recycleView() look at the view type passed in (via a view tag) instead of relying on the data adapter" into ub-camera-everglades
Spike Sprague [Tue, 20 May 2014 20:42:37 +0000 (13:42 -0700)]
make recycleView() look at the view type passed in
(via a view tag) instead of relying on the data adapter
bug:
14599203
Change-Id: I5809aef03a0b6e29dd80512ee0593aac0001d0a5
Alan Newberger [Tue, 20 May 2014 21:49:45 +0000 (21:49 +0000)]
am
36ea98a7: Merge "Port Glide loading to use Files rather than String URIs" into ub-camera-everglades
* commit '
36ea98a790be5bd08817a8b194bd9be48b6be3de':
Port Glide loading to use Files rather than String URIs
Alan Newberger [Tue, 20 May 2014 21:47:50 +0000 (21:47 +0000)]
Merge "Port Glide loading to use Files rather than String URIs" into ub-camera-everglades
Alan Newberger [Tue, 20 May 2014 21:34:53 +0000 (14:34 -0700)]
Port Glide loading to use Files rather than String URIs
We encountered a bug with colons in filenames. Current integration
passes file paths as basic URIs into Glide, which then gets
confuses detecting paths with colons as they parse into schemes.
This CL instead bakes the assumption that LocalMedia paths are
file paths, into the app level. Tested with all modes and
captures, formerly buggy filmstrip items now display.
Bug:
15025417
Change-Id: I91efa1e7b66d630e402b23a36b2a05c9783370a3
Sascha Haeberling [Tue, 20 May 2014 21:36:30 +0000 (14:36 -0700)]
Update cling in filmstrip at the right times.
Bug:
14885868
Change-Id: I5ffc6eb59c949cb6317923eba05cedb0f4065629
Doris Liu [Tue, 20 May 2014 21:32:31 +0000 (21:32 +0000)]
am
c40bb33f: Merge "Fix squished preview after startup apsect ratio selection" into ub-camera-everglades
* commit '
c40bb33fef476f0edccc2234520eb48f49571118':
Fix squished preview after startup apsect ratio selection
Doris Liu [Tue, 20 May 2014 21:30:03 +0000 (21:30 +0000)]
Merge "Fix squished preview after startup apsect ratio selection" into ub-camera-everglades
Doris Liu [Tue, 20 May 2014 19:43:56 +0000 (12:43 -0700)]
Fix squished preview after startup apsect ratio selection
Bug:
15085976
Change-Id: I7f787799201caf13da42d4f7b56806a494ae7c80
Seth Raphael [Tue, 20 May 2014 04:46:04 +0000 (21:46 -0700)]
Preparatory commit for 16:9 hdr+
This exposes some necessary functions for hdr+
to go 16:9. It allows you to pass a preview matrix
that is pre scaled, so that hdr+ can calculate its
own matrix
Bug:
14470553
Change-Id: I56f2c033ff58a9ff6793c6ee4d2317cb9ce5065a
Sam Hasinoff [Tue, 20 May 2014 20:00:28 +0000 (20:00 +0000)]
Merge "Add new hdr plus flash setting." into ub-camera-fishlake
Baligh Uddin [Tue, 20 May 2014 19:13:37 +0000 (12:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9848db1ebbfbc1dda81dda9702e7ecadf411d159
Auto-generated-cl: translation import
OSDN Git Service
