diff options
| author | Shuzhen Wang <shuzhenw@codeaurora.org> | 2016-01-02 20:14:18 +0100 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.org> | 2016-01-02 20:47:57 +0100 |
| commit | a575c653126a54850ed220b8255f035df4cdfe05 (patch) | |
| tree | 09519219c8c8e4c3ce987d639e09bcae4ac53f88 /src/com/android/camera/ui | |
| parent | 0575f19cf85fc06a070dd1ec15d952126e76d96c (diff) | |
| download | android_packages_apps_Snap-a575c653126a54850ed220b8255f035df4cdfe05.tar.gz android_packages_apps_Snap-a575c653126a54850ed220b8255f035df4cdfe05.tar.bz2 android_packages_apps_Snap-a575c653126a54850ed220b8255f035df4cdfe05.zip | |
SnapdragonCamera: Fix compilation
1. Address compilation due to compiler upgrade.
2. Comment out video dependencies to enable camera.
3. Fix compilation issue due to IMountService interface change.
4. Comment out ExtendedFace.
5. Remove non-standard video resolutions.
Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a
Diffstat (limited to 'src/com/android/camera/ui')
| -rw-r--r-- | src/com/android/camera/ui/FaceView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/FaceView.java b/src/com/android/camera/ui/FaceView.java index 4ab74e4cf..773196f7b 100644 --- a/src/com/android/camera/ui/FaceView.java +++ b/src/com/android/camera/ui/FaceView.java @@ -34,7 +34,7 @@ import android.view.View; import com.android.camera.PhotoUI; import com.android.camera.util.CameraUtil; import org.codeaurora.snapcam.R; -import org.codeaurora.camera.ExtendedFace; +//import org.codeaurora.camera.ExtendedFace; public class FaceView extends View implements FocusIndicator, Rotatable, @@ -232,6 +232,7 @@ public class FaceView extends View mPaint.setColor(mColor); mRect.offset(dx, dy); canvas.drawOval(mRect, mPaint); +/* if (mFaces[i] instanceof ExtendedFace) { ExtendedFace face = (ExtendedFace)mFaces[i]; float[] point = new float[4]; @@ -390,6 +391,7 @@ public class FaceView extends View } } } +*/ } canvas.restore(); } |