summaryrefslogtreecommitdiffstats
path: root/src/com
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
commit6cf36371a5888be8e137af1ede183bd592bb07b2 (patch)
treef920a71737c1560c0e55752f9d9df3a4ae9c5ccc /src/com
parentb15919a1bccfcecd24c35001837626c73b0a4bdb (diff)
parentdb56a16f02e06207e527d9b135fcedddb2643515 (diff)
downloadandroid_packages_apps_Snap-6cf36371a5888be8e137af1ede183bd592bb07b2.tar.gz
android_packages_apps_Snap-6cf36371a5888be8e137af1ede183bd592bb07b2.tar.bz2
android_packages_apps_Snap-6cf36371a5888be8e137af1ede183bd592bb07b2.zip
Merge "Remove timer indicator" into gb-ub-photos-bryce
Diffstat (limited to 'src/com')
-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) {