summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-04-30 03:27:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-30 03:27:07 +0000
commit9c525edf6440b6daf10885f4f7a0da479b7f2707 (patch)
tree4c116c0cd4981daee6be1babd470de5ba7344866 /src
parentd6edcee398efa0c208f036c68a06dd840586f734 (diff)
parent197262c79d6cadad1e1e3461970a7cb9b3d87880 (diff)
downloadandroid_packages_apps_Gallery2-9c525edf6440b6daf10885f4f7a0da479b7f2707.tar.gz
android_packages_apps_Gallery2-9c525edf6440b6daf10885f4f7a0da479b7f2707.tar.bz2
android_packages_apps_Gallery2-9c525edf6440b6daf10885f4f7a0da479b7f2707.zip
Merge "Remove timer indicator" into gb-ub-photos-bryce
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoUI.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index f7887c45c..e2b78197f 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -306,12 +306,6 @@ public class PhotoUI implements PieListener,
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) {