diff options
-rw-r--r-- | res/drawable-xxhdpi/ic_hq_disabled.png | bin | 0 -> 8857 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_hq_disabled_pressed.png | bin | 0 -> 8295 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_hq_normal.png | bin | 0 -> 6630 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_hq_normal_pressed.png | bin | 0 -> 6719 bytes | |||
-rw-r--r-- | res/values/arrays.xml | 21 | ||||
-rw-r--r-- | res/values/strings.xml | 3 | ||||
-rw-r--r-- | res/xml/camera_preferences.xml | 9 | ||||
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 2 | ||||
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 10 | ||||
-rw-r--r-- | src/com/android/camera/PhotoMenu.java | 6 | ||||
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 10 | ||||
-rw-r--r-- | src/com/android/camera/ui/ModuleSwitcher.java | 4 | ||||
-rw-r--r-- | src/com/android/camera/util/ApiHelper.java | 1 | ||||
-rw-r--r-- | src_pd_gcam/com/android/camera/util/GcamHelper.java | 2 |
14 files changed, 59 insertions, 9 deletions
diff --git a/res/drawable-xxhdpi/ic_hq_disabled.png b/res/drawable-xxhdpi/ic_hq_disabled.png Binary files differnew file mode 100644 index 000000000..74d73afff --- /dev/null +++ b/res/drawable-xxhdpi/ic_hq_disabled.png diff --git a/res/drawable-xxhdpi/ic_hq_disabled_pressed.png b/res/drawable-xxhdpi/ic_hq_disabled_pressed.png Binary files differnew file mode 100644 index 000000000..fc84bd745 --- /dev/null +++ b/res/drawable-xxhdpi/ic_hq_disabled_pressed.png diff --git a/res/drawable-xxhdpi/ic_hq_normal.png b/res/drawable-xxhdpi/ic_hq_normal.png Binary files differnew file mode 100644 index 000000000..1b601ee39 --- /dev/null +++ b/res/drawable-xxhdpi/ic_hq_normal.png diff --git a/res/drawable-xxhdpi/ic_hq_normal_pressed.png b/res/drawable-xxhdpi/ic_hq_normal_pressed.png Binary files differnew file mode 100644 index 000000000..e6e83343d --- /dev/null +++ b/res/drawable-xxhdpi/ic_hq_normal_pressed.png diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 545765033..eb893d48a 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -430,6 +430,27 @@ <item>@drawable/ic_video_effects_background_normal_holo_dark</item> </array> + <string-array name="pref_camera_hq_entries" translatable="false"> + <item>@string/setting_off</item> + <item>@string/setting_on</item> + </string-array> + + <string-array name="pref_camera_hq_labels" translatable="false"> + <item>@string/pref_camera_scenemode_entry_hq</item> + <item>@string/pref_camera_scenemode_entry_hq</item> + </string-array> + + <string-array name="pref_camera_hq_icons" translatable="false"> + <item>@drawable/ic_hq_disabled</item> + <item>@drawable/ic_hq_normal</item> + </string-array> + + <string-array name="pref_camera_hq_entryvalues" translatable="false"> + <item>@string/setting_off_value</item> + <item>@string/setting_on_value</item> + </string-array> + + <string-array name="pref_camera_hdr_entries" translatable="false"> <item>@string/setting_off</item> <item>@string/setting_on</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index eee320339..9639f604b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -397,6 +397,9 @@ <!-- Default HDR entry value --> <string name="pref_camera_hdr_default">@string/setting_off_value</string> + <!-- Default HQ entry value --> + <string name="pref_camera_hq_default">@string/setting_off_value</string> + <!-- HDR label ON [CHAR LIMIT=60] --> <string name="pref_camera_hdr_label">HDR</string> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index b97840456..c745e84aa 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -88,6 +88,15 @@ camera:largeIcons="@array/pref_camera_hdr_icons" camera:labelList="@array/pref_camera_hdr_labels" camera:entryValues="@array/pref_camera_hdr_entryvalues" /> + <IconListPreference + camera:key="pref_camera_hq_key" + camera:defaultValue="@string/pref_camera_hq_default" + camera:title="@string/pref_camera_scenemode_entry_hq" + camera:entries="@array/pref_camera_hq_entries" + camera:icons="@array/pref_camera_hq_icons" + camera:largeIcons="@array/pref_camera_hq_icons" + camera:labelList="@array/pref_camera_hq_labels" + camera:entryValues="@array/pref_camera_hq_entryvalues" /> <CountDownTimerPreference camera:key="pref_camera_timer_key" camera:defaultValue="@string/pref_camera_timer_default" diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index d4a72055d..55b3dd7c5 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -944,7 +944,7 @@ public class CameraActivity extends Activity SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); moduleIndex = prefs.getInt(PREF_STARTUP_MODULE_INDEX, -1); if ((moduleIndex == ModuleSwitcher.GCAM_MODULE_INDEX && - !GcamHelper.hasGcamCapture(this)) || moduleIndex < 0) { + !GcamHelper.hasGcamCapture()) || moduleIndex < 0) { moduleIndex = ModuleSwitcher.PHOTO_MODULE_INDEX; } } diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 19d0fda56..6faabcd5b 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -61,6 +61,7 @@ public class CameraSettings { public static final String KEY_VIDEO_EFFECT = "pref_video_effect_key"; public static final String KEY_CAMERA_ID = "pref_camera_id_key"; public static final String KEY_CAMERA_HDR = "pref_camera_hdr_key"; + public static final String KEY_CAMERA_HQ = "pref_camera_hq_key"; public static final String KEY_CAMERA_FIRST_USE_HINT_SHOWN = "pref_camera_first_use_hint_shown_key"; public static final String KEY_VIDEO_FIRST_USE_HINT_SHOWN = "pref_video_first_use_hint_shown_key"; public static final String KEY_PHOTOSPHERE_PICTURESIZE = "pref_photosphere_picturesize_key"; @@ -170,6 +171,7 @@ public class CameraSettings { group.findPreference(KEY_VIDEOCAMERA_FLASH_MODE); ListPreference videoEffect = group.findPreference(KEY_VIDEO_EFFECT); ListPreference cameraHdr = group.findPreference(KEY_CAMERA_HDR); + ListPreference cameraHq = group.findPreference(KEY_CAMERA_HQ); // Since the screen could be loaded from different resources, we need // to check if the preference is available here @@ -216,10 +218,14 @@ public class CameraSettings { if (videoEffect != null) { filterUnsupportedOptions(group, videoEffect, null); } - if (cameraHdr != null && !GcamHelper.hasGcamAsHDRMode() - && (!ApiHelper.HAS_CAMERA_HDR || !CameraUtil.isCameraHdrSupported(mParameters))) { + if (cameraHdr != null && !ApiHelper.HAS_CAMERA_HDR + || !CameraUtil.isCameraHdrSupported(mParameters)) { removePreference(group, cameraHdr.getKey()); } + if (cameraHq != null && (!ApiHelper.HAS_CAMERA_HQ + | !GcamHelper.hasGcamAsHDRMode())) { + removePreference(group, cameraHq.getKey()); + } } private void buildExposureCompensation( diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 6f47e136a..77e8de417 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -55,6 +55,12 @@ public class PhotoMenu extends PieController Locale locale = res.getConfiguration().locale; // the order is from left to right in the menu + // hq (GCam) + if (group.findPreference(CameraSettings.KEY_CAMERA_HQ) != null) { + item = makeSwitchItem(CameraSettings.KEY_CAMERA_HQ, true); + mRenderer.addItem(item); + } + // hdr if (group.findPreference(CameraSettings.KEY_CAMERA_HDR) != null) { item = makeSwitchItem(CameraSettings.KEY_CAMERA_HDR, true); diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 915cbc8a5..fc23876cc 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1619,12 +1619,16 @@ public class PhotoModule // Since changing scene mode may change supported values, set scene mode // first. HDR is a scene mode. To promote it in UI, it is stored in a // separate preference. + String onValue = mActivity.getString(R.string.setting_on_value); String hdr = mPreferences.getString(CameraSettings.KEY_CAMERA_HDR, mActivity.getString(R.string.pref_camera_hdr_default)); - boolean doGcamModeSwitch = false; - String onValue = mActivity.getString(R.string.setting_on_value); + String hq = mPreferences.getString(CameraSettings.KEY_CAMERA_HQ, + mActivity.getString(R.string.pref_camera_hq_default)); boolean hdrOn = onValue.equals(hdr); - if ( hdrOn && GcamHelper.hasGcamAsHDRMode()) { + boolean hqOn = onValue.equals(hq); + + boolean doGcamModeSwitch = false; + if (hqOn && GcamHelper.hasGcamCapture()) { // Kick off mode switch to gcam. doGcamModeSwitch = true; } else { diff --git a/src/com/android/camera/ui/ModuleSwitcher.java b/src/com/android/camera/ui/ModuleSwitcher.java index 7c74651f6..9493d98b7 100644 --- a/src/com/android/camera/ui/ModuleSwitcher.java +++ b/src/com/android/camera/ui/ModuleSwitcher.java @@ -108,7 +108,7 @@ public class ModuleSwitcher extends RotateImageView --numDrawIds; } - if (!GcamHelper.hasGcamCapture(context) || GcamHelper.hasGcamAsHDRMode()) { + if (!GcamHelper.hasGcamCapture() || GcamHelper.hasGcamAsHDRMode()) { --numDrawIds; } @@ -120,7 +120,7 @@ public class ModuleSwitcher extends RotateImageView continue; // not enabled, so don't add to UI } if (i == GCAM_MODULE_INDEX - && (!GcamHelper.hasGcamCapture(context) || GcamHelper.hasGcamAsHDRMode())) { + && (!GcamHelper.hasGcamCapture() || GcamHelper.hasGcamAsHDRMode())) { continue; // not enabled, so don't add to UI } moduleids[ix] = i; diff --git a/src/com/android/camera/util/ApiHelper.java b/src/com/android/camera/util/ApiHelper.java index 994687f84..46cfd6183 100644 --- a/src/com/android/camera/util/ApiHelper.java +++ b/src/com/android/camera/util/ApiHelper.java @@ -39,6 +39,7 @@ public class ApiHelper { public static final boolean HAS_SURFACE_TEXTURE_RECORDING = Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN; + public static final boolean HAS_CAMERA_HQ = isKitKatOrHigher(); public static final boolean HAS_CAMERA_HDR = Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1; public static final boolean HAS_DISPLAY_LISTENER = diff --git a/src_pd_gcam/com/android/camera/util/GcamHelper.java b/src_pd_gcam/com/android/camera/util/GcamHelper.java index 387bfd6eb..343d7aff2 100644 --- a/src_pd_gcam/com/android/camera/util/GcamHelper.java +++ b/src_pd_gcam/com/android/camera/util/GcamHelper.java @@ -25,7 +25,7 @@ public class GcamHelper { return null; } - public static boolean hasGcamCapture(Context context) { + public static boolean hasGcamCapture() { return false; } |