OSDN Git Service
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 [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: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:50:23 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
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:37:18 +0000 (13:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9752938f549f6839fb071ef1da037bb9c4d76cc6
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:02:15 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
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: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: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: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: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: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 01:39:46 +0000 (18:39 -0700)]
Add cling for settings button
Bug:
14683799
Change-Id: Id3785036f2b1642963dfa43f3272da314d952f2d
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 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: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: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
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
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
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
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
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: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: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: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: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: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: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
Baligh Uddin [Tue, 20 May 2014 19:12:49 +0000 (12:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I857898c13dc3abe007c44788077d815298edd691
Auto-generated-cl: translation import
Erin Dahlgren [Tue, 20 May 2014 18:27:58 +0000 (11:27 -0700)]
Adjust the margins around the aspect ratio dialog for Large Text.
This solution works for both normal and Large Text modes.
Bug:
14993598
Change-Id: I211dc68685ae736e1e19408cbeb42285dd17f13e
Andy Huibers [Mon, 19 May 2014 20:59:01 +0000 (13:59 -0700)]
Add grid lines and flash states to capture logging.
Bug:
14364757
Change-Id: Ibf40c041d508f4406ead273dfdcb1c051a6f83a2
Sascha Haeberling [Mon, 19 May 2014 23:43:22 +0000 (23:43 +0000)]
Merge "Only show accessibility buttons when spoken feedback is enabled." into ub-camera-everglades
Sascha Haeberling [Mon, 19 May 2014 22:41:00 +0000 (15:41 -0700)]
Only show accessibility buttons when spoken feedback is enabled.
Bug:
15082416
Change-Id: I9d953781fd9107dd81058afab183e044a784fba9
Doris Liu [Mon, 19 May 2014 22:25:10 +0000 (22:25 +0000)]
Merge "Add back countdown timer" into ub-camera-everglades
Doris Liu [Tue, 6 May 2014 01:43:26 +0000 (18:43 -0700)]
Add back countdown timer
Bug:
14222651
Change-Id: I482ec942dd9d79c4ea0432140a96ba2fc5b29c57
Sascha Haeberling [Mon, 19 May 2014 21:47:09 +0000 (14:47 -0700)]
Change the texts in the aspect ratio selector screen.
Bug:
15024081
As per request from Jake, we don't show the megapixel count anymore but
instead show whether the result is cropped or full sensor. As we limit
this screen to N4 and N5, the texts can be static to cropped 16:9 and
full-sensor 4:3.
Change-Id: I309d52c050ddbce5fe3c85db417adf79129cd141
Sascha Haeberling [Mon, 19 May 2014 21:10:08 +0000 (21:10 +0000)]
Merge "Limit start-up screen to N4 + N5" into ub-camera-everglades
Sascha Haeberling [Mon, 19 May 2014 20:46:37 +0000 (13:46 -0700)]
Update the aspect ratio selector drawables.
Bug:
15024081
Change-Id: Ie9d7f4079c615d9fcb4eff05eea726a9a3edc9fd
Sascha Haeberling [Mon, 19 May 2014 18:56:53 +0000 (11:56 -0700)]
Limit start-up screen to N4 + N5
Bug:
15024081
Change-Id: I1333a753bc3741d176765ab026cacc1358ab2fca
Doris Liu [Mon, 19 May 2014 19:30:59 +0000 (19:30 +0000)]
Merge "Set a preview callback with a buffer size to force update preview callback stream" into ub-camera-everglades
Doris Liu [Mon, 19 May 2014 18:53:32 +0000 (11:53 -0700)]
Set a preview callback with a buffer size to force update preview callback stream
This is the workaround for the same issue that causes b/
12210027. It was fixed
in KitKat MR2, so we are applying the workaround on KitKat and MR1.
Bug:
14954941
Change-Id: Ifba3f9d47769884e81a41277f858e5c7aef41803
Erin Dahlgren [Fri, 16 May 2014 21:53:21 +0000 (14:53 -0700)]
Add hooks for disabling/enable the mode options toggle between captures.
Bug:
13982230
Change-Id: Ib2582420c2f7fd0038555aed0b23bfa8f151721b
Sascha Haeberling [Sat, 17 May 2014 01:31:33 +0000 (18:31 -0700)]
Fix the build, we need button_cling in camera2.
Change-Id: I8150d87567ed0e8598e59a806859b00bf51b70c8
Sascha Haeberling [Fri, 16 May 2014 23:20:57 +0000 (23:20 +0000)]
Merge "Unify the blue button styles across the app." into ub-camera-everglades
Sascha Haeberling [Fri, 16 May 2014 22:49:53 +0000 (15:49 -0700)]
Unify the blue button styles across the app.
Bug:
14901436
Change-Id: I9603806a47c41896e25d2e5509a898758e82aebd
Angus Kong [Fri, 16 May 2014 19:12:40 +0000 (19:12 +0000)]
Merge "Update session data properly." into ub-camera-everglades
Alan Newberger [Fri, 16 May 2014 18:52:27 +0000 (18:52 +0000)]
Merge "Avoid creating dialog on an activity that is finishing" into ub-camera-everglades
Alan Newberger [Fri, 16 May 2014 18:45:14 +0000 (11:45 -0700)]
Avoid creating dialog on an activity that is finishing
We have some stack traces in the wild indicating we are trying to
create a dialog on the CameraActivity while it is not in a valid
state to attach views. Adding an isFinishing check, see more info
in the following issue:
Bug:
13967353
Change-Id: Ic3c45fa362408f2641527497b15f67686d3aed79
Angus Kong [Fri, 16 May 2014 18:06:35 +0000 (11:06 -0700)]
Update session data properly.
bug:
14969759
Change-Id: I39ba063e23482a03cf108931b6c686755dbec91e
Sascha Haeberling [Fri, 16 May 2014 15:22:00 +0000 (08:22 -0700)]
Format the megapixel value on the start screen same as settings.
Bug:
14955075
Change-Id: I1a57a0f9c884ce62cae97c77323c19c390fe2ee7
Sascha Haeberling [Thu, 15 May 2014 23:01:14 +0000 (23:01 +0000)]
Merge "Make new start-up screen accessible." into ub-camera-everglades
Sascha Haeberling [Thu, 15 May 2014 22:53:40 +0000 (22:53 +0000)]
Merge "Close mode options and mode list when needed." into ub-camera-everglades
Sascha Haeberling [Thu, 15 May 2014 21:45:02 +0000 (14:45 -0700)]
Close mode options and mode list when needed.
Bug:
14834384
Bug:
14834783
Change-Id: Id96859d57a84c66489a0e764ba2950cc47f7c886
Spike Sprague [Thu, 15 May 2014 22:47:29 +0000 (22:47 +0000)]
Merge "fix some lingering exposure comp value calculation errors hide exposure comp button if not supported in hardware" into ub-camera-everglades
Spike Sprague [Thu, 15 May 2014 22:32:49 +0000 (15:32 -0700)]
fix some lingering exposure comp value calculation errors
hide exposure comp button if not supported in hardware
bug:
13967706
Change-Id: I6aa6963929c00ed06122fa2e2dfd778844bcc280
Sascha Haeberling [Thu, 15 May 2014 18:52:51 +0000 (11:52 -0700)]
Make new start-up screen accessible.
Bug:
14994854
- Make the text on locaiton dialog a label of checkbox
- Add content description to aspect ratio image buttons
Change-Id: Idbb633205eec35be2ec891e7c8ea079475c5ea3d
Seth Raphael [Thu, 15 May 2014 17:56:19 +0000 (10:56 -0700)]
Use approximate descriptions of aspect ratios.
165:98 should be considered close enough and
described as 16:9
Bug:
14970245
Change-Id: I75ca9507e453d057c6db3e4fd99cebb0ee01d4f7
Spike Sprague [Thu, 15 May 2014 17:34:51 +0000 (17:34 +0000)]
Merge "pass FilmstripView accessibilty focus events to children" into ub-camera-everglades
Spike Sprague [Tue, 13 May 2014 17:50:49 +0000 (10:50 -0700)]
pass FilmstripView accessibilty focus events to children
bug:
14815653
Change-Id: I48c381f87600f2eb11ce29942cdbc7e5f2dae446
OSDN Git Service
