diff options
| author | Ethan Chen <intervigil@gmail.com> | 2013-12-12 18:18:32 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-12-18 23:55:36 +0000 |
| commit | 3cf4d9250091dd9e8644d78a6f9959f4f3af1732 (patch) | |
| tree | e91abd3e0e46e13dc7a032cc18ca6cc656e29f06 /src | |
| parent | fd68e408cc538108022068257688c0527874f0f6 (diff) | |
| download | android_packages_apps_Gallery2-stable/cm-10.2.tar.gz android_packages_apps_Gallery2-stable/cm-10.2.tar.bz2 android_packages_apps_Gallery2-stable/cm-10.2.zip | |
Camera: Add indicator icon for burst modecm-10.2.1stable/cm-10.2
* Patchset places burst mode indicator next to auto-scene detect
if active.
Change-Id: Iba3f89490221b16dcce2531962f84752c00b1eef
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 9 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 26 |
2 files changed, 35 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 4eebbf6e7..9f2a45ec8 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -259,6 +259,9 @@ public class PhotoMenu extends PieController } }); more.addItem(item); + // burst mode + final ListPreference burstPref = group.findPreference(CameraSettings.KEY_BURST_MODE); + mUI.updateBurstModeIcon(Integer.valueOf(burstPref.getValue())); } @Override @@ -318,6 +321,12 @@ public class PhotoMenu extends PieController setPreference(CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO); setPreference(CameraSettings.KEY_ASD, mSettingOff); setPreference(CameraSettings.KEY_BEAUTY_MODE, mSettingOff); + } else if (notSame(pref, CameraSettings.KEY_TIMER, "0")) { + setPreference(CameraSettings.KEY_BURST_MODE, "1"); + mUI.updateBurstModeIcon(1); + } else if (pref.getKey().equals(CameraSettings.KEY_BURST_MODE)) { + setPreference(CameraSettings.KEY_TIMER, "0"); + mUI.updateBurstModeIcon(Integer.valueOf(pref.getValue())); } super.onSettingChanged(pref); } diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index f629a4daa..2a671bd2e 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -88,6 +88,8 @@ public class PhotoUI implements PieListener, private ImageView mSceneDetectView; + private ImageView mBurstModeView; + private OnScreenIndicators mOnScreenIndicators; protected PieRenderer mPieRenderer; @@ -146,6 +148,7 @@ public class PhotoUI implements PieListener, } } mSceneDetectView = (ImageView) mRootView.findViewById(R.id.scene_detect_icon); + mBurstModeView = (ImageView) mRootView.findViewById(R.id.burst_mode_icon); } public View getRootView() { @@ -747,5 +750,28 @@ public class PhotoUI implements PieListener, } mSceneDetectView.setVisibility(View.VISIBLE); } + + public void updateBurstModeIcon(int burstCount) { + if (burstCount == 1) { + mBurstModeView.setVisibility(View.GONE); + return; + } + + switch (burstCount) { + case 5: + mBurstModeView.setImageResource(R.drawable.burst_mode_5); + break; + case 10: + mBurstModeView.setImageResource(R.drawable.burst_mode_10); + break; + case 15: + mBurstModeView.setImageResource(R.drawable.burst_mode_15); + break; + case 20: + mBurstModeView.setImageResource(R.drawable.burst_mode_20); + break; + } + mBurstModeView.setVisibility(View.VISIBLE); + } } |