diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2016-05-01 12:19:41 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2016-05-14 09:59:25 -0700 |
| commit | 1705a874846e943bb99bad786ce712a9ca22f76c (patch) | |
| tree | 8e5af9463146bfc4c8a9f69f35552b9b3dc8d916 | |
| parent | 90d46ce67038232e342e60447c7f93e75baa8712 (diff) | |
| download | android_packages_apps_Snap-1705a874846e943bb99bad786ce712a9ca22f76c.tar.gz android_packages_apps_Snap-1705a874846e943bb99bad786ce712a9ca22f76c.tar.bz2 android_packages_apps_Snap-1705a874846e943bb99bad786ce712a9ca22f76c.zip | |
Snap: Extend user menu, disable dev menu
Change-Id: Iaa64372e5d196fd0117a32a386686bdb1fd51e45
| -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 ba79b1cbd..47124dd07 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -388,6 +388,10 @@ public class CameraActivity extends Activity mDeveloperMenuEnabled = true; } + public void disableDeveloperMenu() { + mDeveloperMenuEnabled = false; + } + public static void resetFirstStartAfterScreenOn() { sFirstStartAfterScreenOn = false; } diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 9627c3e19..d6efc069a 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -158,7 +158,13 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_SHUTTER_SPEED, CameraSettings.KEY_REDEYE_REDUCTION, 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[] { @@ -180,6 +186,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, @@ -191,12 +203,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_MANUAL_EXPOSURE, @@ -978,20 +984,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( |