OSDN Git Service
Baligh Uddin [Wed, 4 Jun 2014 04:53:23 +0000 (04:53 +0000)]
am
cd32e4b9: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
* commit '
cd32e4b9c0e37be25f9d49f94b9cfc32dcf80e89':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Jun 2014 04:53:23 +0000 (04:53 +0000)]
am
993b9075: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
* commit '
993b9075c383194ccd06d4ef3be781a09ab3ebfd':
Import translations. DO NOT MERGE
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:14 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
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 [Wed, 4 Jun 2014 04:50:05 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Mon, 2 Jun 2014 20:42:00 +0000 (13:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I50368d2ef080ee0bfbcfeccbaf54542c60d0d780
Auto-generated-cl: translation import
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:39:01 +0000 (13:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ee97c52c3b811326344cec02cb845b32ee88171
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
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
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
OSDN Git Service
