summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/drawable-hdpi/ic_eis_menu.pngbin0 -> 3364 bytes
-rw-r--r--res/drawable-xhdpi/ic_eis_menu.pngbin0 -> 4387 bytes
-rw-r--r--res/drawable-xxhdpi/ic_eis_menu.pngbin0 -> 6783 bytes
-rw-r--r--res/values/qcomstrings.xml1
-rw-r--r--res/xml/video_preferences.xml1
-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
8 files changed, 28 insertions, 2 deletions
diff --git a/res/drawable-hdpi/ic_eis_menu.png b/res/drawable-hdpi/ic_eis_menu.png
new file mode 100644
index 0000000..292be7a
--- /dev/null
+++ b/res/drawable-hdpi/ic_eis_menu.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_eis_menu.png b/res/drawable-xhdpi/ic_eis_menu.png
new file mode 100644
index 0000000..01c0a6d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_eis_menu.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_eis_menu.png b/res/drawable-xxhdpi/ic_eis_menu.png
new file mode 100644
index 0000000..62746e1
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_eis_menu.png
Binary files differ
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index c099acf..f54df4f 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -271,7 +271,6 @@
<!-- Sharpness -->
<string name="pref_camera_sharpness_title">Sharpness</string>
<string name="pref_camera_sharpness_default" translatable="false">2</string>
-
<string name="pref_camera_sharpness_entry_level0">Level 0</string>
<string name="pref_camera_sharpness_entry_level1">Level 1</string>
<string name="pref_camera_sharpness_entry_level2">Level 2 (default)</string>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 69dbfb0..f4f8522 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -114,6 +114,7 @@
camera:title="@string/pref_camera_dis_title"
camera:singleIcon="@drawable/ic_settings_stabilization"
camera:entries="@array/pref_camera_dis_entries"
+ camera:singleIcon="@drawable/ic_eis_menu"
camera:entryValues="@array/pref_camera_dis_entryvalues" />
<IconListPreference
camera:key="pref_camera_video_coloreffect_key"
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 054db5d..58331cf 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 cb0fa95..02bf9d4 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 a973425..967339f 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;
}