diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-09-09 22:31:28 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-09-09 22:31:28 -0700 |
| commit | e7dbe37267ecbf8d0cbaad5e735e7873f1f22c9a (patch) | |
| tree | 1c20f21b992be20530f55da69b68e308481822e8 /src | |
| parent | efc5a1d20f0821306db9051771019c66ec913693 (diff) | |
| parent | dc2b0bbb5f969c882f8602c42fd4cf049875b8eb (diff) | |
| download | android_packages_apps_Snap-e7dbe37267ecbf8d0cbaad5e735e7873f1f22c9a.tar.gz android_packages_apps_Snap-e7dbe37267ecbf8d0cbaad5e735e7873f1f22c9a.tar.bz2 android_packages_apps_Snap-e7dbe37267ecbf8d0cbaad5e735e7873f1f22c9a.zip | |
Merge "SnapdragonCamera: Fix the 4K video relative toast issue"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 4aa686c51..ffbbc0ed4 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2028,8 +2028,6 @@ public class VideoModule implements CameraModule, mActivity.getString(R.string.pref_camera_dis_value_disable)); mUI.overrideSettings(CameraSettings.KEY_DIS, mActivity.getString(R.string.pref_camera_dis_value_disable)); - RotateTextToast.makeText(mActivity, R.string.video_quality_4k_disable_IS, - Toast.LENGTH_LONG).show(); } else { Log.e(TAG, "Not supported IS mode = " + mActivity.getString(R.string.pref_camera_dis_value_disable)); @@ -2446,6 +2444,22 @@ public class VideoModule implements CameraModule, @Override public void onSharedPreferenceChanged(ListPreference pref) { + if (pref != null && CameraSettings.KEY_VIDEO_QUALITY.equals(pref.getKey())) { + String videoQuality = pref.getValue(); + if (CameraSettings.VIDEO_QUALITY_TABLE.containsKey(videoQuality)) { + int quality = CameraSettings.VIDEO_QUALITY_TABLE.get(videoQuality); + if ((quality == CamcorderProfile.QUALITY_2160P + || quality == CamcorderProfile.QUALITY_4kDCI) + && mPreferences != null) { + String disDisable = mActivity.getString(R.string.pref_camera_dis_value_disable); + if (!disDisable.equals( + mPreferences.getString(CameraSettings.KEY_DIS, disDisable))) { + RotateTextToast.makeText(mActivity, R.string.video_quality_4k_disable_IS, + Toast.LENGTH_LONG).show(); + } + } + } + } onSharedPreferenceChanged(); } |