OSDN Git Service
Baligh Uddin [Sun, 15 Jun 2014 13:13:46 +0000 (13:13 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Baligh Uddin [Fri, 13 Jun 2014 22:27:49 +0000 (15:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ieb03ca010902aff60a08f74e382fa0e22bde4bd3
Auto-generated-cl: translation import
Doris Liu [Thu, 12 Jun 2014 23:14:38 +0000 (16:14 -0700)]
Remove workaround for K-MR1 that registers redundant preview callbacks
as MR2 has already started rollout, and is expected to finish before F release.
Change-Id: Ifa37a91f5270bb820d5bfb8db03bf21a71f225ff
Kevin Gabayan [Fri, 13 Jun 2014 20:50:13 +0000 (20:50 +0000)]
Merge "Revert "MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601"" into ub-camera-fishlake
Kevin Gabayan [Fri, 13 Jun 2014 20:49:48 +0000 (20:49 +0000)]
Revert "MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601"
This reverts commit
ebba3288da5628c9ea7579b63139aa7b7312e137.
Change-Id: Ie82d81aa0440339aba1b762fa78caeb7f7d55312
Kevin Gabayan [Mon, 2 Jun 2014 21:48:20 +0000 (14:48 -0700)]
MotionManager for motion-aware focus unlock in Camera2
Bug:
14222601
Change-Id: Id118e12c8f789c74c8fc2e32ec208ff943b97e49
Spike Sprague [Wed, 11 Jun 2014 20:45:43 +0000 (20:45 +0000)]
Merge "intent captrue review gets its own ImageView! instead of relying on a stopped preview TextureView" into ub-camera-fishlake
Kevin Gabayan [Fri, 13 Jun 2014 19:44:53 +0000 (19:44 +0000)]
Merge "MotionManager for motion-aware focus unlock in Camera2 Bug:
14222601" into ub-camera-fishlake
Erin Dahlgren [Fri, 13 Jun 2014 18:26:09 +0000 (11:26 -0700)]
Adjust the GoogleHelp interface so Camera2 will build
Change-Id: I7aea16e8e967bd671cee2b07ee7cd93865df8cc5
Erin Dahlgren [Fri, 13 Jun 2014 17:42:26 +0000 (17:42 +0000)]
Merge "GoogleHelp affordance in CameraSettingsActivity" into ub-camera-fishlake
Erin Dahlgren [Mon, 9 Jun 2014 21:37:34 +0000 (14:37 -0700)]
GoogleHelp affordance in CameraSettingsActivity
Uses the first Account available to launch a GoogleHelp
Activity from the CameraSettingsActivity. We remove the
affordance if the phone has no registered Accounts.
Bug:
8426295
Change-Id: I02f8f0accd76c19d42cbbd68c4043c174f13d424
Baligh Uddin [Tue, 10 Jun 2014 17:13:38 +0000 (17:13 +0000)]
am
a77630c8: (-s ours) Import translations. DO NOT MERGE
* commit '
a77630c81f874d93ab0563f722f20f62a5682fdb':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 10 Jun 2014 17:11:58 +0000 (17:11 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Spike Sprague [Thu, 22 May 2014 21:40:53 +0000 (14:40 -0700)]
intent captrue review gets its own ImageView!
instead of relying on a stopped preview TextureView
bug:
13526027
Change-Id: I40d2a97d15ed5d27b0000fa0a6d96af03ad55cf9
Baligh Uddin [Mon, 9 Jun 2014 19:51:16 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I68c296f9c040ad1a8e2badb6eacda78af7dffe7e
Auto-generated-cl: translation import
Baligh Uddin [Mon, 9 Jun 2014 19:50:26 +0000 (12:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifcad76652c0875b764733db288edea03f043c8b0
Auto-generated-cl: translation import
Spike Sprague [Mon, 9 Jun 2014 17:40:42 +0000 (17:40 +0000)]
Merge "CL in preparation of the s/Theme.Quantum/Theme.Material/ change" into ub-camera-fishlake
Spike Sprague [Fri, 6 Jun 2014 21:58:41 +0000 (14:58 -0700)]
CL in preparation of the s/Theme.Quantum/Theme.Material/ change
Change-Id: I416320dadc36cf0f0c76b2755ef9339838b39e13
Baligh Uddin [Sat, 7 Jun 2014 04:26:52 +0000 (04:26 +0000)]
am
8979bf79: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
* commit '
8979bf79a7ea5ec0163ed50df7c9b0261c67ba26':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 7 Jun 2014 04:26:52 +0000 (04:26 +0000)]
am
6a710139: (-s ours) Import translations. DO NOT MERGE
* commit '
6a710139c464b50faad802150785f17775d06a48':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 7 Jun 2014 04:12:41 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
Baligh Uddin [Sat, 7 Jun 2014 04:12:40 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Baligh Uddin [Sat, 7 Jun 2014 04:12:21 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Spike Sprague [Thu, 5 Jun 2014 17:49:30 +0000 (17:49 +0000)]
Merge "add Quantum theme to styles that were Holo (shows on android L, backwards compatible for K)" into ub-camera-fishlake
Spike Sprague [Wed, 4 Jun 2014 20:22:10 +0000 (13:22 -0700)]
add Quantum theme to styles that were Holo
(shows on android L, backwards compatible for K)
bug:
15345347
Change-Id: I1044e10e00ff136b0b5c095a7a9f4e56fd75c49a
Baligh Uddin [Wed, 4 Jun 2014 19:32:07 +0000 (12:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I102e1be18ad21865e4d292a87c8c5ebfe1e4cff0
Auto-generated-cl: translation import
Baligh Uddin [Wed, 4 Jun 2014 19:31:10 +0000 (12:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0dc60f6fc74d80bbbca4ed390e2065e1e90166ea
Auto-generated-cl: translation import
Baligh Uddin [Wed, 4 Jun 2014 19:28:35 +0000 (12:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27f224443b51df2971493ffd12fedf83ce261c05
Auto-generated-cl: translation import
Baligh Uddin [Wed, 4 Jun 2014 19:27:44 +0000 (12:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic312c304754442fb29c4f3151f7a0ff5cb043ffd
Auto-generated-cl: translation import
Baligh Uddin [Wed, 4 Jun 2014 04:53:48 +0000 (04:53 +0000)]
am
97ab5266: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
* commit '
97ab5266dbfe130944728fef86058ab6583595ef':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Jun 2014 04:53:47 +0000 (04:53 +0000)]
am
5adb7fc5: (-s ours) Import translations. DO NOT MERGE
* commit '
5adb7fc5407e23244ab6c9b53290a29d82da7776':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Jun 2014 04:50:23 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
Baligh Uddin [Wed, 4 Jun 2014 04:50:16 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Baligh Uddin [Wed, 4 Jun 2014 04:50:08 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Baligh Uddin [Mon, 2 Jun 2014 20:41:14 +0000 (13:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I409bd9865c2823ca1e822eca638d4af579e3e7dd
Auto-generated-cl: translation import
Baligh Uddin [Mon, 2 Jun 2014 20:40:27 +0000 (13:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf334424ca5efd7ee7201b779c1eba028a39b269
Auto-generated-cl: translation import
Baligh Uddin [Mon, 2 Jun 2014 20:38:13 +0000 (13:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7447f4cc622840cb2ae4e13fd3d0fac1f93b40cb
Auto-generated-cl: translation import
Baligh Uddin [Mon, 2 Jun 2014 20:37:18 +0000 (13:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9752938f549f6839fb071ef1da037bb9c4d76cc6
Auto-generated-cl: translation import
Erin Dahlgren [Mon, 2 Jun 2014 19:26:34 +0000 (19:26 +0000)]
Merge "Timeout on wait lock and throw exception to prevent ANR." into ub-camera-fishlake
Spike Sprague [Thu, 22 May 2014 00:20:24 +0000 (17:20 -0700)]
secure camera -> gallery launch hardcoded to
launch G+ photos
bug:
15141761
Change-Id: I5009d58917bbc1ea41b01d22b4c2e0f168f6b5cc
Geoff Mendal [Wed, 28 May 2014 20:12:56 +0000 (20:12 +0000)]
am
b758e1f7: (-s ours) Import translations. DO NOT MERGE
* commit '
b758e1f7c874d03b69f08987d9f104a38b1461bd':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 May 2014 20:08:17 +0000 (13:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I77b01e3ceec1241e2bf623d19c027e0ae9d142fa
Auto-generated-cl: translation import
Geoff Mendal [Wed, 28 May 2014 20:07:30 +0000 (13:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I76ec30918ff673b26642a565be3894db87602484
Auto-generated-cl: translation import
Baligh Uddin [Tue, 27 May 2014 18:04:22 +0000 (18:04 +0000)]
am
a27e4263: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
* commit '
a27e42633b3ae306e97b830646a613f5ff91e704':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 27 May 2014 18:02:15 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
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
Baligh Uddin [Tue, 27 May 2014 17:52:52 +0000 (10:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I93478e89dc0ab82c5ba16525b74efeae88677dea
Auto-generated-cl: translation import
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
Erin Dahlgren [Fri, 23 May 2014 23:50:19 +0000 (16:50 -0700)]
Timeout on wait lock and throw exception to prevent ANR.
Change-Id: I5b0d2b8c0384d32ed0d870e5db6003991524fc38
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
OSDN Git Service
