| ca434e5414ae721e577da44c279a7fad9f43ca2a |
|
04-May-2015 |
Gabriel Nava <gnava@google.com> |
Preventing camera button to get into wrong state when pressed in succession (camera-haleakala)
- Adding methods to ButtonManager to enable/disable camera button explicitly
- Camera button cannot be enabled during initialization if it was explicitly disabled
- PhotoModule, VideoModule and CaptureModule enable/disable camera button on camera switch
- Capture button is disabled before requesting the camera switch
- Capture button is re-enabled once the camera open confirmation is received
Bug: 20693214
Change-Id: I6383c705eee0a82397b975332cf37bbcd5913128
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 9a57f184a6f5be46e93dd2f6c66f4b9ba07bdd75 |
|
02-May-2015 |
Gabriel Nava <gnava@google.com> |
Avoid camera switch while HDR activation is in progress (camera-haleakala)
- Adding pre-change listener to MultiToggleImageButton to be executed before running state change animations
- Allowing button initialization with pre-change callback in ButtonManager
- Adding pre-change callback for conflicting options in CameraAppUI:
HDR/HDR+ button disables camera button to avoid camera facing switch
Camera facing disables HDR/HDR+
- Conflicting button is shown in disabled state for a while until re-enabled if applicable when the module switch is completed
Bug: 20696068
Change-Id: I11a0a0567363f656be52a9ece0707ccf326f2d67
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 0409c8594fd1629ee07df827cf0d7a0f336b9326 |
|
11-Mar-2015 |
zafir <zafir@google.com> |
Disable manual exposure button in HDR+ mode.
Bug: 19641530
Change-Id: I70d47a678eb0c5b77040ff071af14dd35c1e73a8
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| c989d417a53341b144e9f78304270ac66f8f5813 |
|
28-Jan-2015 |
Spike Sprague <spikuru@google.com> |
Fix content description for video intent review playback button.
bug: 18760510
Change-Id: I59773006d8075e957451082ca0fcc11c3c417f30
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| e29804fdace7b653932314407a5bdcf58569e590 |
|
25-Nov-2014 |
Alan Newberger <alann@google.com> |
Separate enable/disable and show/hide logic in ButtonManager
Show/hide occurs during module init, and should not be overridden
during operation when buttons are enabled/disabled. Rather than
make all enabling code handle the complexity of button visibility,
this change just configures buttons to be visible once. Addresses
bug where flash button becomes visible on devices without flash
when toggling HDR, due to logic that enables/disables flash and
HDR together.
Bug: 18376973
Change-Id: I787858ccde1fed9833fd24ac51d3b0bd3cc90df7
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| f3d360e4d97e724286a530e30cba9fa19e2304d8 |
|
24-Oct-2014 |
Spike Sprague <spikuru@google.com> |
When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons.
bug: 18104680
Change-Id: Ifd56369ca8177d40317f6af76bbc55a2110d6f5c
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 66d3d0d0633324893b89e1ddec14a4710d8034c3 |
|
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
add functionality to enable/disable clicks on a MultiToggleImageButton
without affecting its visual state.
bug: 17014507
Change-Id: I824e07d518cce9768cf48f4c50afe079ebff4121
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 517f32a7cb9b154ddde61d91f1f562d2f1889984 |
|
01-Aug-2014 |
Alan Newberger <alann@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 6190c36db653e848f29d1caefc4fa1bb61e8a662 |
|
13-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
New Settings API
Based on discussions from last week and comments on the design doc,
this api begins to implement the following:
1. Adds a "Scope" variable to api, which tells the SettingsManager
whether the setting can be stored globally (so that it is visible
to all parts of the app), or per-camera, or per-module, or per-
custom scope that the api user provides.
2. Separates keys and default values from SettingsManager,
to make it easy to add new settings/defaults from third party
modules.
3. Stores all settings as strings, to avoid upgrade errors, and
handles casting to type requested. Only String, Integer, and
boolean are supported.
4. Opens SharedPreferences files on demand, depending on scope
argument.
5. Creates a "DefaultsStore" to hold the defaults and possible
values of a setting. Then a user can request the default or
possible values of a setting at any time.
Change-Id: I03e0e1dd0955c519f54112e89716014aa963a425
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| a1b1f0e7bacb9b01c1b6f2a824a230b0cf940c41 |
|
21-May-2014 |
Spike Sprague <spikuru@google.com> |
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
|
| b4dd5659a53c625a611080db0d41f52f2b421354 |
|
21-May-2014 |
Sam Hasinoff <hasinoff@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 774f110f1aab1c28ca039943f5c3093cc0b27d98 |
|
21-May-2014 |
Spike Sprague <spikuru@google.com> |
add null check to RadioOptions set selected option
bug: 15080601
Change-Id: Icbe0baedc0f629ec0946ea6f94862d29edbb4fce
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 15473d4b69f4ad619aa10430e4bc86ab4fa815d0 |
|
14-May-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add new hdr plus flash setting.
This setting will be used by GcamModule to manage their
torch mode. It should be different from the Camera 1 api
flash mode setting, because they are semantically different.
GcamModule needs to set enableHdrPlusFlash in the BottomBarSpec
to enable this feature.
Also normalize names, HDRPLUS/hdrplus -> HDR_PLUS/hdr_plus,
for consistency, to reflect the clear majority usage.
Depends on:
* GcamModule ag/465936
Bug: 13076855
Change-Id: I6fe5ab8b1c7b9fa1acd1181445748c0257d21ea4
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 6c75164c89f3bbd4f894b9c49a7914a24268a999 |
|
06-May-2014 |
Doris Liu <tianliu@google.com> |
Add back countdown timer
Bug: 14222651
Change-Id: I482ec942dd9d79c4ea0432140a96ba2fc5b29c57
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 156f3e5b41cd2049230b1423c455763d31738693 |
|
16-May-2014 |
Spike Sprague <spikuru@google.com> |
fix some lingering exposure comp value calculation errors
hide exposure comp button if not supported in hardware
bug: 13967706
Change-Id: I6aa6963929c00ed06122fa2e2dfd778844bcc280
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| e541dc2d520aae8d45f3c605c3d732e33dd3b616 |
|
13-May-2014 |
Spike Sprague <spikuru@google.com> |
fix pano buttons order in landscape orientation
bug: 14886267
Change-Id: I111f24cb1f4f8a07bb96de8c36edeebeba80526a
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 9f9cc190b39d142b731be6c5bd55818d51fbb7d0 |
|
13-May-2014 |
Scott Ettinger <settinger@google.com> |
Add wide angle and fish eye capture modes.
bug: 14883143
Change-Id: I57d1257652b3d6d9a2d7a05abea7a45337ec6a03
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| e06ad2887d24171f30951e4236a7e848ca913607 |
|
08-May-2014 |
Spike Sprague <spikuru@google.com> |
new pano icons
preliminary support for wide-angle and fisheye pano modes
Change-Id: I6cb6c62f7f1f1f3a9943501e2de0ba9d718540dd
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 59345144c4bde59b81bb19c95cdd977c1d1a9cd4 |
|
23-Apr-2014 |
Spike Sprague <spikuru@google.com> |
change exposure comp and pano orientation to
use the new RadioOptions
bug: 13780101
Change-Id: Ie7b12199a96272827cc381560a5b801f87a5b81a
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| a479fcaad5b83c8fbb881f491d93145531b25cba |
|
12-Apr-2014 |
Spike Sprague <spikuru@google.com> |
make manual exposure compensation settings work acrss different devices
bug: 13967706
Change-Id: I2ebe579c8b7df1218546dd888b5bbfb5486e9e55
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 3c62221afd869828ba867fce15755a582f2c2334 |
|
11-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Update mode options with hardware spec whenever hdr setting changes.
Bug: 13965048
Change-Id: I7e718bb56cb5dc92c7583bef780d442c04644a56
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| abf54e2994961395a0feb0b08353e62718443f23 |
|
27-Mar-2014 |
Spike Sprague <spikuru@google.com> |
exposure compensation control is back
bug: 13607051
Change-Id: Ib4920ba3f8f3a548651a2d07613ccfdc28ca1d6e
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 667630d16a2b0cf3acecb817b3aa398abdd33623 |
|
01-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix broken shutter button enabling in Photo and Video.
When I went in to implement globally disabling the shutter button during
a certain state transition of the app, I realized that
1. enabling the shutter button in Photo and Video was totally broken: the
methods being used for enabling the shutter button were totally empty!
2. setShutterEnabled in the AppController was totally empty.
3. we've done a horrible job with keeping names consistent: capture button
!= shutter button.
So I've fixed all of these things, which should solve existing bugs and make
my original task easier.
Change-Id: If1ae3b8c740ef678fbd20c2ffbb93576f48c8c19
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 8ad8ad4841f65ee89e3c5e79f57d95cf8e4438b4 |
|
27-Mar-2014 |
Doris Liu <tianliu@google.com> |
Remove white balance and non-HDR scene mode settings
Also hook up HDR setting with scene mode to ensure it functions correctly
Bug: 13546569
Bug: 13546102
Change-Id: I71ef1841fc2bcb22f6ca0e286c31806ea049c79e
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| c8d9ad868e515ccebe1b6f52cb5fae1e6d13cbab |
|
25-Mar-2014 |
Angus Kong <shkong@google.com> |
Disable camera switch after it's pressed.
bug:13477604
Change-Id: I478715b345ce39d6bff65c9eda3a5604fb9d7edb
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| f80ac9ee5c66671c3a77ac6628fefc86cd39d57e |
|
18-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Support panorama orientation toggle in mode options.
Bug: 12977732
Change-Id: I945d53e1f0a6e3ff4e831c9907936f4d4456def6
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| a9ceaf76b72cb4b499d3d9d90f979bae93bd593d |
|
12-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Separate button references now that options are centered.
Bug: 12976464
Change-Id: I8f492f4a6f243cb986cd1fee7b0f284c3020e8d4
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| d5e51466a2848f1c937656c8f8185290034c2429 |
|
07-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add grid lines option and indicator.
Bug: 12454164
Change-Id: Iae088cee0cc67041bb304f276a5ffe84a813df5e
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| a6587a1a1e3672013da6a454c0e478846eced15d |
|
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Elevate refocus to its own mode, merge craft and camera.
Change-Id: I9686db26993319fdaf09f09c0610bb65e00a0e05
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| c0ad2fbb43002cf013989489dc0321f459baf84c |
|
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Center mode options according to spec.
* spec: https://drive.google.com/a/google.com/#folders/0B0GnUi_SFKJtdHp4YnBnLTZxcjQ
* for modes like video with less than the total possible
mode options, center the options.
Change-Id: I79dce62ced916d2ed20d04e805abe2bfdd60c779
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 79718f6c6fb60aedd09edeedb2c16d1e2f9fe02d |
|
29-Jan-2014 |
Spike Sprague <spikuru@google.com> |
adding accessibilty strings to ui items
Change-Id: I3f2356c765bd2799dfa1009ff6707fc3af87383e
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| e7d745c15f1ee0f3a160e7601715e70f9646e6c0 |
|
21-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add hdr option and indicator
Bug: 12440745
Change-Id: I2e5b8d860a19cd1fd1299dc42d13b26b6b5e88ec
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| a1fab413bcbe5f62ae1d829bac0539519fef96a6 |
|
21-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Support for panorama and photosphere bottom bar ui.
Bug: 12438294
Change-Id: If8a6f3b8aafd81980290655fb3ad461928f9c520
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| b1641f5df0cf839b54385ea4d2e43521620fc237 |
|
15-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Remove global UI elements based on supported camera parameters.
Bug: 12192238
Change-Id: I6373adeaa9c95385a2a4ca8d81cf7656550911f2
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| f1b2e407b20ff16fe793158c598e59799c1990ef |
|
14-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix stale button references.
Bug: 12537343
Change-Id: I9c48f9dcfe82afbf89562010daf94b767d53911c
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 39f8a7647aa4051a1c260b9496c2db82f93f8667 |
|
13-Jan-2014 |
Spike Sprague <spikuru@google.com> |
new video bottom bar ui
crossfade record <-> stop
full bar <-> single button cicle wipe
Change-Id: I58e0ddd94221374809acd52a6f0649e419203f54
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 0a6a8d8e4e1c9796aac606379a42970cdffb8911 |
|
10-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Sync dependencies between bottom bar options.
* Centralizes the bottom bar button customization.
* Makes HDR+ and front camera exclusive.
Bug: 12469207
Change-Id: I65e3d16d314a26889f04e9bcc26fa4bf095150b7
Conflicts:
src/com/android/camera/ButtonManager.java
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 6b174190b43bb4c2d7a5493e4f117ef6aac5f684 |
|
09-Jan-2014 |
Spike Sprague <spikuru@google.com> |
video capture icon
bug: 12440820
Change-Id: I276e1260c494519beaf95258129e1f240bdafd59
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 1848494bd09c85002d8c59d4feb8a6e0dc32871f |
|
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Show onscreen indicators for enabled and visible options.
Bug: 12434780
Change-Id: I85a3efba46303fc47f456d696d89b0ca2997f9f6
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 1648c36927501ff32bf2918e8a445118d5208731 |
|
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add on screen indicators.
Known caveats:
* Does not respect the first orientation change.
* PhotoModule resets flash to default on a mode switch.
* Hdr plus is not sticky on mode switch.
Bug: 12368905
Change-Id: I377f28c6d0f7115371cc9e9dad9378f049bf7d7c
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 4efa8b54c1df4e06f2d3caed2568015a737f9dda |
|
18-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
New Capture UI.
* depends on ag/400799
Change-Id: Ieb0e27447659bcb04dee57348583f68d680408d2
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 58598dc16e1f5a747fe1407ec1641a5529f423e5 |
|
19-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Clean up unused imports.
Change-Id: If53a35571522c879304ac9af0ebfca79ed536be0
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| cc0161c31a29848a822377845b5e7ffafeacca61 |
|
18-Dec-2013 |
Spike Sprague <spikuru@google.com> |
adding new icon resources
bug: 12128194
Change-Id: I1b34100821113aa7ba996fab3faf14752e766030
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| db44ef57cdb576704b1aafb2b81e30bf9ff261ad |
|
14-Dec-2013 |
Spike Sprague <spikuru@google.com> |
video intent ui
Change-Id: I85e346274c51ec87e0d95e8e30f5c261f08f4d34
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| eb3134f6ecc42f7d98625ca2c0ddfb06c9f07c43 |
|
12-Dec-2013 |
Spike Sprague <spikuru@google.com> |
intent ui
Change-Id: I34c2b73a07d64b55b8aeb36515cae5d4e4e92813
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 0f3c4b4fc9ac87d7d4c3d04c3cb3426c711f57ea |
|
11-Dec-2013 |
Spike Sprague <spikuru@google.com> |
unify preview and bottom bar resizing code
move bottom bar button into own layout files
Change-Id: Ib6237fddaa545476563b796cbd752b9562e9d9e4
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 8a2933b2c0156b752425b499f3081e4ffc350061 |
|
06-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Make the ButtonManager api associative.
* Makes handling dependent behavior between buttons
less error prone.
Change-Id: I13acf3475c46573668e0c8fee633e71efafd9588
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|
| 18e2ef6d2b2d36abcaa7378a0f7df792ecf8ed81 |
|
05-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Create a ButtonManager for managing common button behaviors.
Change-Id: I02d99c393a01e6de9ffb2f4f351a832b4eae9e37
/packages/apps/Camera2/src/com/android/camera/ButtonManager.java
|