diff options
| author | Angus Kong <shkong@google.com> | 2011-11-02 17:51:09 +0800 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2011-11-03 16:16:00 +0800 |
| commit | ae557ecc220f9d491e8c65b1c895827fbedcdafe (patch) | |
| tree | 3b5ca7e246f2e7f92cad43075c2c99d5a8ebdd8f /res | |
| parent | cd2256375a71ae4c19808d22c313d999cc750d0c (diff) | |
| download | packages_apps_LegacyCamera-ae557ecc220f9d491e8c65b1c895827fbedcdafe.zip packages_apps_LegacyCamera-ae557ecc220f9d491e8c65b1c895827fbedcdafe.tar.gz packages_apps_LegacyCamera-ae557ecc220f9d491e8c65b1c895827fbedcdafe.tar.bz2 | |
The dialog for comfirmation is made rotatable.
bug:5481928
Change-Id: Ic9a34b0f9e8d920afa5aec36561892045480e18c
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/camera.xml | 1 | ||||
| -rw-r--r-- | res/layout/panorama.xml | 1 | ||||
| -rw-r--r-- | res/layout/rotate_dialog.xml (renamed from res/layout/pano_rotate_dialog.xml) | 38 |
3 files changed, 28 insertions, 12 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml index 939007a..19ce5f1 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -15,7 +15,6 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" android:id="@+id/app_root" android:orientation="vertical" android:layout_width="match_parent" diff --git a/res/layout/panorama.xml b/res/layout/panorama.xml index d56cca0..1ff7601 100644 --- a/res/layout/panorama.xml +++ b/res/layout/panorama.xml @@ -22,5 +22,4 @@ <include layout="@layout/pano_capture" /> <include layout="@layout/pano_review" /> - <include layout="@layout/pano_rotate_dialog" /> </RelativeLayout> diff --git a/res/layout/pano_rotate_dialog.xml b/res/layout/rotate_dialog.xml index 456bb02..3ca5283 100644 --- a/res/layout/pano_rotate_dialog.xml +++ b/res/layout/rotate_dialog.xml @@ -15,13 +15,16 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/rotate_dialog_root_layout" + android:clickable="true" android:gravity="center" + android:visibility="gone" + android:background="#55000000" android:layout_width="match_parent" android:layout_height="match_parent"> <com.android.camera.ui.RotateLayout android:id="@+id/rotate_dialog_layout" - android:visibility="gone" android:gravity="center" android:layout_gravity="center" android:layout_width="wrap_content" @@ -87,16 +90,31 @@ android:showDividers="beginning" android:dividerPadding="0dip"> - <Button android:id="@+id/rotate_dialog_button" - style="@android:style/Widget.Holo.Button.Borderless" - android:gravity="center" - android:text="@string/review_ok" - android:maxLines="2" - android:minHeight="48dp" - android:textSize="14sp" - android:onClick="onAlertDialogButtonClicked" + <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:gravity="center" + android:orientation="horizontal"> + + <Button android:id="@+id/rotate_dialog_button2" + style="@android:style/Widget.Holo.Button.Borderless" + android:gravity="center" + android:maxLines="2" + android:minHeight="48dp" + android:textSize="14sp" + android:layout_weight="1" + android:layout_width="0dp" + android:layout_height="wrap_content" /> + <Button android:id="@+id/rotate_dialog_button1" + style="@android:style/Widget.Holo.Button.Borderless" + android:gravity="center" + android:maxLines="2" + android:minHeight="48dp" + android:textSize="14sp" + android:layout_weight="1" + android:layout_width="0dp" + android:layout_height="wrap_content" /> + </LinearLayout> </LinearLayout> </LinearLayout> </FrameLayout> |