| 09d24d469c7a33e2bf423c824bfa52cc0dd98ed6 |
|
01-May-2015 |
Pengchong Jin <pengchong@google.com> |
Fix bug b/19965993
CameraId null check before checking whether the exposure compensation is
supported.
Bug: 19965993
Change-Id: If5cd7fbfe9ae6d2f83e56c8647836f96fa6e7426
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| faa6c880d64300b135592af3b0ca62bcfab20531 |
|
03-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure a 0x0 size is not crashing summary filling.
Bug: 20036947
Change-Id: I56a39cd9bf65b84ca5d9820ad6738d16bbc4446e
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 46f8751da2fef488f6612b6f2f96e749595d3a2e |
|
26-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Add support for new independent Lens Blur quality setting.
Bug: 19424875
This CL and its sibling do two things:
- Bring back the Lens Blur setting
- Populate the setting with up to three native picture resolutions.
- If needed, choose the default as being the second highest resolution.
(The list is not a full list, but filterd by what we show to the user).
- Make sure that after a new install a the default is set.
- Extra check in RefocusModule to make sure the default is set if old
setting is not valid. This is important for upgrades.
- To make the size logic re-usable, I wrapped it into a PictureSizeLoader
which also makes the CameraSettingsActivity a bit easier to read.
Change-Id: I53fcac8304f19be4f2c5ac053363f6805b933d89
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 1d84d7107686aa428ee2eeb1a8caf0ea3e43b1df |
|
12-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Re-arrange camera initialization.
This change re-arranges several things to make it possible to know
the CameraId you are about to open before you actually open the
camera device. It also adds an explicit CameraId class for handling
both legacy and camera2 id comparisons, an active camera tracker,
and moves the camera id query mechanism into a hardware manager
class in prep for the subsequent camera release.
Bug: 19679820
Change-Id: I4c09b9a12a1ea5badcac3a6a073a56764f9a7eba
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| df682a2d9cd88c31e84b8e69d6bdc3dbb5c894bb |
|
07-Mar-2015 |
zafir <zafir@google.com> |
Hide "Advanced" settings screen on N6.
The N6 currently doesn't support manual exposure. That's the only item
under Advanced, so hiding that option entirely.
Bug: 18523154
Change-Id: I1b8238a9b9f0e04f8b0d2047a444b81fcecc4767
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 86d753fcbb0c7474fa9b2797e76e31ef575e76cd |
|
06-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Add black-list for resolutions.
Bug: 19611738
Change-Id: I5147bcd925c28e3db0e1e50c8a013cc6750fb47e
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 69c897f767f327722efd3314bf679c5a5dd64bb8 |
|
30-Jan-2015 |
zafir <zafir@google.com> |
Implemented Report functionality using GMS Core Feedback API. Implemented stubs for Camera2.
Bug: 18188247
Change-Id: Ic47bf432dca326bb454d0e4408b6b58f645a3fa4
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 2272f8a6bfc8adca8ada7a215bef038d45256085 |
|
16-Dec-2014 |
Senpo Hu <senpo@google.com> |
CaptureModule first run dialog.
* Introduce FirstRunDialog.
* Add OneCameraCharacteristics so we can query camera properties without
opening the camera.
* Refactor AspectRatioDialogLayout and LocationDialogLayout to clean up.
* Refactor to move away from portability/Size class in Camera2.
Bug: 18623223
Change-Id: I05f4eefe3ee2feeaa47b6296f8926f6be8e83051
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| f4084e35eac8a8b86e807573647d4a7b43852a59 |
|
22-Oct-2014 |
Alan Newberger <alann@google.com> |
Check for null when deleting preference groups
No glacier incidents but with hundreds of Fishlake incidents
implying that sometimes we fail to find the preference to
remove, protect against nulls here to avoid crashing in
Settings.
Bug: 14625519
Change-Id: Iebc1a103abae7524e6ab0aca96d5c2479e62d9ee
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| bda2da2ec52bf2cc4c4df058bac20be6eb9ceab3 |
|
14-Oct-2014 |
Alan Newberger <alann@google.com> |
Migrate Settings Fragment to use arguments
Fix error in settings fragment using a constructor vs argument bundle.
Bug: 17626333
Change-Id: I5842706a3b5060dac1f997ca4035b4cc31ce0287
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 577e351abe784f3da8074ce3d83f0d2e532a2895 |
|
17-Sep-2014 |
Alan Newberger <alann@google.com> |
Fix CameraSettingsActivityHelper
Previous hack to allow activity up button to work, interfered with
custom preference merging we use to conditonally add items to
Settings. Now fixed by allowing internal control of whether the
full preference tree is returned by the fragment or just the
desired subtree, so that the Helper can access the full tree.
Bug: 17534830
Change-Id: I11510f365b9e212f07009b2233bb5d8036228774
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 251402b0765e6ca2093ed674fa15ca295896273f |
|
18-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier
|
| 2040b56b1e0a93b38a558fa56e4b49970bd4b248 |
|
16-Aug-2014 |
Alan Newberger <alann@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| f67f64f3b5272d1da317b8eda8e1ea1e46539416 |
|
16-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier
|
| 44ce4b26614f85518d548a6750c7a08908ae3596 |
|
05-Aug-2014 |
Sol Boucher <solb@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 886bcc4694071c6bf797d18754021af21a237eb9 |
|
15-Aug-2014 |
Alan Newberger <alann@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| c230d391d55b5ba7a3356695cd6d653e2b8d6ffb |
|
10-Jul-2014 |
Sol Boucher <solb@google.com> |
Eliminate unnecessary context in FragmentActivity constructor
Use the one that was already being obtained from getApplicationContext() instead
Change-Id: I1e0a62449b3ac9d02404fa623c0c62063069aae2
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| d8cc3ea58938f78012991360cef7a6b3a2e51ccc |
|
02-Jul-2014 |
Sol Boucher <solb@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| c78ffd7011c9841697a75bdc48c7011e806afaee |
|
07-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of ff899495 to ub-camera-glacier
Change-Id: Iffdde32e6f2b70d6a2fc560c6347a159678a7c60
|
| 5697927e1650ba368916000a67b8f59dadbc59aa |
|
07-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix regression: Update summary when quality settings change.
Bug: 16062378
Change-Id: I8532ac5bcc73a36b9666903d985bf13424819a0f
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| eb88b3c4aa4f83e35c60e8932d83100be1b8bbb0 |
|
27-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
resolved conflicts for merge of deb09a7c to ub-camera-glacier
Change-Id: I98982ef41a2b2dc1175bb8f2ae9f881eb183c53d
|
| 26a4bb961a4b1bd9c6a161cffe39089b2a7b7138 |
|
27-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 43e1813a5d4a59ef107768eb523d76ae2781cb02 |
|
20-Jun-2014 |
Sol Boucher <solb@google.com> |
Replace uses of CameraDevice#getCameraInfos() and CameraInfo
This API 1--specific portability library method has been removed. All
non-debugging direct uses of the Camera.CameraInfo class are also addressed by
this commit.
Change-Id: I551bb1476a26f79c101892336d0bf99e4fa823cc
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.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/settings/CameraSettingsActivity.java
|
| 5a344964cb003525727c31d295ca3a592c245606 |
|
17-Jun-2014 |
Sol Boucher <solb@google.com> |
Remove cameradevice subpackage and point references at ex library
This code is being relocated into frameworks/ex for availability to other apps.
Change-Id: Icada261ac7a795b08dd8b187dfd17077077b37c3
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 85b403a59418d198204ec50d0807c2fdd30247a7 |
|
13-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 51c55dac: Merge "GoogleHelp affordance in CameraSettingsActivity" into ub-camera-fishlake
* commit '51c55dac6950dca94a40b3fb685fb075ca47120e':
GoogleHelp affordance in CameraSettingsActivity
|
| c78accd603200e0e7e61056b259c2ac9758abf4b |
|
09-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
GoogleHelp affordance in CameraSettingsActivity
Uses the first Account available to launch a GoogleHelp
Activity from the CameraSettingsActivity. We remove the
affordance if the phone has no registered Accounts.
Bug: 8426295
Change-Id: I02f8f0accd76c19d42cbbd68c4043c174f13d424
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 6607dae6c4d1ee5bbf572695c2042d4d9129a730 |
|
11-Jun-2014 |
Angus Kong <shkong@google.com> |
Refactor out Camera.Parameters.
Change-Id: Ibc1ddac509381530e887b7491069e6367e9a6088
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 5b577a679eb790c4c8ad410436cca0a8cad28f7d |
|
22-May-2014 |
Seth Raphael <magicseth@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 90c7ad5159145227349b389074d2d9437a1243a4 |
|
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up
opening of Settings page.
Bug: 15090067
Change-Id: I1eea24adbf55bf6a73b02b129b725415edca859c
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 1cced0e893b6a2f37d447a049c1c3c08affd2d41 |
|
15-May-2014 |
Seth Raphael <magicseth@google.com> |
Use approximate descriptions of aspect ratios.
165:98 should be considered close enough and
described as 16:9
Bug: 14970245
Change-Id: I75ca9507e453d057c6db3e4fd99cebb0ee01d4f7
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| d074fffd7c85df39893125f29fb3d487864feaf1 |
|
12-May-2014 |
Seth Raphael <magicseth@google.com> |
Localize aspect ratios in settings summaries
Bug: 14496248
Change-Id: I392dc627d09a09980d450ad1dfc93d0e4e5a237c
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| a4b0118d15d4a3c6b77827feb63c3809c61c0fcf |
|
12-May-2014 |
Seth Raphael <magicseth@google.com> |
Do not display large 16x9 option on N5 front cam
It was erroneously added to the list of supported
resolutions for the Nexus 5 front facing camera
Bug: 14819623
Change-Id: I4481c68a473cb790fa67a9648e80302f19bf3065
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| b19eaa0bb37a1252015eafd3e965a011e6e98727 |
|
02-May-2014 |
Seth Raphael <magicseth@google.com> |
Allow multiple aspect ratios to be set for the
resolution setting.
Bug: 13328191
Change-Id: Ie067d18b70bc1ae84dc284f881b7f6030f6a6622
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 677a5b9bc43ed30cc7b4df9db7848deb6b45e93b |
|
28-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am df8a3327: Avoid duplicate entries in the resolutions list.
* commit 'df8a332710bbb1f2beee90b2b91f706c49ef5701':
Avoid duplicate entries in the resolutions list.
|
| 4f1f5ecea11a8f06d213ea0aa963903882c4d727 |
|
28-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 837d8524: Properly remove the settings for an unavailable camera.
* commit '837d8524a35731ce01e2a69fde846edc21b94071':
Properly remove the settings for an unavailable camera.
|
| df8a332710bbb1f2beee90b2b91f706c49ef5701 |
|
25-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Avoid duplicate entries in the resolutions list.
Bug: 14277230
Dup entries indicate that a camera doesn't support at least three entries.
Change-Id: Id3c18664637ba9cf80edada924695737863cf3a7
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 00b7b10987b38c362cc88600aad58890d531bf35 |
|
25-Apr-2014 |
Angus Kong <shkong@google.com> |
Use Point to back up util.Size.
Change-Id: I125d290ee94c9acadf77c50c6c9c0b9b24df4a88
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 837d8524a35731ce01e2a69fde846edc21b94071 |
|
24-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Properly remove the settings for an unavailable camera.
Bug: 14108948
Change-Id: I34222ab976a481e8e28ed0bbc8b773dd3d49e8bb
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 634246650a5ae72bb80ab4fe4be5da1afa23b684 |
|
23-Apr-2014 |
Angus Kong <shkong@google.com> |
Use util.Size to replace Camera.Size.
Change-Id: I77784d339a09f24afbf96dc5ef4ce2ac2702b356
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| e8766be48ed4c0bd17d68a45152a34fa2c860b94 |
|
18-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't crash when less than two cameras are present.
Bug: 14108948
Change-Id: Ib288f9fd2bd86f870df22c1fde03184f00cea219
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.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/settings/CameraSettingsActivity.java
|
| d054061c389cc09e96362266cfb166749c72c54f |
|
05-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Fix Settings Activity
Bug: 13817516
Change-Id: Idb8b95c3501b52519ae97b6d603ee59e8cc50ce4
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 4b531ae5ac0f18b1625b62884780f113667b2404 |
|
04-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Add context to parameters passed to ExtraSettings
Bug: 13791528
Change-Id: Ibcc4db1ab07b274f18f1ab369747d759180f155b
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| ed107412eee6bdb7f24c09c41559b04fa80747f3 |
|
20-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Add ability to add extra settings.
Bug: 13077452
Change-Id: Id1159405d8cbbe3b84b94899b9f6352e64e428fa
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 04ca24b495c4b410dc8b6127b3af0ac29df74eb8 |
|
18-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Put resolution settings in a sub-screen.
Bug: 13512118
Also fixes a crash when going into settings.
Change-Id: I354749e2e4180e46d888b82e2c4d479cc7c06aca
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| 6ccec205c8d43757bcefd0202eb0cde0df020574 |
|
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
New resolution settings. Two for each camera.
Bug: 13025151
Bug: 13349351
Also fixes the issue of summaries not showing up before
changing a resolution setting.
Change-Id: I63482a79e742c0403ebf556148f7a12d4e6c8b0e
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| f42bfdc9ecd4149c982833abc9993612fb4ab152 |
|
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Add build version to settings and add settings headers.
Bug: 13329975
Bug: 13025151
Change-Id: I0259ec91da68efe1eed07b396f42fc69631413fd
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| cccd5023409b7d5185c26696e34ddf57226d5c17 |
|
14-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Add Licenses Activity support.
Bug: 13018845
Change-Id: I195d19da5430aa1c9ced068931be69d48d95efc0
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|
| de30323ee0598ed0e1c8a1ab942c3e16160062d3 |
|
07-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
New Settings UI and video quality selection logic.
Bug: 12467965
Bug: 12935910
Bug: 12575084
Implements the settings as a proper activity/fragment. Also cleans
up some of the old logic we had for handling and displaying settings.
Also has the new L/M/S logic for video quality.
Change-Id: I412af424b74369cef15c7ead2cb09704875972e3
/packages/apps/Camera2/src/com/android/camera/settings/CameraSettingsActivity.java
|