summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-05-05 01:18:52 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-05-05 01:18:52 -0700
commit90518958ceb2b1ef18f11aeacd02c7db7557e3b9 (patch)
tree1885f94328307e937e810701504e46793a1168e4 /src/com/android/camera
parenteb035ca7ff76f01d053724bb065bc6e6225d5743 (diff)
parentf5ea25b3a903d6ee26cbd719729b6aa819180d5a (diff)
downloadandroid_packages_apps_Snap-90518958ceb2b1ef18f11aeacd02c7db7557e3b9.tar.gz
android_packages_apps_Snap-90518958ceb2b1ef18f11aeacd02c7db7557e3b9.tar.bz2
android_packages_apps_Snap-90518958ceb2b1ef18f11aeacd02c7db7557e3b9.zip
Merge "SnapdragonCamera: Enable the TNR option in camera mode"
Diffstat (limited to 'src/com/android/camera')
-rw-r--r--src/com/android/camera/PhotoMenu.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 534924281..a70efdbad 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -603,7 +603,6 @@ public class PhotoMenu extends MenuController
mPrevSavedCDS = cds;
}
- mListMenu.setPreferenceEnabled(CameraSettings.KEY_TNR_MODE, false);
if ((tnr != null) && !mActivity.getString(R.string.
pref_camera_tnr_default).equals(tnr)) {
mListMenu.setPreferenceEnabled(CameraSettings.KEY_CDS_MODE, false);