diff options
| -rw-r--r-- | res/layout/photo_module.xml | 12 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 7 |
2 files changed, 6 insertions, 13 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index 78cf72a81..c2fbe33c8 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -48,6 +48,12 @@ android:layout_marginBottom="14dip" android:layout_marginLeft="30dip" android:layout_marginRight="30dip" /> + <com.android.camera.GraphView + android:id="@+id/graph_view" + android:layout_width="200dip" + android:layout_height="200dip" + android:layout_marginTop="15dip" + android:layout_marginLeft="15dip" /> <TableLayout android:id="@+id/relative_seek" android:layout_width="match_parent" @@ -89,12 +95,6 @@ </TableLayout> </RelativeLayout> </FrameLayout> - <com.android.camera.GraphView - android:id="@+id/graph_view" - android:layout_width="200dip" - android:layout_height="200dip" - android:layout_marginTop="15dip" - android:layout_marginLeft="15dip" /> <ImageView android:id="@+id/review_image" android:layout_width="match_parent" diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index ded9963f5..ba0d932cb 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2765,13 +2765,6 @@ class GraphView extends View { @Override protected void onDraw(Canvas canvas) { Log.v(TAG, "in Camera.java ondraw"); - //don't display histogram if user swipes to gallery during preview - //boolean inCamPreview = ActivityBase.getCameraAppViewStatus(); - if(mPhotoModule != null){ - PreviewChanged(); - return; - } - if(mPhotoModule == null || !mPhotoModule.mHiston ) { Log.e(TAG, "returning as histogram is off "); return; |