summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2015-11-10 10:06:42 -0800
committerSteve Kondik <steve@cyngn.com>2016-08-21 18:46:32 -0700
commit405ec58fa33d9cd46fb23e3d21ee93a0838c4d1d (patch)
treee9036f6ab842c1377e52a4758239f5c963e05af9 /src/com
parent9164c4d9db9644087959685442777b1c7f81e74e (diff)
downloadandroid_packages_apps_Snap-405ec58fa33d9cd46fb23e3d21ee93a0838c4d1d.tar.gz
android_packages_apps_Snap-405ec58fa33d9cd46fb23e3d21ee93a0838c4d1d.tar.bz2
android_packages_apps_Snap-405ec58fa33d9cd46fb23e3d21ee93a0838c4d1d.zip
SnapdragonCamera: Moving Image Stabilization option to the menu
Moving Image Stabilization option to the menu Change-Id: I7fb025a3d1909af436e7a52ee9d602b2ce2dc68b CRs-Fixed: 937237
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/VideoMenu.java18
-rw-r--r--src/com/android/camera/VideoModule.java3
-rw-r--r--src/com/android/camera/VideoUI.java7
3 files changed, 27 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 054db5d90..58331cfd3 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -117,6 +117,7 @@ public class VideoMenu extends MenuController
CameraSettings.KEY_EXPOSURE,
CameraSettings.KEY_WHITE_BALANCE,
CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE,
+ CameraSettings.KEY_DIS,
CameraSettings.KEY_POWER_SHUTTER,
CameraSettings.KEY_MAX_BRIGHTNESS
};
@@ -598,6 +599,21 @@ public class VideoMenu extends MenuController
}
}
+ private void overrideMenuFor4K() {
+ if(mListMenu != null && mUI.is4KEnabled())
+ {
+ mListMenu.setPreferenceEnabled(
+ CameraSettings.KEY_DIS,false);
+ mListMenu.overrideSettings(
+ CameraSettings.KEY_DIS, "disable");
+
+ mListMenu.setPreferenceEnabled(
+ CameraSettings.KEY_SEE_MORE, false);
+ mListMenu.overrideSettings(
+ CameraSettings.KEY_SEE_MORE, mActivity.getString(R.string.pref_camera_see_more_value_off));
+ }
+ }
+
public void overrideCDSMode() {
if (mListMenu != null) {
ListPreference pref_tnr = mPreferenceGroup.
@@ -659,6 +675,7 @@ public class VideoMenu extends MenuController
initializePopup();
} else {
overrideCDSMode();
+ overrideMenuFor4K();
}
mListMenu.overrideSettings(keyvalues);
@@ -694,6 +711,7 @@ public class VideoMenu extends MenuController
mListMenu = popup1;
overrideCDSMode();
+ overrideMenuFor4K();
}
public void popupDismissed(boolean topPopupOnly) {
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index cb0fa95af..02bf9d4b4 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -983,7 +983,7 @@ public class VideoModule implements CameraModule,
mPreferenceRead = true;
}
- private boolean is4KEnabled() {
+ public boolean is4KEnabled() {
if (mProfile.quality == CamcorderProfile.QUALITY_2160P ||
mProfile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_2160P ||
mProfile.quality == CamcorderProfile.QUALITY_4KDCI ) {
@@ -2346,6 +2346,7 @@ public class VideoModule implements CameraModule,
mActivity.getString(R.string.pref_camera_dis_value_disable));
RotateTextToast.makeText(mActivity, R.string.video_quality_4k_disable_IS,
Toast.LENGTH_LONG).show();
+ mIsDISEnabled = false;
} else {
Log.e(TAG, "Not supported IS mode = " +
mActivity.getString(R.string.pref_camera_dis_value_disable));
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index a9734258c..967339f7c 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -678,6 +678,13 @@ public class VideoUI implements PieRenderer.PieListener,
}
}
+ public boolean is4KEnabled() {
+ if(mController != null)
+ return ((VideoModule)mController).is4KEnabled();
+ else
+ return false;
+ }
+
private void popupDismissed() {
mPopup = null;
}