summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoMenu.java
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2015-11-10 10:06:42 -0800
committerCamera Software Integration <camswint@localhost>2015-12-22 16:24:43 +0530
commit956aaa62fec3b4379103515b02eb5459b3fad92f (patch)
tree0556ed02b6f633e95782b1b840a8507c9d21bc2b /src/com/android/camera/VideoMenu.java
parentd074a0ed7d81cbad424f738df27766bbba496ffa (diff)
downloadandroid_packages_apps_Snap-956aaa62fec3b4379103515b02eb5459b3fad92f.tar.gz
android_packages_apps_Snap-956aaa62fec3b4379103515b02eb5459b3fad92f.tar.bz2
android_packages_apps_Snap-956aaa62fec3b4379103515b02eb5459b3fad92f.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/android/camera/VideoMenu.java')
-rw-r--r--src/com/android/camera/VideoMenu.java20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 3d45bd169..6ff4d2df0 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -113,7 +113,8 @@ public class VideoMenu extends MenuController
CameraSettings.KEY_RECORD_LOCATION,
CameraSettings.KEY_CAMERA_SAVEPATH,
CameraSettings.KEY_WHITE_BALANCE,
- CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE
+ CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE,
+ CameraSettings.KEY_DIS
};
mOtherKeys2 = new String[] {
CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE,
@@ -653,6 +654,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.
@@ -700,6 +716,7 @@ public class VideoMenu extends MenuController
initializePopup();
} else {
overrideCDSMode();
+ overrideMenuFor4K();
}
mListMenu.overrideSettings(keyvalues);
@@ -731,6 +748,7 @@ public class VideoMenu extends MenuController
mListMenu = popup1;
overrideCDSMode();
+ overrideMenuFor4K();
}
public void popupDismissed(boolean topPopupOnly) {