diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2016-05-01 12:19:41 +0200 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2018-01-26 01:06:32 +0100 |
| commit | c0bb610c2010abc8658000474b4d0806e4856cfb (patch) | |
| tree | 9516328dd362b5b6e8e5af92724e152a2bc4c1dd /src | |
| parent | ed7ba768f2b23ec67f694fdd0f2e921f1d5d8322 (diff) | |
| download | android_packages_apps_Snap-c0bb610c2010abc8658000474b4d0806e4856cfb.tar.gz android_packages_apps_Snap-c0bb610c2010abc8658000474b4d0806e4856cfb.tar.bz2 android_packages_apps_Snap-c0bb610c2010abc8658000474b4d0806e4856cfb.zip | |
Snap: Extend user menu, disable dev menu
Change-Id: Iaa64372e5d196fd0117a32a386686bdb1fd51e45
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 42 |
2 files changed, 31 insertions, 15 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 4b5384f07..4039bcc96 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -395,6 +395,10 @@ public class CameraActivity extends Activity mDeveloperMenuEnabled = true; } + public void disableDeveloperMenu() { + mDeveloperMenuEnabled = false; + } + private String fileNameFromDataID(int dataID) { final LocalData localData = mDataAdapter.getLocalData(dataID); diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 3b9e8a83f..67d71bcd2 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -204,7 +204,13 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_SELFIE_MIRROR, CameraSettings.KEY_SHUTTER_SOUND, CameraSettings.KEY_POWER_SHUTTER, - CameraSettings.KEY_MAX_BRIGHTNESS + CameraSettings.KEY_MAX_BRIGHTNESS, + CameraSettings.KEY_SATURATION, + CameraSettings.KEY_CONTRAST, + CameraSettings.KEY_SHARPNESS, + CameraSettings.KEY_AUTOEXPOSURE, + CameraSettings.KEY_ANTIBANDING, + CameraSettings.KEY_DENOISE }; mOtherKeys2 = new String[] { @@ -227,6 +233,12 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_REDEYE_REDUCTION, CameraSettings.KEY_POWER_SHUTTER, CameraSettings.KEY_MAX_BRIGHTNESS, + CameraSettings.KEY_SATURATION, + CameraSettings.KEY_CONTRAST, + CameraSettings.KEY_SHARPNESS, + CameraSettings.KEY_AUTOEXPOSURE, + CameraSettings.KEY_ANTIBANDING, + CameraSettings.KEY_DENOISE, CameraSettings.KEY_AUTO_HDR, CameraSettings.KEY_HDR_MODE, CameraSettings.KEY_HDR_NEED_1X, @@ -238,12 +250,6 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_FACE_RECOGNITION, CameraSettings.KEY_SELECTABLE_ZONE_AF, CameraSettings.KEY_PICTURE_FORMAT, - CameraSettings.KEY_SATURATION, - CameraSettings.KEY_CONTRAST, - CameraSettings.KEY_SHARPNESS, - CameraSettings.KEY_AUTOEXPOSURE, - CameraSettings.KEY_ANTIBANDING, - CameraSettings.KEY_DENOISE, CameraSettings.KEY_ADVANCED_FEATURES, CameraSettings.KEY_AE_BRACKET_HDR, CameraSettings.KEY_INSTANT_CAPTURE, @@ -1375,20 +1381,26 @@ public class PhotoMenu extends MenuController } public void onPreferenceClicked(ListPreference pref, int y) { - if (!mActivity.isDeveloperMenuEnabled()) { - if (pref.getKey().equals(CameraSettings.KEY_REDEYE_REDUCTION)) { - privateCounter++; - if (privateCounter >= DEVELOPER_MENU_TOUCH_COUNT) { + // Developer menu + if (pref.getKey().equals(CameraSettings.KEY_REDEYE_REDUCTION)) { + privateCounter++; + if (privateCounter >= DEVELOPER_MENU_TOUCH_COUNT) { + SharedPreferences prefs = PreferenceManager + .getDefaultSharedPreferences(mActivity); + if (!mActivity.isDeveloperMenuEnabled()) { mActivity.enableDeveloperMenu(); - SharedPreferences prefs = PreferenceManager - .getDefaultSharedPreferences(mActivity); prefs.edit().putBoolean(CameraSettings.KEY_DEVELOPER_MENU, true).apply(); RotateTextToast.makeText(mActivity, "Camera developer option is enabled now", Toast.LENGTH_SHORT).show(); + } else { + mActivity.disableDeveloperMenu(); + prefs.edit().putBoolean(CameraSettings.KEY_DEVELOPER_MENU, false).apply(); + RotateTextToast.makeText(mActivity, + "Camera developer option is disabled now", Toast.LENGTH_SHORT).show(); } - } else { - privateCounter = 0; } + } else { + privateCounter = 0; } LayoutInflater inflater = (LayoutInflater) mActivity.getSystemService( Context.LAYOUT_INFLATER_SERVICE); |