OSDN Git Service
Spike Sprague [Tue, 22 Jul 2014 18:23:05 +0000 (18:23 +0000)]
Merge "filmstip quantumification" into ub-camera-glacier
Spike Sprague [Mon, 21 Jul 2014 20:19:10 +0000 (13:19 -0700)]
filmstip quantumification
bug:
16456504
Change-Id: I7c4c309671ae08179f22c35ffa7f3f9f5b4ee7ce
Baligh Uddin [Tue, 22 Jul 2014 17:18:30 +0000 (17:18 +0000)]
am
373c970d: (-s ours) Import translations. DO NOT MERGE
* commit '
373c970d5d2c7877890f912e072f232438831b76':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Jul 2014 03:46:21 +0000 (20:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27bcda4f98bb79dca1e4e06cd5b4abd036245357
Auto-generated-cl: translation import
Baligh Uddin [Tue, 22 Jul 2014 03:45:09 +0000 (20:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I90b31e5a34b7ae3463e8006f501b45b031c58025
Auto-generated-cl: translation import
Spike Sprague [Mon, 21 Jul 2014 18:57:21 +0000 (18:57 +0000)]
Merge "fixing mode -> color mapping" into ub-camera-glacier
Spike Sprague [Mon, 21 Jul 2014 18:55:36 +0000 (11:55 -0700)]
fixing mode -> color mapping
bug:
16123081
Change-Id: I3694e575e8461f4faf6dec076f5afe2a320eaecc
Sascha Haeberling [Mon, 21 Jul 2014 18:31:13 +0000 (11:31 -0700)]
Make sure to set an audio source using MediaRecorder.
Bug:
16454543
Change-Id: Ic3bfb14bd7d37e5feda43e50eafcf2e687dee0ce
Sascha Haeberling [Thu, 17 Jul 2014 21:06:02 +0000 (14:06 -0700)]
Speed up lockscreen start-up time.
Bug:
16375664
- Avoid unnecessary camera open/close loop (~350ms)
- Don't load sounds and do other init work when not needed.
Change-Id: I5d297913dcbd3100034c3915119cc3c818f330d3
Spike Sprague [Fri, 18 Jul 2014 18:36:32 +0000 (18:36 +0000)]
Merge "clean out timelapse stuff from codebase" into ub-camera-glacier
Alan Newberger [Thu, 17 Jul 2014 16:55:34 +0000 (09:55 -0700)]
Route switch preferences through SettingManager
This CL adds a custom switch which uses SettingsManager to control
boolean settings. It relocates SettingsManager to the application
to allow access from multiple activities.
Bug:
16327665
Change-Id: I6af084a4443ea79ca270dab382a66ea527897a38
Sascha Haeberling [Thu, 17 Jul 2014 22:05:26 +0000 (15:05 -0700)]
resolved conflicts for merge of
dcea7639 to ub-camera-glacier
Change-Id: I151b172d3e415a529375351ba8c038308e593cd5
Spike Sprague [Wed, 16 Jul 2014 22:47:32 +0000 (15:47 -0700)]
clean out timelapse stuff from codebase
Change-Id: Ibcf07302f3eea2800d1f36c918ffe1c3d93b8018
Spike Sprague [Wed, 16 Jul 2014 21:33:59 +0000 (14:33 -0700)]
updating mode selector colors
bug:
16123081
Change-Id: Ibe0b886f73fa934a94e7a1b534a67b56fdeb60d7
Sascha Haeberling [Tue, 15 Jul 2014 23:48:20 +0000 (16:48 -0700)]
Store temp session data in 'cache' directory, not data.
Bug:
16010129
Change-Id: I06ff67d2917580e1f44bdb6686a9371239bccfef
Sascha Haeberling [Tue, 15 Jul 2014 15:54:40 +0000 (08:54 -0700)]
Don't try to show storage hint if activity is no longer running.
Bug:
16198208
Change-Id: I6a6c92286c98cff8b55434a7a0d011bf5043d183
Sascha Haeberling [Tue, 15 Jul 2014 00:00:52 +0000 (00:00 +0000)]
am
3c6de14b: Work in #onPictureTaken will be on a forked, so no need to fork the call.
* commit '
3c6de14b6e771b6eab84428d53543b066324b8f0':
Work in #onPictureTaken will be on a forked, so no need to fork the call.
Sascha Haeberling [Mon, 14 Jul 2014 23:18:38 +0000 (16:18 -0700)]
Don't crash if filename could not be found for ID.
Bug:
15890671
This is only used for logging but Monkey's crash on master.
Change-Id: I0d08d0a82fd6a7073c7aa1924c21beeb66859577
Sascha Haeberling [Mon, 14 Jul 2014 19:23:36 +0000 (12:23 -0700)]
Work in #onPictureTaken will be on a forked, so no need to fork the call.
Bug:
16217551
Change-Id: Id9f6e129d402d5e58cf5f63380c5bf13ab996431
Sascha Haeberling [Fri, 11 Jul 2014 17:26:29 +0000 (17:26 +0000)]
am
c17a5664: Prevent a monkey-generated crash.
* commit '
c17a56643186dee671bf6e7dec54cd558a7ecb2f':
Prevent a monkey-generated crash.
Sascha Haeberling [Thu, 10 Jul 2014 21:43:13 +0000 (14:43 -0700)]
Prevent a monkey-generated crash.
Bug:
16191092
Change-Id: Ic6488381ed6f80184401c925dd6891126736019f
Sol Boucher [Wed, 9 Jul 2014 22:58:52 +0000 (22:58 +0000)]
Merge "Eliminate unnecessary context in FragmentActivity constructor" into ub-camera-glacier
Sol Boucher [Wed, 9 Jul 2014 22:44:00 +0000 (15:44 -0700)]
Eliminate unnecessary context in FragmentActivity constructor
Use the one that was already being obtained from getApplicationContext() instead
Change-Id: I1e0a62449b3ac9d02404fa623c0c62063069aae2
Sam Judd [Wed, 9 Jul 2014 18:17:26 +0000 (11:17 -0700)]
Fix crash when dimensions are <= 0.
Change-Id: I78531a025cf209b59f768ab38ea96ce0fe44c401
Sol Boucher [Wed, 9 Jul 2014 21:35:09 +0000 (21:35 +0000)]
Merge "Make app build against updated frameworks/ex portability library" into ub-camera-glacier
Sam Judd [Wed, 9 Jul 2014 20:00:59 +0000 (13:00 -0700)]
Merge commit '
acfad92c' into merge_crash_fix
Conflicts:
src/com/android/camera/data/LocalMediaData.java
Change-Id: I7000054e53f1258a3de2253a816b091689d62da5
Sol Boucher [Wed, 2 Jul 2014 17:37:18 +0000 (10:37 -0700)]
Make app build against updated frameworks/ex portability library
This is necessary to make the app build and run against the updated library, and
specifically the CameraAgentFactory, CameraAgent, and CameraAgent.CameraProxy
contracts.
Change-Id: I2dde04df7ae552eec022d31f78b0ce05525282cd
Spike Sprague [Mon, 7 Jul 2014 22:28:31 +0000 (22:28 +0000)]
am
1d1af906: Merge "previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button" into ub-camera-fishlake
* commit '
1d1af90609b7a896f74dda83b7f22f91b50e70cf':
previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button
Spike Sprague [Mon, 7 Jul 2014 21:41:12 +0000 (21:41 +0000)]
am
04ebcbba: make ProgressOverlay obey left and top of its bounding Rect
* commit '
04ebcbbab90b1ccb263247c39b45ade232de7b0a':
make ProgressOverlay obey left and top of its bounding Rect
Spike Sprague [Mon, 7 Jul 2014 21:34:09 +0000 (14:34 -0700)]
make ProgressOverlay obey left and top of its bounding Rect
bug:
16061226
Change-Id: If2e3748963191963f6e9223699cb0144a9710d5d
Spike Sprague [Mon, 7 Jul 2014 19:42:11 +0000 (19:42 +0000)]
am
90defd62: Merge "disable shutter button when mode list is open" into ub-camera-fishlake
* commit '
90defd62b3d0eed8cf3906c7f8394fc9ad401759':
disable shutter button when mode list is open
Sascha Haeberling [Mon, 7 Jul 2014 18:34:19 +0000 (11:34 -0700)]
resolved conflicts for merge of
ff899495 to ub-camera-glacier
Change-Id: Iffdde32e6f2b70d6a2fc560c6347a159678a7c60
Sam Judd [Mon, 7 Jul 2014 18:07:19 +0000 (18:07 +0000)]
am
950fb6b8: Merge "Ensure photosphere/pano thumbs are always shown." into ub-camera-fishlake
* commit '
950fb6b8e8e7663f09428f25f2f788a3a191baef':
Ensure photosphere/pano thumbs are always shown.
Spike Sprague [Mon, 7 Jul 2014 22:24:56 +0000 (22:24 +0000)]
Merge "previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button" into ub-camera-fishlake
Spike Sprague [Mon, 7 Jul 2014 22:13:27 +0000 (15:13 -0700)]
previous CL ag/496035 disabled shutter button clicks during shimmy,
scaling back a11y disabling on shutter button
Change-Id: I1c788ccbd946b43774f9f4a7bf629c4e019f20f9
Sascha Haeberling [Mon, 7 Jul 2014 18:07:59 +0000 (18:07 +0000)]
Merge "Fix regression: Update summary when quality settings change." into ub-camera-fishlake
Sascha Haeberling [Mon, 7 Jul 2014 17:59:19 +0000 (10:59 -0700)]
Fix regression: Update summary when quality settings change.
Bug:
16062378
Change-Id: I8532ac5bcc73a36b9666903d985bf13424819a0f
Sam Judd [Mon, 7 Jul 2014 18:03:06 +0000 (18:03 +0000)]
Merge "Ensure photosphere/pano thumbs are always shown." into ub-camera-fishlake
Sam Judd [Mon, 7 Jul 2014 17:40:12 +0000 (10:40 -0700)]
Ensure photosphere/pano thumbs are always shown.
Bug:
16061224
Change-Id: I93f1dd8a094cd4f00d06c02c13f51ef8545aa26c
Spike Sprague [Mon, 7 Jul 2014 17:31:52 +0000 (17:31 +0000)]
am
1e89c919: Merge "disable talkback a11y navigation on mode list during shimmy" into ub-camera-fishlake
* commit '
1e89c9196d91175bcc3d878c95b230d93cd5280c':
disable talkback a11y navigation on mode list during shimmy
Baligh Uddin [Sun, 6 Jul 2014 21:27:26 +0000 (21:27 +0000)]
am
3c866166: (-s ours) am
c0f06431: (-s ours) am
cb0f330b: (-s ours) Import translations. DO NOT MERGE
* commit '
3c8661666ceb9049061ebf2b120cb51276c1cece':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:24:28 +0000 (21:24 +0000)]
am
c0f06431: (-s ours) am
cb0f330b: (-s ours) Import translations. DO NOT MERGE
* commit '
c0f064313c2fa318a4c21947ab57e7c1e3c67fc9':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:24:15 +0000 (21:24 +0000)]
am
aca13396: (-s ours) am
2ee019be: (-s ours) Import translations. DO NOT MERGE
* commit '
aca13396a6d18542c9550f7ff5b6a262c4e1937d':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:21 +0000 (21:21 +0000)]
am
2ee019be: (-s ours) Import translations. DO NOT MERGE
* commit '
2ee019bee75241d3e1f338d04491900a65c1c79f':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:08 +0000 (21:21 +0000)]
am
cb0f330b: (-s ours) Import translations. DO NOT MERGE
* commit '
cb0f330b34124e72504e58e9a15de5cd2e08a2dd':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:07 +0000 (21:21 +0000)]
am
e6828fb6: (-s ours) Import translations. DO NOT MERGE
* commit '
e6828fb681ad7e70afaaf9cee54300f870b51cff':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 14:08:18 +0000 (07:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1c7a134d69f9dfe74dd2fa8dfbf4b807d455d211
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 14:06:58 +0000 (07:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia3403c2c617c86e31b946c9343176c600da4349d
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 14:06:20 +0000 (07:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: If1c48d20759de0043d1a2252af132382c02f1b5a
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 14:00:18 +0000 (07:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I90257ae7d06ce7585fa4293cbe18703d2e9c1e6c
Auto-generated-cl: translation import
Spike Sprague [Mon, 7 Jul 2014 19:14:17 +0000 (19:14 +0000)]
Merge "disable shutter button when mode list is open" into ub-camera-fishlake
Spike Sprague [Thu, 3 Jul 2014 00:08:43 +0000 (17:08 -0700)]
disable shutter button when mode list is open
bug:
16042076
Change-Id: I0b8fad7b40bb348a3be0fa3c9457a1ceb6a49b05
Erin Dahlgren [Wed, 2 Jul 2014 17:39:17 +0000 (10:39 -0700)]
Change HDR plus flash default to off.
As Gcam is still experimenting with their flash setting,
turn it off so there is no accidental auto flash.
Change-Id: Id7a372a0b0123a43ff11d9a0ec8267e30d15a2b4
Spike Sprague [Mon, 7 Jul 2014 17:27:05 +0000 (17:27 +0000)]
Merge "disable talkback a11y navigation on mode list during shimmy" into ub-camera-fishlake
Spike Sprague [Wed, 2 Jul 2014 22:58:32 +0000 (15:58 -0700)]
disable talkback a11y navigation on mode list during shimmy
bug:
16042079
Change-Id: Ied2c91326d924bbd032853c84bba19a6dc75c992
Spike Sprague [Wed, 2 Jul 2014 18:40:49 +0000 (18:40 +0000)]
am
02b9b9af: move intent review image view to proper spot in view hierachy
* commit '
02b9b9af097ac7886ec1d23392cd87c9fbcb186f':
move intent review image view to proper spot in view hierachy
Spike Sprague [Wed, 2 Jul 2014 18:26:28 +0000 (11:26 -0700)]
move intent review image view to proper spot in view hierachy
bug:
15729563
Change-Id: Id0952399cc0577f728665843826dcc6f12c4429a
Sascha Häberling [Wed, 2 Jul 2014 18:16:27 +0000 (18:16 +0000)]
am
d2922674: Merge "Pass the real file length to MediaStore." into ub-camera-fishlake
* commit '
d2922674e622c924b288c42d8e468812ad548de2':
Pass the real file length to MediaStore.
Doris Liu [Wed, 2 Jul 2014 18:16:27 +0000 (18:16 +0000)]
am
af374822: (-s ours) Merge "DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"" into ub-camera-fishlake
* commit '
af374822959b95dd8ede91a03fa43b9bcf60cd83':
DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"
Sascha Haeberling [Wed, 2 Jul 2014 18:16:26 +0000 (18:16 +0000)]
am
aa52b3d2: Prevent crash for when newData cannot be found.
* commit '
aa52b3d28a0285b71be342158386422ed53244b2':
Prevent crash for when newData cannot be found.
Sascha Haeberling [Wed, 2 Jul 2014 17:38:50 +0000 (17:38 +0000)]
am
b46c1855: New blue for clings and tutorials graphics
* commit '
b46c1855c48f1efe3268d7ba73d89032b9dfff09':
New blue for clings and tutorials graphics
Sascha Haeberling [Tue, 1 Jul 2014 19:30:30 +0000 (12:30 -0700)]
Prevent crash for when newData cannot be found.
Bug:
15842040
This should never happen, but could if e.g. there is a UI bug that
causes the 'done button on Photo Sphere / Panorama to be visible when no
actual session is active.
Change-Id: Iadd3c1786a4cb204d8a4d3222864aba2807ec36e
Sascha Haeberling [Tue, 1 Jul 2014 16:21:26 +0000 (09:21 -0700)]
New blue for clings and tutorials graphics
Bug:
15754001
Change-Id: I44f536dbd052aa896018660352732565ce792055
Doris Liu [Tue, 1 Jul 2014 21:13:55 +0000 (21:13 +0000)]
Merge "DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"" into ub-camera-fishlake
Doris Liu [Tue, 1 Jul 2014 18:55:46 +0000 (18:55 +0000)]
DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"
Since there is a small percentage of users still on K-MR1 as of June 30, we
will revert this CL for fishlake (only).
This reverts commit
2c8ac0ad7e1951d1c7314f4ac304dc7a920bd20d.
Bug:
15986316
Change-Id: I10283032e2873d07a51cfc697801b04977b3b18f
Sascha Häberling [Tue, 1 Jul 2014 21:45:28 +0000 (21:45 +0000)]
Merge "Pass the real file length to MediaStore." into ub-camera-fishlake
Angus Kong [Fri, 27 Jun 2014 18:13:10 +0000 (11:13 -0700)]
Pass the real file length to MediaStore.
Bug:
15115507
And also a little code clean/rearrangement.
Change-Id: I65ceec4c0489f965473c29cad684190f966b9218
Spike Sprague [Mon, 30 Jun 2014 22:28:22 +0000 (22:28 +0000)]
am
9f3d01d9: volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review
* commit '
9f3d01d9c5d2200882de76e309db55d74d950110':
volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review
Spike Sprague [Mon, 30 Jun 2014 21:52:57 +0000 (14:52 -0700)]
volume button cancels ongoing countdown
prevent volume button from doing anything during intent capture review
bug:
15141921
Change-Id: Icf974de09eb59e92bcce4a14aaa4775e21043c13
Andy Huibers [Mon, 30 Jun 2014 20:59:24 +0000 (20:59 +0000)]
am
0b3f9d51: Clean up foregrounding stats so that they are balanced with backgrounding stats.
* commit '
0b3f9d515df7a36d6e73acd4900b2537f4e54c8d':
Clean up foregrounding stats so that they are balanced with backgrounding stats.
Andy Huibers [Mon, 30 Jun 2014 19:47:37 +0000 (12:47 -0700)]
Clean up foregrounding stats so that they are balanced with backgrounding stats.
Change-Id: Ib694e8a98822cb475b5dfb2f92a56a34e31ae5dd
Baligh Uddin [Sat, 28 Jun 2014 02:59:47 +0000 (02:59 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Andy Huibers [Sat, 28 Jun 2014 00:29:23 +0000 (17:29 -0700)]
Fix build.
Change-Id: I463f525e6097f8705257c5d18a88689216e40123
Erin Dahlgren [Fri, 27 Jun 2014 21:38:48 +0000 (21:38 +0000)]
am
78e5a83a: Merge "fix Camera2 stubs for GoogleHelpHelper" into ub-camera-fishlake
* commit '
78e5a83a137a33452dd6500ddc60407bfe494bd2':
fix Camera2 stubs for GoogleHelpHelper
Erin Dahlgren [Fri, 27 Jun 2014 21:29:35 +0000 (14:29 -0700)]
resolved conflicts for merge of
deb09a7c to ub-camera-glacier
Change-Id: I98982ef41a2b2dc1175bb8f2ae9f881eb183c53d
Sascha Haeberling [Fri, 27 Jun 2014 21:00:18 +0000 (21:00 +0000)]
am
1dc99323: Updated resources to comply with GAR.
* commit '
1dc9932347ea735f8b4e06382d36af3cf65421e7':
Updated resources to comply with GAR.
Sascha Haeberling [Fri, 27 Jun 2014 00:05:58 +0000 (17:05 -0700)]
Updated resources to comply with GAR.
Bug:
15754001
Change-Id: I1236cd51ef20dfeeb3b09f473dbd1e9ccfeff971
Erin Dahlgren [Fri, 27 Jun 2014 21:07:58 +0000 (21:07 +0000)]
Merge "GoogleHelp launch edits." into ub-camera-fishlake
Erin Dahlgren [Fri, 27 Jun 2014 18:18:36 +0000 (11:18 -0700)]
GoogleHelp launch edits.
* Change Help to "Help & feedback"
* Move open source to the overflow menu in Help & feedback
* Remove send feedback
* Consolidate to one single group of settings (no General Settings and About)
* Put "Help & feedback" in the filmstrip overflow
Bug:
8426295
Change-Id: I3f0dad33b3e0c9ce150dce5c96cf7b9d7d7650da
Sam Judd [Fri, 27 Jun 2014 03:04:51 +0000 (03:04 +0000)]
am
632eaafd: Pull Glide forward.
* commit '
632eaafda53eb59b15c81ddeaf2080e6d8515f59':
Pull Glide forward.
Sam Judd [Tue, 24 Jun 2014 20:31:02 +0000 (13:31 -0700)]
Pull Glide forward.
Bug:
15669246
Change-Id: Icdcc5cb7c3ec2bbf5b970ee95ea121e10ac341d7
Sascha Haeberling [Thu, 26 Jun 2014 22:47:08 +0000 (15:47 -0700)]
resolved conflicts for merge of
b0870db3 to ub-camera-glacier
Change-Id: If06d585dbbe2d47ea92679bf63428fc2c0bca923
Baligh Uddin [Thu, 26 Jun 2014 21:20:09 +0000 (14:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I572257c9914387e5c2e0b02561d6b6c0413bf17a
Auto-generated-cl: translation import
Erin Dahlgren [Fri, 27 Jun 2014 21:34:29 +0000 (21:34 +0000)]
Merge "fix Camera2 stubs for GoogleHelpHelper" into ub-camera-fishlake
Erin Dahlgren [Fri, 27 Jun 2014 21:33:57 +0000 (14:33 -0700)]
fix Camera2 stubs for GoogleHelpHelper
Change-Id: Iba9d55c22cf3e3811072b14f1f0e74e9bd3814cf
Sascha Haeberling [Wed, 25 Jun 2014 18:27:59 +0000 (18:27 +0000)]
am
57d4f74f: Ensure focusAndCapture() is called on the main thread.
* commit '
57d4f74f9c4a122d87748d1ace36b0ec9bbd54a5':
Ensure focusAndCapture() is called on the main thread.
Sascha Haeberling [Wed, 25 Jun 2014 18:05:49 +0000 (11:05 -0700)]
Ensure focusAndCapture() is called on the main thread.
Bug:
15863231
Change-Id: Ieeb6e61e5a8a1d49832ea8ded6de2575afb0bdad
Sascha Haeberling [Wed, 25 Jun 2014 18:26:10 +0000 (18:26 +0000)]
Merge "Clean-Up formatting." into ub-camera-fishlake
Sascha Haeberling [Wed, 25 Jun 2014 18:12:22 +0000 (11:12 -0700)]
Clean-Up formatting.
Change-Id: I6278a2fe8e0bf8059021d5a247c0282c16cfd3c8
Baligh Uddin [Wed, 25 Jun 2014 02:55:14 +0000 (02:55 +0000)]
am
dc9aeb52: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
* commit '
dc9aeb524de81438e5a524890fbe9109e2afe7ab':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Jun 2014 02:51:54 +0000 (02:51 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Wed, 25 Jun 2014 02:51:59 +0000 (02:51 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
Andy Huibers [Thu, 19 Jun 2014 05:26:14 +0000 (22:26 -0700)]
Add metadata to capture and tap to focus events.
Bug:
15646701
Change-Id: Id290935839a81cfe86e9a503849207d828f33225
Sol Boucher [Tue, 24 Jun 2014 18:45:10 +0000 (18:45 +0000)]
Merge "Replace uses of CameraDevice#getCameraInfos() and CameraInfo" into ub-camera-glacier
Andy Huibers [Tue, 24 Jun 2014 17:46:36 +0000 (10:46 -0700)]
Fix merge conflict.
Change-Id: Ie3a66e4c362355d0dfff1597efcb9d69234266e6
Andy Huibers [Tue, 24 Jun 2014 17:38:47 +0000 (17:38 +0000)]
am
b7c7d9a0: Add metadata to capture and tap to focus events.
* commit '
b7c7d9a067cd52a27cfbaf0714a2074f972d836d':
Add metadata to capture and tap to focus events.
Andy Huibers [Tue, 24 Jun 2014 17:38:46 +0000 (17:38 +0000)]
am
03fd3baf: Merge "Add maximum zoom level and time to view events." into ub-camera-fishlake
* commit '
03fd3baf01447f30246b095f816ce337562d15f7':
Add maximum zoom level and time to view events.
Erin Dahlgren [Tue, 24 Jun 2014 17:13:01 +0000 (10:13 -0700)]
resolved conflicts for merge of
e1547937 to ub-camera-glacier
Change-Id: I15a68218f95e0f9192d91628ad972a7815e4ec73
Erin Dahlgren [Mon, 23 Jun 2014 22:17:07 +0000 (15:17 -0700)]
Hard reset HDR off if HDR+ is supported.
HDR and HDR+ should not be activatable on the same phone.
Our app depends on this assumption, so in case the app is killed
in some way to prevents us from going to gms core to get the
right information about hdr/hdr+ support, force HDR off if HDR+
at any point is supported.
Bug:
15310749
Change-Id: I450671d1218679ac8d413a01c5857030ba6ea32a
Andy Huibers [Mon, 23 Jun 2014 23:31:56 +0000 (23:31 +0000)]
Merge "Add maximum zoom level and time to view events." into ub-camera-fishlake
OSDN Git Service
