diff options
author | Owen Lin <owenlin@google.com> | 2010-03-15 14:08:13 +0800 |
---|---|---|
committer | Owen Lin <owenlin@google.com> | 2010-03-16 14:20:33 +0800 |
commit | 6988d4e2ef8d14d8bf3ee81c8eb3175bbf1b88ec (patch) | |
tree | ad890b87333bd67dd33027718f547def10760e1a /src/com/android/camera/ui/GLRootView.java | |
parent | 9ae7d027bb8f55b85a158cddeb7ed84c5a0a7983 (diff) | |
download | LegacyCamera-6988d4e2ef8d14d8bf3ee81c8eb3175bbf1b88ec.zip LegacyCamera-6988d4e2ef8d14d8bf3ee81c8eb3175bbf1b88ec.tar.gz LegacyCamera-6988d4e2ef8d14d8bf3ee81c8eb3175bbf1b88ec.tar.bz2 |
Fix several UI issues.
1. Remove the cross in border_last_picture
2. Remove the gripper in VideoCamera
3. Solve the popup triangle locate in wrong position
4. Remove the top and bottom borders of the preview frame in Camera
5. Rotate the on-screen indicators when orientation changed
6. Add the checking for the flash mode in VideoCamera
Change-Id: I304ea3582d08c5e46ed750b7371588635a4d8009
Diffstat (limited to 'src/com/android/camera/ui/GLRootView.java')
-rw-r--r-- | src/com/android/camera/ui/GLRootView.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/camera/ui/GLRootView.java b/src/com/android/camera/ui/GLRootView.java index 84eea06..92c0f35 100644 --- a/src/com/android/camera/ui/GLRootView.java +++ b/src/com/android/camera/ui/GLRootView.java @@ -118,10 +118,11 @@ public class GLRootView extends GLSurfaceView return mTransformation; } - public void pushTransform() { + public Transformation pushTransform() { Transformation trans = obtainTransformation(); trans.set(mTransformation); mTransformStack.push(trans); + return mTransformation; } public void popTransform() { @@ -400,14 +401,14 @@ public class GLRootView extends GLSurfaceView } if ((mFlags & FLAG_NEED_LAYOUT) != 0) layoutContentPane(); - + clearClip(); gl.glClear(GL10.GL_COLOR_BUFFER_BIT); gl.glEnable(GL11.GL_BLEND); gl.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA); /*gl.glDisable(GL11.GL_TEXTURE_2D); gl.glColor4f(0, 0, 0.5f, 0.4f); - drawRect(30, 30, 30, 30); + drawRect(0, 0, 725, 480); gl.glEnable(GL11.GL_TEXTURE_2D);*/ mAnimationTime = SystemClock.uptimeMillis(); |