diff options
| author | Chih-yu Huang <akahuang@google.com> | 2011-10-07 04:01:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-07 04:01:47 -0700 |
| commit | d534023dbdb0470163f79aa40beb1f00b28fe378 (patch) | |
| tree | 72d577cbeea607b270693847de1577101f15f4b8 /res/layout | |
| parent | c5bc067250fad1a246ea22604260d01aab627ba4 (diff) | |
| parent | 94ca8baae7e6e3885d895c095890eabf30d922e2 (diff) | |
| download | LegacyCamera-d534023dbdb0470163f79aa40beb1f00b28fe378.zip LegacyCamera-d534023dbdb0470163f79aa40beb1f00b28fe378.tar.gz LegacyCamera-d534023dbdb0470163f79aa40beb1f00b28fe378.tar.bz2 | |
Merge "Let review icons rotatable."
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/preview_frame_video.xml | 10 | ||||
| -rw-r--r-- | res/layout/review_control.xml | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/res/layout/preview_frame_video.xml b/res/layout/preview_frame_video.xml index 04c25e8..c2823ee 100644 --- a/res/layout/preview_frame_video.xml +++ b/res/layout/preview_frame_video.xml @@ -37,9 +37,13 @@ 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"/> + <com.android.camera.ui.RotateImageView + android:id="@+id/btn_play" + style="@style/ReviewControlIcon" + android:layout_centerInParent="true" + android:src="@drawable/ic_gallery_play" + android:visibility="gone" + android:onClick="onReviewPlayClicked"/> <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 6e725e5..6a25d2c 100644 --- a/res/layout/review_control.xml +++ b/res/layout/review_control.xml @@ -18,12 +18,12 @@ android:id="@+id/review_control" android:layout_width="match_parent" android:layout_height="match_parent"> - <ImageView android:id="@+id/btn_done" + <com.android.camera.ui.RotateImageView android:id="@+id/btn_done" style="@style/ReviewControlIcon" android:visibility="gone" android:layout_alignParentTop="true" android:layout_marginTop="20dp" - android:onClick="onDoneButtonClicked" + android:onClick="onReviewDoneClicked" android:src="@drawable/ic_menu_done_holo_light" /> <ImageView android:id="@+id/btn_retake" android:layout_width="wrap_content" @@ -32,13 +32,13 @@ android:clickable="true" android:focusable="true" android:visibility="gone" - android:onClick="onRetakeButtonClicked" + android:onClick="onReviewRetakeClicked" android:background="@drawable/btn_shutter_retake" /> - <ImageView android:id="@+id/btn_cancel" + <com.android.camera.ui.RotateImageView android:id="@+id/btn_cancel" style="@style/ReviewControlIcon" android:visibility="gone" android:layout_alignParentBottom="true" android:layout_marginBottom="20dp" - android:onClick="onCancelButtonClicked" + android:onClick="onReviewCancelClicked" android:src="@drawable/ic_menu_cancel_holo_light" /> </RelativeLayout> |