OSDN Git Service

android-x86/packages-apps-Camera2.git
9 years agoset actionbar background to complete transparent
Spike Sprague [Thu, 21 Aug 2014 17:16:10 +0000 (10:16 -0700)]
set actionbar background to complete transparent

bug: 17114270
Change-Id: I309c98ed1ddbc0c322129e185ca4cd2df1f73520

9 years agoMerge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier
Sascha Haeberling [Sat, 23 Aug 2014 01:57:51 +0000 (01:57 +0000)]
Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier

9 years agoEnable switching within CaptureModule to HDR+ and back.
Sascha Haeberling [Thu, 21 Aug 2014 17:01:00 +0000 (10:01 -0700)]
Enable switching within CaptureModule to HDR+ and back.

  Bug: 16945820

Change-Id: If92371129c5bf2a78b7623d745a8b86d218d32e1

9 years agoMerge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera...
Sol Boucher [Sat, 23 Aug 2014 01:30:24 +0000 (01:30 +0000)]
Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera-glacier

9 years agoSwitch from stepwise index-based zoom to a ratio-based scale
Sol Boucher [Wed, 20 Aug 2014 00:24:07 +0000 (17:24 -0700)]
Switch from stepwise index-based zoom to a ratio-based scale

This brings the app up to date with the removal of the deprecated zoom methods
in the portability layer's CameraSettings class.

Bug: 17016658
Change-Id: Icb9f773188f7481d9af991d71feaff86379f5525

