summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoMenu.java
diff options
context:
space:
mode:
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) {