summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk2
-rw-r--r--src/com/android/camera/Camera.java2
2 files changed, 1 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index a536b3d..f3883ab 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := Camera
LOCAL_SDK_VERSION := current
-LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index f8c44a0..fc16f16 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1005,8 +1005,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
onZoomValueChanged(index);
}
});
- } else {
- mHeadUpDisplay.setZoomListener(null);
}
updateSceneModeInHud();
}