9 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Fri, 22 Aug 2014 17:39:45 +0000 (17:39 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

9 years agofilmstrip actionbar tweaks
Spike Sprague [Wed, 20 Aug 2014 01:53:41 +0000 (18:53 -0700)]
filmstrip actionbar tweaks

bug: 17114274
Change-Id: I70e7b285d27f81c87442bcc9d28ae7391d028568

9 years agoMerge "filmstrip actionbar tweaks" into ub-camera-glacier
Spike Sprague [Fri, 22 Aug 2014 17:12:09 +0000 (17:12 +0000)]
Merge "filmstrip actionbar tweaks" into ub-camera-glacier

9 years agofilmstrip actionbar tweaks
Spike Sprague [Wed, 20 Aug 2014 01:53:41 +0000 (18:53 -0700)]
filmstrip actionbar tweaks

bug: 17114274
Change-Id: I0e9b3dd37325d39f5a16d81cbfaf71b98baf7510

9 years agoMerge "Pick the preview size based on the selected picture size." into ub-camera...
Sascha Haeberling [Fri, 22 Aug 2014 00:49:21 +0000 (00:49 +0000)]
Merge "Pick the preview size based on the selected picture size." into ub-camera-glacier

9 years agoPick the preview size based on the selected picture size.
Sascha Haeberling [Thu, 21 Aug 2014 17:04:35 +0000 (10:04 -0700)]
Pick the preview size based on the selected picture size.

  Bug: 16654225

Also make this a function of the Camera device, since othe camera might
have to override the picture size.

Change-Id: Ieb6d1ffac0c3d7893416f9eae3232afde6d27240

9 years agoanimate filmstrip bottom button bar in and out
Spike Sprague [Tue, 19 Aug 2014 22:33:45 +0000 (15:33 -0700)]
animate filmstrip bottom button bar in and out
from the bottom of the screen

bug: 17114515
Change-Id: If3024f149fc0be0e48a430468c53774893946938

9 years agoMerge "Enable progress reporting for modules like HDR+." into ub-camera-glacier
Sascha Haeberling [Thu, 21 Aug 2014 00:40:31 +0000 (00:40 +0000)]
Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacier

9 years agoEnable progress reporting for modules like HDR+.
Sascha Haeberling [Wed, 20 Aug 2014 23:14:29 +0000 (16:14 -0700)]
Enable progress reporting for modules like HDR+.

  Bug: 16945820

Change-Id: If6aba8ff5d2b973f4ea8112110695a84f897d881

9 years agoMerge "Change Shamu's default video resolution setting." into ub-camera-glacier
Senpo Hu [Thu, 21 Aug 2014 00:16:11 +0000 (00:16 +0000)]
Merge "Change Shamu's default video resolution setting." into ub-camera-glacier

9 years agoChange Shamu's default video resolution setting.
Senpo Hu [Mon, 18 Aug 2014 23:45:45 +0000 (16:45 -0700)]
Change Shamu's default video resolution setting.

Bug: 17060480
Change-Id: I5ce8d2d2960d21856c0f13e9599d80b0edc03ec9

9 years agoMerge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier
Andy Huibers [Wed, 20 Aug 2014 20:49:21 +0000 (20:49 +0000)]
Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier

9 years agoRemove logspam
Sascha Haeberling [Wed, 20 Aug 2014 19:20:35 +0000 (12:20 -0700)]
Remove logspam

  Bug: 17157295

Change-Id: I7b6b505a7d389b59ae440dde7b30da78aaefa0c0

9 years agoAdd zoom to CaptureModule and OneCamera.
Andy Huibers [Wed, 20 Aug 2014 07:02:19 +0000 (00:02 -0700)]
Add zoom to CaptureModule and OneCamera.

Change-Id: Ia679d79a42e20e9033409939d0ca137ffcfbc75a

9 years agoMerge "Update AOSP Camera product icon" into ub-camera-glacier
Alan Newberger [Wed, 20 Aug 2014 02:09:24 +0000 (02:09 +0000)]
Merge "Update AOSP Camera product icon" into ub-camera-glacier

9 years agoUpdate AOSP Camera product icon
Alan Newberger [Wed, 20 Aug 2014 01:53:30 +0000 (18:53 -0700)]
Update AOSP Camera product icon

Final updates for the icon. Keeping naming consistent with generated
assets.

Bug: 16985499
Change-Id: I389c2479b208dec05a0b3a1f2617d13b15913dcb

9 years agoMerge "roduce debug output for android.util.Pair" into ub-camera-glacier
Sascha Haeberling [Tue, 19 Aug 2014 22:33:31 +0000 (22:33 +0000)]
Merge "roduce debug output for android.util.Pair" into ub-camera-glacier

9 years agoroduce debug output for android.util.Pair
Sascha Haeberling [Tue, 19 Aug 2014 21:38:44 +0000 (14:38 -0700)]
roduce debug output for android.util.Pair

  Bug: 16945820

Change-Id: Ia19c6fbfcaf2b1497a76e05600afc5a5b7364e50

9 years agoStart moving AF and 3A to separate class; improve logging.
Andy Huibers [Tue, 19 Aug 2014 20:22:44 +0000 (13:22 -0700)]
Start moving AF and 3A to separate class; improve logging.

Change-Id: Ib73415ffd5569fab8c2c3bf5ac0f35616d3ee697

9 years agoMerge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub...
Sol Boucher [Wed, 20 Aug 2014 23:57:21 +0000 (23:57 +0000)]
Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier

9 years agoTextureViewHelper workaround for SurfaceTexture/CameraProxy race
Sol Boucher [Wed, 20 Aug 2014 22:54:25 +0000 (15:54 -0700)]
TextureViewHelper workaround for SurfaceTexture/CameraProxy race

CameraController#getCurrentCameraId() now returns the ID of the requested camera
device if called after #requestCamera() but before the camera device has
finished opening. Assuming the most recent request is for the desired API level
and device, this resolves an issue where no transformation matrix was applied on
returning from the settings activity.

Bug: 17140996
Change-Id: Ideaec0072acd8aab77b98b213f260907f84270de

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Aug 2014 02:42:12 +0000 (19:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: I816f6a71f1c5fa754214261771e5dd4fc933949c
Auto-generated-cl: translation import

9 years agoadd functionality to enable/disable clicks on a MultiToggleImageButton
Spike Sprague [Mon, 18 Aug 2014 21:11:33 +0000 (14:11 -0700)]
add functionality to enable/disable clicks on a MultiToggleImageButton
without affecting its visual state.

bug: 17014507
Change-Id: I824e07d518cce9768cf48f4c50afe079ebff4121

9 years agoMerge "Remove extra parent mode from array, and make PhotoModule scope string public...
Alan Newberger [Tue, 19 Aug 2014 01:46:29 +0000 (01:46 +0000)]
Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier

9 years agoRemove extra parent mode from array, and make PhotoModule scope string public
Alan Newberger [Tue, 19 Aug 2014 01:40:47 +0000 (18:40 -0700)]
Remove extra parent mode from array, and make PhotoModule scope string public

When pruning modes, we neglected to remove one of the 'photo' parent modes.
This still worked because the last two entries were both 'photo'. Also,
making PhotoModule scope string public so it can be referred to by
other modules, to accomplish the same parent function as the array.

Bug: 17103121
Change-Id: I574e9a7c2db8bf2c86d810c930fbf510d5aa1a24

9 years agoMerge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier
Spike Sprague [Tue, 19 Aug 2014 00:44:58 +0000 (00:44 +0000)]
Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier

9 years agotweak filmstrip show/hide background for Material Design
Spike Sprague [Tue, 19 Aug 2014 00:18:49 +0000 (17:18 -0700)]
tweak filmstrip show/hide background for Material Design

bug: 17113925
Change-Id: I5d478e3e72346e4a333aa2399d339130c5ca4187

9 years agoMerge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier
Alan Newberger [Mon, 18 Aug 2014 17:46:29 +0000 (17:46 +0000)]
Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier

9 years agoMerge "change settings to use dark theme." into ub-camera-glacier
Spike Sprague [Mon, 18 Aug 2014 17:39:31 +0000 (17:39 +0000)]
Merge "change settings to use dark theme." into ub-camera-glacier

9 years agoFix orientation and move it to the util class so we can use it elsewhere.
Sascha Haeberling [Sat, 16 Aug 2014 01:45:15 +0000 (18:45 -0700)]
Fix orientation and move it to the util class so we can use it elsewhere.

  Bug: 16948752

Change-Id: Ic7bf2f01176d8f6f1e1a70940c35531e1a5a1cbc

9 years agoDO NOT MERGE - Reverting accidentally merged 524943 into glacier.
Sascha Haeberling [Sat, 16 Aug 2014 01:53:53 +0000 (18:53 -0700)]
DO NOT MERGE - Reverting accidentally merged 524943 into glacier.

We only want it in Haleakala, but it go into glacier through another CL.

Change-Id: Ie08ec3e0d1ad7637650c45bf1908a04267464935

9 years agoProtect Camera2 functions from null CameraDeviceInfo
Alan Newberger [Sat, 16 Aug 2014 01:18:12 +0000 (18:18 -0700)]
Protect Camera2 functions from null CameraDeviceInfo

When the underlying camera fails, the camera1 agent
returns null for CameraDeviceInfo. Guard against this case
where it is used in app upgrading and settings.

Bug: 16982203
Change-Id: I7e4686e508993f0d0fc03eaa9e0b5dc312016eae

10 years agoMerge "Move preview transform matrix code into portability library" into ub-camera...
Sol Boucher [Sat, 16 Aug 2014 00:23:47 +0000 (00:23 +0000)]
Merge "Move preview transform matrix code into portability library" into ub-camera-glacier

9 years agoMove preview transform matrix code into portability library
Sol Boucher [Tue, 12 Aug 2014 06:10:12 +0000 (23:10 -0700)]
Move preview transform matrix code into portability library

This allows it to be calculated differently depending on the backing camera API,
which means that camera2 preview streams can be (and are!) displayed upright.

Bug: 16875535
Change-Id: I58fa86098a8b8eddc8f864b93d1e92672c40a1de

10 years agoMerge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera...
Sol Boucher [Sat, 16 Aug 2014 00:23:35 +0000 (00:23 +0000)]
Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier

9 years agoEnable seamless switching to/from camera2-backed Photo module
Sol Boucher [Tue, 5 Aug 2014 06:41:38 +0000 (23:41 -0700)]
Enable seamless switching to/from camera2-backed Photo module

This supports running individual modules against the camera2 API framework while
the rest of the modules use the legacy Camera class.

Bug: 16875535
Change-Id: Ic0ae313a3dd96ba22bacc36c7b1712b183b713ff

10 years agoMerge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API...
Andy Huibers [Fri, 15 Aug 2014 21:39:05 +0000 (21:39 +0000)]
Merge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API." into ub-camera-glacier

10 years agoReset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.
Andy Huibers [Fri, 15 Aug 2014 19:56:42 +0000 (12:56 -0700)]
Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.

Bug: 17028594
Change-Id: I8ce7dbd12f2b14a50068d8b034e7a80d8840f012

10 years agoMerge "Add ability to add a ready-state changed listener to the camera." into ub...
Sascha Haeberling [Fri, 15 Aug 2014 20:20:53 +0000 (20:20 +0000)]
Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier

10 years agoAdd ability to add a ready-state changed listener to the camera.
Sascha Haeberling [Fri, 15 Aug 2014 17:52:37 +0000 (10:52 -0700)]
Add ability to add a ready-state changed listener to the camera.

  Bug: 16945820
  Bug: 16948752

This enables us to hook up memory intense cameras and make sure we don't
activate the shutter button if the camera is not ready.

Change-Id: I70a31c76e063d775c844404ee9e20e583fa233e3

10 years agoHold touch to focus target in 3A UI debug mode.
Andy Huibers [Fri, 15 Aug 2014 17:21:56 +0000 (10:21 -0700)]
Hold touch to focus target in 3A UI debug mode.

Bug: 17028594
Change-Id: I6d60f2a891cc8ab33c2165438295950bf46095b3

10 years agoMove preference subscreens to new Activities from Dialogs
Alan Newberger [Thu, 14 Aug 2014 22:48:59 +0000 (15:48 -0700)]
Move preference subscreens to new Activities from Dialogs

Dialogs are hard to override for action bar settings. The documented
way to do navigation up is to receive menu events. So we no longer
use Dialogs, instead here we set up intents back to the same Activity,
and add an extra system to designate which subscreen to load. This uses
activity stack to do subscreen navigation, and then all screens hit the
same menu handler in the Activity which properly receives up navigation
signals via 'home'. This is not awesome but a better hack than the
Dialog one which depends on Action Bar internals; this approach only
uses public APIs.

Bug: 15756177
Change-Id: Iae2bd254e9cd5dde1d32d0997e5610f359662467

10 years agoMerge "Consolidate properties for debugging." into ub-camera-glacier
Andy Huibers [Fri, 15 Aug 2014 16:55:11 +0000 (16:55 +0000)]
Merge "Consolidate properties for debugging." into ub-camera-glacier

10 years agoConsolidate properties for debugging.
Andy Huibers [Fri, 15 Aug 2014 05:24:41 +0000 (22:24 -0700)]
Consolidate properties for debugging.

Change-Id: I052492375bf176622b38382579b2189d22a05349

10 years agoMerge "Move preference subscreens to new Activities from Dialogs" into ub-camera...
Alan Newberger [Fri, 15 Aug 2014 16:32:43 +0000 (16:32 +0000)]
Merge "Move preference subscreens to new Activities from Dialogs" into ub-camera-glacier

10 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Fri, 15 Aug 2014 05:47:35 +0000 (05:47 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

10 years agoMove code from GoogleCamera that dumps capture request metadata.
Sascha Haeberling [Fri, 15 Aug 2014 02:27:34 +0000 (19:27 -0700)]
Move code from GoogleCamera that dumps capture request metadata.

  Bug: 16945820

Change-Id: Iff3f05b65687073a7272ed31644f34dc6187de21

10 years agoadd a range check in MultiToggleImageButton's bitmap combine function.
Spike Sprague [Wed, 13 Aug 2014 23:57:20 +0000 (16:57 -0700)]
add a range check in MultiToggleImageButton's bitmap combine function.

bug: overrideImageIds
Change-Id: I6e6b60ff8bb269fb25f7b788009103d9b9d02f19

10 years agochange settings to use dark theme.
Spike Sprague [Wed, 13 Aug 2014 21:36:53 +0000 (14:36 -0700)]
change settings to use dark theme.

bug: 16979040

Change-Id: I2e02884d2971a92d4a408712a0e952891eafb62e

10 years agoMerge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier
Alan Newberger [Wed, 13 Aug 2014 23:31:04 +0000 (23:31 +0000)]
Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier

10 years agoRevert our layout from FULLSCREEN to LAYOUT_FULLSCREEN
Alan Newberger [Wed, 13 Aug 2014 23:28:26 +0000 (16:28 -0700)]
Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN

We changed this while working on L prep, but FULLSCREEN suppresses the
action bar. Changing back to LAYOUT_FULLSCREEN addresses this.

Bug: 16986789
Change-Id: I561fe765ea5eb72b1d666a124c9810cf349ce56a

10 years agoMerge "update mode switch transition anims" into ub-camera-glacier
Spike Sprague [Wed, 13 Aug 2014 21:14:50 +0000 (21:14 +0000)]
Merge "update mode switch transition anims" into ub-camera-glacier

10 years agoMerge "Fix potential multi-threading bug where size can change before deletion."...
Sascha Haeberling [Wed, 13 Aug 2014 19:42:57 +0000 (19:42 +0000)]
Merge "Fix potential multi-threading bug where size can change before deletion." into ub-camera-glacier

10 years agoFix potential multi-threading bug where size can change before deletion.
Sascha Haeberling [Wed, 13 Aug 2014 19:02:33 +0000 (12:02 -0700)]
Fix potential multi-threading bug where size can change before deletion.

  Bug: 16949503

Change-Id: I9b087cc257edfb2fe5368abaa7a73f910a6db3df

10 years ago[OC] Gcam OneCamera implementation.
Sascha Haeberling [Tue, 5 Aug 2014 17:53:08 +0000 (10:53 -0700)]
[OC] Gcam OneCamera implementation.

  Bug: 16948752

Change-Id: I0160de117c4ff7024e0d546f594b5777847d1833

10 years agoEnable 4K video for Shamu.
Senpo Hu [Fri, 8 Aug 2014 20:42:13 +0000 (13:42 -0700)]
Enable 4K video for Shamu.

- Add a new resolution setting for back camera video: "UHD 4K"

Bug: 16206549
Change-Id: I0b72f8100bc26b556099ad08e093273ccda0f25d

10 years agoMerge "Update option icon transitions" into ub-camera-glacier
Spike Sprague [Wed, 13 Aug 2014 23:28:19 +0000 (23:28 +0000)]
Merge "Update option icon transitions" into ub-camera-glacier

10 years agoanother tweak of the mode switch expanding circle, no more pre-white circle expansion.
Spike Sprague [Wed, 13 Aug 2014 22:55:28 +0000 (15:55 -0700)]
another tweak of the mode switch expanding circle, no more pre-white circle expansion.

bug: 16129873

Change-Id: I1f55dbd40be1801bf7bbf1f3646a8deeec5c353f

10 years agoUpdate option icon transitions
Spike Sprague [Sat, 9 Aug 2014 01:13:56 +0000 (18:13 -0700)]
Update option icon transitions

bug: 16458864

Change-Id: Idaf4b60d357fa08635b55c1356450d3a4b2b48c2

10 years agoMerge "Don't try to share null data" into ub-camera-glacier
Sascha Haeberling [Wed, 13 Aug 2014 19:32:55 +0000 (19:32 +0000)]
Merge "Don't try to share null data" into ub-camera-glacier

10 years agoDon't try to share null data
Sascha Haeberling [Wed, 13 Aug 2014 18:43:57 +0000 (11:43 -0700)]
Don't try to share null data

  Bug: 16875556

Also add warning logs for null check cases.

Change-Id: Ic1e7e81b416d24a748b9572d63c145612b38d822

10 years agoMerge "New Material icons for Camera2" into ub-camera-glacier
Alan Newberger [Wed, 13 Aug 2014 17:09:24 +0000 (17:09 +0000)]
Merge "New Material icons for Camera2" into ub-camera-glacier

10 years agoNew Material icons for Camera2
Alan Newberger [Wed, 13 Aug 2014 17:04:39 +0000 (10:04 -0700)]
New Material icons for Camera2

This CL adds new Material icons for Camera2.

Bug: 16985499
Change-Id: I91972418f7ee9592fc7685e2c4dfd9bb73c3bcc9

10 years agoupdate mode switch transition anims
Spike Sprague [Fri, 25 Jul 2014 18:40:53 +0000 (11:40 -0700)]
update mode switch transition anims

bug: 16129873

Change-Id: Ibcb2e31162dc353de250db2a7d24726b05768ab1

10 years agoRefactor Upgrade/UpgradeAosp into SettingsUpgrader
Alan Newberger [Tue, 5 Aug 2014 16:56:17 +0000 (09:56 -0700)]
Refactor Upgrade/UpgradeAosp into SettingsUpgrader

This CL does three things:
- removes the Upgrade/UpgradeAosp classes which were bunches of statics,
in favor of a SettingsUpgrader abstract class that can be overridden
- moves 'upgrade to strings' hack logic into AppUpgrader so it only is
checked and run once, not for any of the former UpgradeSteps. logic used
to be in Upgrade and run regardless of key, when it was using detection
only meant for KEY.KEY_UPGRADE_VERSION
- adds existence checks for all hack in-place key string upgrades so they
are no-ops if the key was not persisted in the first place.

Bug: 16573087
Change-Id: Ife42f7aa4a7611ba2d143410a3450057b7464901

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 12 Aug 2014 04:55:12 +0000 (21:55 -0700)]
Import translations. DO NOT MERGE

Change-Id: I969568c49246ac278c8c68e025f1ce279a5323a5
Auto-generated-cl: translation import

10 years agoImplemented NDK libjpeg wrapper for YUV420 encoding.
Puneet Lall [Fri, 8 Aug 2014 00:05:38 +0000 (17:05 -0700)]
Implemented NDK libjpeg wrapper for YUV420 encoding.

Bug: 16676082
Change-Id: I588b8023b401d5e713762563c9265ec3d774a678

10 years ago[OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
Andy Huibers [Thu, 31 Jul 2014 23:31:43 +0000 (16:31 -0700)]
[OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.

Change-Id: Ic88359ad27b8e9ee0e74c8d1bd6ecb71fe3c24f0

10 years agoMerge "Route zoom value through to zoomIndex in device API" into ub-camera-glacier
Alan Newberger [Fri, 8 Aug 2014 01:58:08 +0000 (01:58 +0000)]
Merge "Route zoom value through to zoomIndex in device API" into ub-camera-glacier

10 years agoRoute zoom value through to zoomIndex in device API
Alan Newberger [Fri, 8 Aug 2014 01:02:07 +0000 (18:02 -0700)]
Route zoom value through to zoomIndex in device API

Current UI is wired to track zoom index, so pass that in rather
than the unfinished new zoom ratio API. This finishes the fix for
zoom in the app.

Extended TODO already there. App should continue to operate until
one big refactor moves it form working with zoom indices, to working
with zoom ratios, no breakage in between.

Bug: 16527845
Change-Id: I8d88c3d34ba9ad85b1a115cf1249548a16722a38

10 years agoMerge "Move display orientation calculations out of app code" into ub-camera-glacier
Sol Boucher [Fri, 8 Aug 2014 00:20:57 +0000 (00:20 +0000)]
Merge "Move display orientation calculations out of app code" into ub-camera-glacier

10 years agorollback of b/16632474 and ag/518674
Spike Sprague [Thu, 7 Aug 2014 21:56:27 +0000 (14:56 -0700)]
rollback of b/16632474 and ag/518674

Change-Id: I77af6135ff339240bd52881550a0f42ec996f9c4

10 years agoMerge "fix NPE in action switch" into ub-camera-glacier
Alan Newberger [Wed, 6 Aug 2014 21:56:23 +0000 (21:56 +0000)]
Merge "fix NPE in action switch" into ub-camera-glacier

10 years agofix NPE in action switch
Alan Newberger [Wed, 6 Aug 2014 21:05:31 +0000 (14:05 -0700)]
fix NPE in action switch

Recent conversion of action condition from if/else to switch
overlooked need for switch to be non-null. Fixing here.

Bug: 16847376
Change-Id: I919c585c414d0d3c4ef7fcdefccfda9118ef8104

10 years agoupdate system ui flags for full screen on android L
Spike Sprague [Wed, 6 Aug 2014 19:13:00 +0000 (12:13 -0700)]
update system ui flags for full screen on android L

bug: 16632474
Change-Id: I5b555492587df103b41ad13a6893a334b8c71b68

10 years agoMerge "[OC] Enable flash support." into ub-camera-glacier
Sascha Haeberling [Tue, 5 Aug 2014 23:09:19 +0000 (23:09 +0000)]
Merge "[OC] Enable flash support." into ub-camera-glacier

10 years ago[OC] Migrate away from android.util.Size sinc we cannot use it in K.
Sascha Haeberling [Tue, 5 Aug 2014 22:54:42 +0000 (15:54 -0700)]
[OC] Migrate away from android.util.Size sinc we cannot use it in K.

  Bug: 16654225

Change-Id: I2c0ea6b387b8ad38d6e49c84dca8bf2bde34e249

10 years ago[OC] Enable flash support.
Sascha Haeberling [Thu, 31 Jul 2014 18:36:58 +0000 (11:36 -0700)]
[OC] Enable flash support.

  Bug: 16654225

Also show an error and exit the app if camera could not be opened.

Change-Id: Iddccaff35b081ba98efe2aaae51d9ee10bb7726f

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 5 Aug 2014 01:26:07 +0000 (18:26 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iefb086b8135a5efef30d53c06147a6415f824fb8
Auto-generated-cl: translation import

10 years agoMerge "[OC] Introduce OneCameraCreator so we can dynamically create a different versi...
Sascha Haeberling [Sun, 3 Aug 2014 04:44:00 +0000 (04:44 +0000)]
Merge "[OC] Introduce OneCameraCreator so we can dynamically create a different version." into ub-camera-glacier

10 years ago[OC] Introduce OneCameraCreator so we can dynamically create a different version.
Sascha Haeberling [Sun, 3 Aug 2014 04:15:26 +0000 (21:15 -0700)]
[OC] Introduce OneCameraCreator so we can dynamically create a different version.

   Bug: 16654225

Change-Id: Iaf7d738b4405fa2e58cc5fc8af99d5ff2718f5a9

10 years agoMerge "Prevent monkey crash when deleting without data" into ub-camera-glacier
Sascha Haeberling [Sun, 3 Aug 2014 04:16:45 +0000 (04:16 +0000)]
Merge "Prevent monkey crash when deleting without data" into ub-camera-glacier

10 years agoRestore grid initialization logic to fix grid display on startup
Alan Newberger [Fri, 1 Aug 2014 21:08:37 +0000 (14:08 -0700)]
Restore grid initialization logic to fix grid display on startup

The large settings refactor in ag/484817 not only changed settings
calls in ButtonManager.initializeGridLinesButton, it altered the
order of calls to create the button callback and to set the button
state. The prior implementation and this CL creates the callback,
and then sets state so that the callback, which controls display,
runs upon initial state setup of the button. Otherwise the grid
is not shown correctly on module startup.

Bug: 16687954
Change-Id: I482906d2d54a8545066dded3209b55ae4ad48bdb

10 years ago[OC] Refactoring the session API before intgrating GCam into OneCamera
Sascha Haeberling [Thu, 31 Jul 2014 23:05:57 +0000 (16:05 -0700)]
[OC] Refactoring the session API before intgrating GCam into OneCamera

  Bug: 16654225

Change-Id: I3fe6f46847ed6424310a81722c93c63be8b807a3

10 years agoMove display orientation calculations out of app code
Sol Boucher [Fri, 25 Jul 2014 06:59:21 +0000 (23:59 -0700)]
Move display orientation calculations out of app code

Because they're needed by every app, these are being relocated into the
portability layer. As such, the CameraUtil#getDisplayOrientation() and
CameraUtil#getJpegRotation() methods are being replaced by the API-agnostic
CameraDeviceInfo.Characteristics#getPreviewOrientation() and
CameraDeviceInfo.Characteristics#getJpegOrientation() calls, respectively.

Change-Id: I5048e6f1a5ff655e4ea260b109e7c104bbe790b0

10 years agoImproved logging of foreground source type.
Andy Huibers [Thu, 31 Jul 2014 18:10:24 +0000 (11:10 -0700)]
Improved logging of foreground source type.

Change-Id: I6fdd5a52ec136f76352e006a8e95e88aac0ac1af

10 years agoMerge "[OC] Hook new Capture module up, behind a system property." into ub-camera...
Sascha Haeberling [Thu, 31 Jul 2014 15:21:09 +0000 (15:21 +0000)]
Merge "[OC] Hook new Capture module up, behind a system property." into ub-camera-glacier

10 years ago[OC] Adds the new CaptureModule and UI.
Sascha Haeberling [Thu, 31 Jul 2014 00:48:52 +0000 (17:48 -0700)]
[OC] Adds the new CaptureModule and UI.

  Bug: 16654225

This is essentially a version of the GCamModule without GCam, plus a few
things we need from PhotoModule.

Some code is commented out to be added back in later as a reminder.

CLs to hook the module up will be following up.

Change-Id: I70108529f81a8b0b744dc846287ea2ac121c85da

10 years ago[OC] Hook new Capture module up, behind a system property.
Sascha Haeberling [Thu, 31 Jul 2014 03:17:30 +0000 (20:17 -0700)]
[OC] Hook new Capture module up, behind a system property.

  Bug: 16654225

Change-Id: I6be44fefce66c09425a1bebc1942489f6af7636c

10 years agoPrevent monkey crash when deleting without data
Sascha Haeberling [Wed, 30 Jul 2014 17:31:29 +0000 (10:31 -0700)]
Prevent monkey crash when deleting without data

  Bug: 16536894

Change-Id: I960c0d8f61b2909c7020d3c259fbad8f8c33bc05

10 years agoCleaning up unused strings.
Sascha Haeberling [Wed, 30 Jul 2014 02:43:42 +0000 (19:43 -0700)]
Cleaning up unused strings.

'et' and 'ms' are deprecated and have already been removed from master:
http://ag/506364

Change-Id: I0acb1a5225f0b7c9c3dcf449b0a16bb7f77118ed

10 years ago[OC] Camera2-based OneCamera implementation.
Sascha Haeberling [Wed, 30 Jul 2014 00:28:46 +0000 (17:28 -0700)]
[OC] Camera2-based OneCamera implementation.

  Bug: 16654225

Change-Id: Icc544eac762b5494e6bb6c9e768b810c44e11cd9

10 years agoMerge "Put conversion from string to size into SettingsManager." into ub-camera-glacier
Sascha Haeberling [Wed, 30 Jul 2014 01:12:51 +0000 (01:12 +0000)]
Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier

10 years agoAdd empty version of SystemProperties interface.
Sascha Haeberling [Wed, 30 Jul 2014 00:32:17 +0000 (17:32 -0700)]
Add empty version of SystemProperties interface.

This is so that we can use it in Camera2 code.

Change-Id: I764adb7377b91b5b54a33535188eb6d0d5159253

10 years agoPut conversion from string to size into SettingsManager.
Sascha Haeberling [Wed, 30 Jul 2014 00:08:18 +0000 (17:08 -0700)]
Put conversion from string to size into SettingsManager.

This way we don't have to spread this logic throughout the codebase.

Change-Id: I2d534d0756a9030e6d67b479a67c86c1cf596589