summaryrefslogtreecommitdiffstats
path: root/res/layout-xlarge/preview_frame.xml
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-11-25 13:06:34 +0800
committerHung-ying Tyan <tyanh@google.com>2010-11-26 22:50:28 +0800
commit41ac285a1c97b1df78246456effb80de51033323 (patch)
tree24d8eb2fefe3f809abafed12ac01be9a7a3cd952 /res/layout-xlarge/preview_frame.xml
parent048f1818ab5bff5ba97ea416a5166890c812ac1b (diff)
downloadpackages_apps_LegacyCamera-41ac285a1c97b1df78246456effb80de51033323.zip
packages_apps_LegacyCamera-41ac285a1c97b1df78246456effb80de51033323.tar.gz
packages_apps_LegacyCamera-41ac285a1c97b1df78246456effb80de51033323.tar.bz2
Increase camera preview frame size and other changes.
+ Increase camera preview frame size and align it to the left of the screen. + Move thumbnail to the lower left corner of the preview frame. + Move GPS indicator to the lower right corner of the preview frame. + Replace LinearLayout and negative margin with RelativeLayout. + Revise the look of the settings wheel based on new UI mock. + Add border to preview frame. + Make settings popup windows align with an invisible view in the root view. This makes it easier to adjust the location of the popup windows. Bug: 3156693 Change-Id: I8843fec803f8418699df7e425ea74af708b4ea99
Diffstat (limited to 'res/layout-xlarge/preview_frame.xml')
-rw-r--r--res/layout-xlarge/preview_frame.xml16
1 files changed, 11 insertions, 5 deletions
diff --git a/res/layout-xlarge/preview_frame.xml b/res/layout-xlarge/preview_frame.xml
index cba64ce..3e72bc5 100644
--- a/res/layout-xlarge/preview_frame.xml
+++ b/res/layout-xlarge/preview_frame.xml
@@ -15,16 +15,21 @@
-->
<com.android.camera.PreviewFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/frame_layout"
- android:layout_width="match_parent"
+ android:layout_width="1040dp"
android:layout_height="match_parent"
- android:layout_marginLeft="2dp"
- android:layout_weight="1">
+ android:layout_alignParentLeft="true"
+ android:layout_marginLeft="5dp"
+ android:layout_marginTop="5dp">
<RelativeLayout android:id="@+id/frame"
android:layout_width="match_parent"
android:layout_height="match_parent">
<SurfaceView android:id="@+id/camera_preview"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
+ <ImageView android:id="@+id/preview_border"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@drawable/border_preview"/>
<com.android.camera.ui.FocusRectangle
android:id="@+id/focus_rectangle"
android:layout_width="match_parent"
@@ -32,17 +37,18 @@
<ImageView style="@style/OnScreenGpsIndicator"
android:id="@+id/onscreen_gps_indicator_no_signal"
android:src="@drawable/ic_viewfinder_gps_no_signal"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_margin="10dp"
android:visibility="invisible"/>
<ImageView style="@style/OnScreenGpsIndicator"
android:id="@+id/onscreen_gps_indicator_on"
android:src="@drawable/ic_viewfinder_gps_on"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_margin="10dp"
android:visibility="invisible"/>
+ <include layout="@layout/review_thumbnail"/>
</RelativeLayout>
<include layout="@layout/camera_picker" />
</com.android.camera.PreviewFrameLayout>