summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/settings/CameraSettingsActivity.java
Commit message (Expand)AuthorAgeFilesLines
* Fix storage location NPEMichael Bestas2015-06-031-1/+1
* Add Storage preference (1/2)dcalandria2015-05-311-0/+47
* Merge branch 'lollipop-mr1-release' of https://android.googlesource.com/platf...staging/cm-12.1Steve Kondik2015-03-241-6/+24
|\
| * Check for null when deleting preference groupsAlan Newberger2014-10-221-0/+8
| * Migrate Settings Fragment to use argumentsAlan Newberger2014-10-141-6/+16
* | Camera2: Remove google help preferenceMichael Bestas2015-02-151-11/+0
* | Camera2: Remove settings preferences only onceKonsta2014-12-081-2/+4
|/
* Fix CameraSettingsActivityHelperAlan Newberger2014-09-161-6/+9
* Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-g...Alan Newberger2014-08-161-0/+4
|\
| * Protect Camera2 functions from null CameraDeviceInfoAlan Newberger2014-08-151-0/+4
* | Merge "Enable seamless switching to/from camera2-backed Photo module" into ub...Sol Boucher2014-08-151-1/+3
|\ \ | |/ |/|
| * Enable seamless switching to/from camera2-backed Photo moduleSol Boucher2014-08-151-1/+3
* | Move preference subscreens to new Activities from DialogsAlan Newberger2014-08-151-26/+57
|/
* Eliminate unnecessary context in FragmentActivity constructorSol Boucher2014-07-091-7/+2
* Make app build against updated frameworks/ex portability librarySol Boucher2014-07-081-2/+7
* resolved conflicts for merge of ff899495 to ub-camera-glacierSascha Haeberling2014-07-071-3/+2
|\
| * Fix regression: Update summary when quality settings change.Sascha Haeberling2014-07-071-4/+2
* | resolved conflicts for merge of deb09a7c to ub-camera-glacierErin Dahlgren2014-06-271-61/+1
|\|
| * GoogleHelp launch edits.Erin Dahlgren2014-06-271-58/+1
* | Replace uses of CameraDevice#getCameraInfos() and CameraInfoSol Boucher2014-06-231-2/+6
* | New Settings APIErin Dahlgren2014-06-181-14/+17
* | Remove cameradevice subpackage and point references at ex librarySol Boucher2014-06-181-1/+1
* | am 51c55dac: Merge "GoogleHelp affordance in CameraSettingsActivity" into ub-...Erin Dahlgren2014-06-131-4/+39
|\|
| * GoogleHelp affordance in CameraSettingsActivityErin Dahlgren2014-06-131-4/+39
* | Refactor out Camera.Parameters.Angus Kong2014-06-121-2/+1
|/
* Convert camera size settings on upgradeSeth Raphael2014-05-221-22/+2
* Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed upAndy Huibers2014-05-211-8/+8
* Use approximate descriptions of aspect ratios.Seth Raphael2014-05-151-2/+3
* Localize aspect ratios in settings summariesSeth Raphael2014-05-121-2/+6
* Do not display large 16x9 option on N5 front camSeth Raphael2014-05-121-2/+3
* Allow multiple aspect ratios to be set for theSeth Raphael2014-05-021-43/+40
* am df8a3327: Avoid duplicate entries in the resolutions list.Sascha Haeberling2014-04-281-10/+23
|\
| * Avoid duplicate entries in the resolutions list.Sascha Haeberling2014-04-251-10/+23
* | am 837d8524: Properly remove the settings for an unavailable camera.Sascha Haeberling2014-04-281-5/+27
|\|
| * Properly remove the settings for an unavailable camera.Sascha Haeberling2014-04-241-5/+27
* | Use Point to back up util.Size.Angus Kong2014-04-241-1/+1
* | Use util.Size to replace Camera.Size.Angus Kong2014-04-231-5/+7
|/
* Don't crash when less than two cameras are present.Sascha Haeberling2014-04-171-5/+21
* exposure compensation control is backSpike Sprague2014-04-041-8/+18
* Fix Settings ActivitySeth Raphael2014-04-041-2/+1
* Add context to parameters passed to ExtraSettingsSeth Raphael2014-04-041-7/+10
* Add ability to add extra settings.Sascha Haeberling2014-03-201-1/+4
* Put resolution settings in a sub-screen.Sascha Haeberling2014-03-171-3/+34
* New resolution settings. Two for each camera.Sascha Haeberling2014-03-141-19/+246
* Add build version to settings and add settings headers.Sascha Haeberling2014-03-051-0/+11
* Add Licenses Activity support.Sascha Haeberling2014-02-141-0/+7
* New Settings UI and video quality selection logic.Sascha Haeberling2014-02-111-0/+119