diff options
| author | Doris Liu <tianliu@google.com> | 2013-03-04 18:36:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-04 18:36:37 +0000 |
| commit | 5bb5fea402f0d584cacf237bfb7be53cf06e6489 (patch) | |
| tree | 2dae1dff7eb75dae6c6a9c3aef42ea6488c7d588 /res/layout-land/review_module_control.xml | |
| parent | 2a025ee773a4c40b05de6c70a4681abdb4e243bd (diff) | |
| parent | 08a98b9946503e97549d70fd0228dea81175159e (diff) | |
| download | android_packages_apps_Snap-5bb5fea402f0d584cacf237bfb7be53cf06e6489.tar.gz android_packages_apps_Snap-5bb5fea402f0d584cacf237bfb7be53cf06e6489.tar.bz2 android_packages_apps_Snap-5bb5fea402f0d584cacf237bfb7be53cf06e6489.zip | |
Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce
Diffstat (limited to 'res/layout-land/review_module_control.xml')
| -rw-r--r-- | res/layout-land/review_module_control.xml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/res/layout-land/review_module_control.xml b/res/layout-land/review_module_control.xml index e732a2c80..9f8b0cd46 100644 --- a/res/layout-land/review_module_control.xml +++ b/res/layout-land/review_module_control.xml @@ -13,13 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="match_parent" - android:layout_width="match_parent"> - <com.android.camera.ui.RotateImageView android:id="@+id/btn_done" +<com.android.camera.ui.RotatableLayout + xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/CameraControls" + android:layout_gravity="right|center_vertical" + android:layout_marginRight="2dip"> + <ImageView android:id="@+id/btn_done" style="@style/ReviewControlIcon" android:contentDescription="@string/accessibility_review_ok" android:visibility="gone" + android:scaleType="center" android:layout_gravity="top|right" android:background="@drawable/bg_pressed" android:src="@drawable/ic_menu_done_holo_light" /> @@ -34,11 +37,12 @@ android:background="@drawable/bg_pressed" android:src="@drawable/ic_btn_shutter_retake" /> - <com.android.camera.ui.RotateImageView android:id="@+id/btn_cancel" + <ImageView android:id="@+id/btn_cancel" style="@style/ReviewControlIcon" android:contentDescription="@string/accessibility_review_cancel" android:visibility="gone" + android:scaleType="center" android:layout_gravity="bottom|right" android:background="@drawable/bg_pressed" android:src="@drawable/ic_menu_cancel_holo_light" /> -</FrameLayout> +</com.android.camera.ui.RotatableLayout> |