1 files changed, 4 insertions, 24 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 69976fdc3..14e358b88 100755..100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -110,8 +110,7 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.os.SystemProperties;
 
-public class PhotoModule
-        implements CameraModule,
+public class PhotoModule extends BaseModule<PhotoUI> implements
         PhotoController,
         FocusOverlayManager.Listener,
         CameraPreference.OnPreferenceChangedListener,
@@ -171,8 +170,6 @@ public class PhotoModule
     private boolean mPaused;
     private View mRootView;
 
-    private PhotoUI mUI;
-
     // The activity is going to switch to the specified camera id. This is
     // needed because texture copy is done in GL thread. -1 means camera is not
     // switching.
@@ -4970,23 +4967,11 @@ public class PhotoModule
             mHeading += 360;
         }
     }
-    @Override
-    public void onPreviewFocusChanged(boolean previewFocused) {
-        mUI.onPreviewFocusChanged(previewFocused);
-    }
+
     // TODO: Delete this function after old camera code is removed
     @Override
     public void onRestorePreferencesClicked() {}
 
-/*
- * Provide a mapping for Jpeg encoding quality levels
- * from String representation to numeric representation.
- */
-    @Override
-    public boolean arePreviewControlsVisible() {
-        return mUI.arePreviewControlsVisible();
-    }
-
     // For debugging only.
     public void setDebugUri(Uri uri) {
         mDebugUri = uri;
@@ -5025,24 +5010,19 @@ public class PhotoModule
 
     @Override
     public void showPreviewCover() {
+        super.showPreviewCover();
         disableAutoFocusMoveCallback();
         stopFaceDetection();
         mUI.getFocusRing().stopFocusAnimations();
-        mUI.showPreviewCover();
     }
 
     @Override
     public void hidePreviewCover() {
-        mUI.hidePreviewCover();
+        super.showPreviewCover();
         startFaceDetection();
         updateAutoFocusMoveCallback();
     }
 
-    @Override
-    public void setPreviewCoverAlpha(float alpha) {
-        mUI.setPreviewCoverAlpha(alpha);
-    }
-
     public void onMakeupLevelSync(String key, String value) {
         Log.d(TAG, "PhotoModule.onMakeupLevel(): key is " + key + ", value is " + value);