diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-05-17 16:26:44 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-05-17 17:53:52 +0800 |
| commit | 1c24f5161cfc6a78e45da5f564626d06f6278f7c (patch) | |
| tree | 2da48db0672a27b5954a6e54ebf0f91bde20f01d /res | |
| parent | 8ab2b624d51b3b8254ece98c46a7e22a6fb5d4aa (diff) | |
| download | LegacyCamera-1c24f5161cfc6a78e45da5f564626d06f6278f7c.zip LegacyCamera-1c24f5161cfc6a78e45da5f564626d06f6278f7c.tar.gz LegacyCamera-1c24f5161cfc6a78e45da5f564626d06f6278f7c.tar.bz2 | |
Show review image before share.
bug:4391419
Change-Id: Id357539bfe36eb3a30742dc4f8ca267ff53ff8b7
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-xlarge/preview_frame.xml | 5 | ||||
| -rw-r--r-- | res/layout-xlarge/preview_frame_video.xml | 9 | ||||
| -rw-r--r-- | res/layout/preview_frame.xml | 5 | ||||
| -rw-r--r-- | res/layout/preview_frame_video.xml | 9 |
4 files changed, 20 insertions, 8 deletions
diff --git a/res/layout-xlarge/preview_frame.xml b/res/layout-xlarge/preview_frame.xml index bd176da..96f133d 100644 --- a/res/layout-xlarge/preview_frame.xml +++ b/res/layout-xlarge/preview_frame.xml @@ -51,6 +51,11 @@ android:visibility="invisible"/> <include layout="@layout/review_thumbnail"/> <include layout="@layout/review_control"/> + <ImageView android:id="@+id/review_image" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" + android:background="@android:color/black"/> </RelativeLayout> <!-- This is the border of preview and the corner is round. If it is the background, preview will be on top and the inner corner will be square, which looks bad. diff --git a/res/layout-xlarge/preview_frame_video.xml b/res/layout-xlarge/preview_frame_video.xml index ce97ee6..e8edb41 100644 --- a/res/layout-xlarge/preview_frame_video.xml +++ b/res/layout-xlarge/preview_frame_video.xml @@ -27,10 +27,6 @@ <SurfaceView android:id="@+id/camera_preview" android:layout_width="match_parent" android:layout_height="match_parent"/> - <ImageView android:id="@+id/video_frame" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" /> <include layout="@layout/review_thumbnail"/> <TextView android:id="@+id/recording_time" style="@style/OnViewfinderLabel" @@ -60,6 +56,11 @@ android:paddingBottom="10dp" android:src="@drawable/btn_ic_review_play"/> </LinearLayout> + <ImageView android:id="@+id/review_image" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" + android:background="@android:color/black"/> </RelativeLayout> <!-- This is the border of preview and the corner is round. If it is the background, preview will be on top and the inner corner will be square, which looks bad. diff --git a/res/layout/preview_frame.xml b/res/layout/preview_frame.xml index 0459919..904ef20 100644 --- a/res/layout/preview_frame.xml +++ b/res/layout/preview_frame.xml @@ -35,5 +35,10 @@ android:layout_width="120dp" android:layout_height="120dp" android:layout_centerInParent="true"/> + <ImageView android:id="@+id/review_image" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" + android:background="@android:color/black"/> </RelativeLayout> </com.android.camera.PreviewFrameLayout> diff --git a/res/layout/preview_frame_video.xml b/res/layout/preview_frame_video.xml index 1088b94..ec0dbb5 100644 --- a/res/layout/preview_frame_video.xml +++ b/res/layout/preview_frame_video.xml @@ -30,10 +30,6 @@ <SurfaceView android:id="@+id/camera_preview" android:layout_width="match_parent" android:layout_height="match_parent"/> - <ImageView android:id="@+id/video_frame" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" /> <!-- Note: In this TextView the paddingRight="2" attribute is required because otherwise the text's drop shadow will be clipped. --> @@ -48,5 +44,10 @@ android:layout_marginLeft="17dp" android:paddingRight="2dp" android:visibility="gone" /> + <ImageView android:id="@+id/review_image" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" + android:background="@android:color/black" /> </RelativeLayout> </com.android.camera.PreviewFrameLayout> |