diff options
| author | Santhosh Kumar H E <skhara@codeaurora.org> | 2013-10-09 12:38:16 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:40:06 -0600 |
| commit | 58eba7849f95dd1315b511166a325768980e31fe (patch) | |
| tree | 26dc1b48bd539f5f3f47400c630b712c8e724363 | |
| parent | 3c9da9a7940a3900eeda7cd768ff5353b427993f (diff) | |
| download | android_packages_apps_Snap-58eba7849f95dd1315b511166a325768980e31fe.tar.gz android_packages_apps_Snap-58eba7849f95dd1315b511166a325768980e31fe.tar.bz2 android_packages_apps_Snap-58eba7849f95dd1315b511166a325768980e31fe.zip | |
Camera: Add histogram view to preview framelayout
Swipe in preview does not route user to Gallery, hence no need to handle
this operation. Histogram graph view was added outside of preview frame
layout and there was no container view outside this. So histogram was
occupying complete screen.
Change-Id: I94c9e7e76f4bc5d1efb568280ca5c41585224ff9
(cherry picked from commit ad3ece51bf6e3b14c2a5a068ce937b89b4578e24)
(cherry picked from commit 348a7d8a67f06f3b6fbd999bc0b3ef81a364b5c1)
| -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; |