diff options
author | Michael Kolb <kolby@google.com> | 2013-04-26 11:09:29 -0700 |
---|---|---|
committer | Michael Kolb <kolby@google.com> | 2013-04-26 15:47:00 -0700 |
commit | eb8adc1754fc668435ee57d1be2235b80fc8c009 (patch) | |
tree | e40cfd262e853a5d186c31662ad6fac789b17926 /src/com/android/camera/PhotoUI.java | |
parent | abd5efe72de6b571aada1b69633a4d02aced5616 (diff) | |
download | android_packages_apps_Snap-eb8adc1754fc668435ee57d1be2235b80fc8c009.tar.gz android_packages_apps_Snap-eb8adc1754fc668435ee57d1be2235b80fc8c009.tar.bz2 android_packages_apps_Snap-eb8adc1754fc668435ee57d1be2235b80fc8c009.zip |
Add new indicators
Bug: 8640131
Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
-rw-r--r-- | src/com/android/camera/PhotoUI.java | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 3f2945f10..f7887c45c 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -143,7 +143,7 @@ public class PhotoUI implements PieListener, } private void initIndicators() { - mOnScreenIndicators = new OnScreenIndicators( + mOnScreenIndicators = new OnScreenIndicators(mActivity, mActivity.findViewById(R.id.on_screen_indicators)); } @@ -185,7 +185,7 @@ public class PhotoUI implements PieListener, mRenderOverlay.requestLayout(); initializeZoom(params); - updateOnScreenIndicators(params, prefs); + updateOnScreenIndicators(params, prefGroup, prefs); } private void openMenu() { @@ -294,13 +294,30 @@ public class PhotoUI implements PieListener, } public void updateOnScreenIndicators(Camera.Parameters params, - ComboPreferences prefs) { + PreferenceGroup group, ComboPreferences prefs) { if (params == null) return; mOnScreenIndicators.updateSceneOnScreenIndicator(params.getSceneMode()); mOnScreenIndicators.updateExposureOnScreenIndicator(params, CameraSettings.readExposure(prefs)); mOnScreenIndicators.updateFlashOnScreenIndicator(params.getFlashMode()); - mOnScreenIndicators.updateHdrOnScreenIndicator(params.getSceneMode()); + int wbIndex = 2; + ListPreference pref = group.findPreference(CameraSettings.KEY_WHITE_BALANCE); + if (pref != null) { + wbIndex = pref.getCurrentIndex(); + } + mOnScreenIndicators.updateWBIndicator(wbIndex); + pref = group.findPreference(CameraSettings.KEY_TIMER); + boolean timer = false; + if (pref != null) { + timer = !(pref.getCurrentIndex() == 0); + } + mOnScreenIndicators.updateTimerIndicator(timer); + boolean location = false; + pref = group.findPreference(CameraSettings.KEY_RECORD_LOCATION); + if (pref != null) { + location = !(pref.getCurrentIndex() == 0); + } + mOnScreenIndicators.updateLocationIndicator(location); } |