From 84b2ffbcf4360332691379a7249a811d3e7c5bb0 Mon Sep 17 00:00:00 2001
From: Wilhelm Fitzpatrick <rafial@cyngn.com>
Date: Fri, 14 Nov 2014 16:31:35 -0800
Subject: 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
Signed-off-by: Chippa-a <vusal1372@gmail.com>
---
 res/xml/camera_preferences.xml       | 4 +---
 res/xml/capture_preferences.xml      | 2 --
 res/xml/setting_menu_preferences.xml | 2 --
 res/xml/video_preferences.xml        | 4 +---
 4 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'res/xml')

diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 5990ae8ef..68d6d3148 100755
--- 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 782a8001d..5c47e7bed 100755
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -149,8 +149,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/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml
index 51b858947..7524388bb 100755
--- a/res/xml/setting_menu_preferences.xml
+++ b/res/xml/setting_menu_preferences.xml
@@ -84,8 +84,6 @@
             android:layout="@layout/preference"
             android:title="@string/pref_camera_selfiemirror_title" />
         <ListPreference
-            android:entries="@array/pref_camera2_picturesize_entries"
-            android:entryValues="@array/pref_camera2_picturesize_entryvalues"
             android:icon="@drawable/picture_size"
             android:key="pref_camera2_picturesize_key"
             android:layout="@layout/preference"
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 1843bc1bb..1189356f3 100755
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -168,9 +168,7 @@
     <ListPreference
             camera:key="pref_camera_videosnapsize_key"
             camera:defaultValue="@string/pref_camera_videosnapsize_default"
-            camera:title="@string/pref_camera_picturesize_title"
-            camera:entries="@array/pref_camera_video_snapsize_entries"
-            camera:entryValues="@array/pref_camera_video_snapsize_entryvalues" />
+            camera:title="@string/pref_camera_picturesize_title" />
     <IconListPreference
             camera:key="pref_camera_savepath_key"
             camera:defaultValue="@string/pref_camera_savepath_default"
-- 
cgit v1.2.3