From 956aaa62fec3b4379103515b02eb5459b3fad92f Mon Sep 17 00:00:00 2001
From: Camera Software Integration <camswint@localhost>
Date: Tue, 10 Nov 2015 10:06:42 -0800
Subject: SnapdragonCamera: Moving Image Stabilization option to the menu

Moving Image Stabilization option to the menu

Change-Id: I7fb025a3d1909af436e7a52ee9d602b2ce2dc68b
CRs-Fixed: 937237
---
 src/com/android/camera/VideoMenu.java   | 20 +++++++++++++++++++-
 src/com/android/camera/VideoModule.java |  3 ++-
 src/com/android/camera/VideoUI.java     |  7 +++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'src')

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) {
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index abd19e5ce..f6ff881c5 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -871,7 +871,7 @@ public class VideoModule implements CameraModule,
         mPreferenceRead = true;
     }
 
-    private boolean is4KEnabled() {
+    public boolean is4KEnabled() {
        if (mProfile.quality == CamcorderProfile.QUALITY_2160P ||
            mProfile.quality == CamcorderProfile.QUALITY_4KDCI) {
            return true;
@@ -2128,6 +2128,7 @@ 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));
+                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 bac1e3c11..db27c7391 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -666,6 +666,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;
     }
-- 
cgit v1.2.3