summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2017-07-26 15:19:15 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-08-03 00:22:08 -0700
commit1d5a27e190b75e3ec637e471fd01480c658371ee (patch)
tree862190b1326b97c594fbea9ea5a3f843aa140d3b /src/com/android/camera/PhotoMenu.java
parentf04b041ac7d1da4cb7964079f48f43227ee89d04 (diff)
downloadandroid_packages_apps_Snap-1d5a27e190b75e3ec637e471fd01480c658371ee.tar.gz
android_packages_apps_Snap-1d5a27e190b75e3ec637e471fd01480c658371ee.tar.bz2
android_packages_apps_Snap-1d5a27e190b75e3ec637e471fd01480c658371ee.zip
SnapdragonCamera:Disalbe options in RTB
Disable some options in the setting when it's in real time bokeh mode and modify the style of seekbar and bokeh text. Change-Id: If6f2fe40c3a405ac8a4451029d18e38d93305ef5
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rw-r--r--src/com/android/camera/PhotoMenu.java45
1 files changed, 43 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 083647bf9..5b3ea1eb2 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -31,6 +31,7 @@ import android.hardware.Camera.Parameters;
import android.graphics.Rect;
import android.os.Handler;
import android.os.Message;
+import android.preference.Preference;
import android.preference.PreferenceManager;
import android.text.TextUtils;
import android.util.Log;
@@ -560,9 +561,7 @@ public class PhotoMenu extends MenuController
View v2 = ((ViewGroup) v).getChildAt(0);
if (v2 != null)
v2.setEnabled(enable);
-
}
-
}
public boolean isOverMenu(MotionEvent ev) {
@@ -784,6 +783,38 @@ public class PhotoMenu extends MenuController
mHdrSwitcher.setVisibility(View.VISIBLE);
}
+ pref = mPreferenceGroup.findPreference(CameraSettings.KEY_BOKEH_MODE);
+ String bokeh = (pref != null) ? pref.getValue() : null;
+ if ("1".equals(bokeh)) {
+ buttonSetEnabled(mHdrSwitcher,false);
+ buttonSetEnabled(mSceneModeSwitcher,false);
+ buttonSetEnabled(mFilterModeSwitcher,false);
+ popup1.setPreferenceEnabled(CameraSettings.KEY_SCENE_MODE,false);
+ popup1.setPreferenceEnabled(CameraSettings.KEY_CAMERA_HDR,false);
+ popup1.setPreferenceEnabled(CameraSettings.KEY_ZSL,false);
+ popup1.setPreferenceEnabled(CameraSettings.KEY_FLASH_MODE,false);
+ popup1.setPreferenceEnabled(CameraSettings.KEY_LONGSHOT,false);
+ popup1.setPreferenceEnabled(CameraSettings.KEY_COLOR_EFFECT,false);
+ popup1.setPreferenceEnabled(CameraSettings.KEY_QC_CHROMA_FLASH,false);
+ popup1.setPreferenceEnabled(CameraSettings.KEY_PICTURE_SIZE,false);
+
+ setPreference(CameraSettings.KEY_SCENE_MODE,
+ mActivity.getString(R.string.pref_camera_scenemode_default));
+ setPreference(CameraSettings.KEY_CAMERA_HDR,"off");
+ setPreference(CameraSettings.KEY_ZSL,
+ mActivity.getString(R.string.pref_camera_zsl_value_on));
+ setPreference(CameraSettings.KEY_FLASH_MODE, "off");
+ setPreference(CameraSettings.KEY_LONGSHOT, "off");
+ setPreference(CameraSettings.KEY_COLOR_EFFECT,"none");
+ setPreference(CameraSettings.KEY_QC_CHROMA_FLASH,"off");
+ ListPreference picSize =
+ mPreferenceGroup.findPreference(CameraSettings.KEY_PICTURE_SIZE);
+ CharSequence maxSize = picSize.getEntryValues()[0];
+ if (maxSize != null) {
+ setPreference(CameraSettings.KEY_PICTURE_SIZE,maxSize.toString());
+ }
+ }
+
if (mListener != null) {
mListener.onSharedPreferenceChanged();
}
@@ -886,6 +917,7 @@ public class PhotoMenu extends MenuController
((ImageView) v).setImageResource(
((IconListPreference) pref).getLargeIconIds()[index]);
reloadPreference(pref);
+ initializePopup();
onSettingChanged(bokehPref);
} else {
@@ -1547,6 +1579,15 @@ public class PhotoMenu extends MenuController
mActivity.requestLocationPermission();
}
+ if (same(pref, CameraSettings.KEY_BOKEH_MODE, "1")) {
+ ListPreference scene =
+ mPreferenceGroup.findPreference(CameraSettings.KEY_SCENE_MODE);
+ updateSceneModeIcon((IconListPreference)scene);
+ changeFilterModeControlIcon("none");
+ buttonSetEnabled(mHdrSwitcher,false);
+ buttonSetEnabled(mSceneModeSwitcher,false);
+ buttonSetEnabled(mFilterModeSwitcher,false);
+ }
super.onSettingChanged(pref);
}