diff options
author | Chih-yu Huang <akahuang@google.com> | 2011-09-23 11:17:47 +0800 |
---|---|---|
committer | Chih-yu Huang <akahuang@google.com> | 2011-09-23 11:53:49 +0800 |
commit | 3c5ee7fa680b4fa7bf2ec1d20d3de774b245c097 (patch) | |
tree | f54fd2151f716f41b94d5cf1cb9ff1278455cd30 /res/layout | |
parent | dd28e1cc00373c02adf88dff878dbbe5d8be9e59 (diff) | |
download | LegacyCamera-3c5ee7fa680b4fa7bf2ec1d20d3de774b245c097.zip LegacyCamera-3c5ee7fa680b4fa7bf2ec1d20d3de774b245c097.tar.gz LegacyCamera-3c5ee7fa680b4fa7bf2ec1d20d3de774b245c097.tar.bz2 |
Fix bugs about review control in video intent mode.
- Switch position of checkmark and X.
- Let review play icon visible in intent mode.
- Let review control visible after reviewing video.
bug:5244256
Change-Id: I20d51faf9fb5658ee009dd45ff112947cf4ebf02
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/preview_frame_video.xml | 6 | ||||
-rw-r--r-- | res/layout/review_control.xml | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/res/layout/preview_frame_video.xml b/res/layout/preview_frame_video.xml index 08c244b..92849df 100644 --- a/res/layout/preview_frame_video.xml +++ b/res/layout/preview_frame_video.xml @@ -41,14 +41,14 @@ android:layout_marginLeft="17dp" android:paddingRight="2dp" android:visibility="gone"/> - <ImageButton android:id="@+id/btn_play" - style="@style/ReviewPlayIcon" - android:onClick="onPlayButtonClicked"/> <ImageView android:id="@+id/review_image" android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" android:background="@android:color/black"/> + <ImageButton android:id="@+id/btn_play" + style="@style/ReviewPlayIcon" + android:onClick="onPlayButtonClicked"/> <TextView android:id="@+id/bg_replace_message" android:layout_width="300dp" android:layout_height="wrap_content" diff --git a/res/layout/review_control.xml b/res/layout/review_control.xml index 22a5680..6e725e5 100644 --- a/res/layout/review_control.xml +++ b/res/layout/review_control.xml @@ -18,13 +18,13 @@ android:id="@+id/review_control" android:layout_width="match_parent" android:layout_height="match_parent"> - <ImageView android:id="@+id/btn_cancel" + <ImageView android:id="@+id/btn_done" style="@style/ReviewControlIcon" android:visibility="gone" android:layout_alignParentTop="true" android:layout_marginTop="20dp" - android:onClick="onCancelButtonClicked" - android:src="@drawable/ic_menu_cancel_holo_light" /> + android:onClick="onDoneButtonClicked" + android:src="@drawable/ic_menu_done_holo_light" /> <ImageView android:id="@+id/btn_retake" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -34,11 +34,11 @@ android:visibility="gone" android:onClick="onRetakeButtonClicked" android:background="@drawable/btn_shutter_retake" /> - <ImageView android:id="@+id/btn_done" + <ImageView android:id="@+id/btn_cancel" style="@style/ReviewControlIcon" android:visibility="gone" android:layout_alignParentBottom="true" android:layout_marginBottom="20dp" - android:onClick="onDoneButtonClicked" - android:src="@drawable/ic_menu_done_holo_light" /> + android:onClick="onCancelButtonClicked" + android:src="@drawable/ic_menu_cancel_holo_light" /> </RelativeLayout> |