diff options
| author | Wilhelm Fitzpatrick <rafial@cyngn.com> | 2014-11-14 16:31:35 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 12:24:52 -0700 |
| commit | c76e6d8a2768487407fd5db3d1e917bc35f22c80 (patch) | |
| tree | 0b8c0e1d21e79dc90560f8b4d8f49724fb39d84d /res/xml | |
| parent | e4351681fcb22d2b08562bf14ebeb32573e41d7f (diff) | |
| download | android_packages_apps_Snap-c76e6d8a2768487407fd5db3d1e917bc35f22c80.tar.gz android_packages_apps_Snap-c76e6d8a2768487407fd5db3d1e917bc35f22c80.tar.bz2 android_packages_apps_Snap-c76e6d8a2768487407fd5db3d1e917bc35f22c80.zip | |
CameraNext: dynamically generate available photo resolutions
Instead of depending on a large matching table, generated the list
of picture sizes to show to the user directly from the supported
list returned by the camera. The list is filtered to remove
uselessly small resolutions on modern devices, to group resolutions
by aspect ratio, and to filter out fairly similar sizes.
Change-Id: I47a67a89786543baec133cf7e71df9819793ebac
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/camera_preferences.xml | 4 | ||||
| -rw-r--r-- | res/xml/capture_preferences.xml | 2 | ||||
| -rw-r--r-- | res/xml/video_preferences.xml | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index d8f136635..a91dc0bd9 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -70,9 +70,7 @@ <IconListPreference camera:key="pref_camera_picturesize_key" camera:singleIcon="@drawable/ic_settings_picturesize" - camera:title="@string/pref_camera_picturesize_title" - camera:entries="@array/pref_camera_picturesize_entries" - camera:entryValues="@array/pref_camera_picturesize_entryvalues" /> + camera:title="@string/pref_camera_picturesize_title" /> <IconListPreference camera:key="pref_camera_focusmode_key" camera:defaultValue="@array/pref_camera_focusmode_default_array" diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index 4a027b2f1..cd8443331 100644 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -151,8 +151,6 @@ camera:title="@string/pref_camera_id_title"/> <IconListPreference - camera:entries="@array/pref_camera2_picturesize_entries" - camera:entryValues="@array/pref_camera2_picturesize_entryvalues" camera:key="pref_camera2_picturesize_key" camera:singleIcon="@drawable/ic_settings_picturesize" camera:title="@string/pref_camera_picturesize_title"/> diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index dce15b8f7..a3fd838c2 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -176,9 +176,7 @@ camera:key="pref_camera_videosnapsize_key" camera:defaultValue="@string/pref_camera_videosnapsize_default" camera:title="@string/pref_camera_picturesize_title" - camera:singleIcon="@drawable/ic_settings_size" - camera:entries="@array/pref_camera_video_snapsize_entries" - camera:entryValues="@array/pref_camera_video_snapsize_entryvalues" /> + camera:singleIcon="@drawable/ic_settings_size" /> <IconListPreference camera:key="pref_camera_savepath_key" camera:defaultValue="@string/pref_camera_savepath_default" |