diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/camera_controls.xml | 14 | ||||
| -rw-r--r-- | res/layout/photo_module.xml | 17 |
2 files changed, 14 insertions, 17 deletions
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml index 99e649db4..3f097425f 100644 --- a/res/layout/camera_controls.xml +++ b/res/layout/camera_controls.xml @@ -132,4 +132,18 @@ android:visibility="gone" /> </LinearLayout> + <com.android.camera.ui.HistogramView + android:id="@+id/histogram" + android:layout_width="200dip" + android:layout_height="200dip" + android:layout_marginTop="20dip" + android:visibility="gone" /> + + <TextView + android:id="@+id/auto_hdr_notice" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/auto_hdr_enabled" + android:visibility="gone" /> + </com.android.camera.ui.CameraControls> diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index 63a8f28e5..f184e0c56 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -41,23 +41,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/black" /> - <RelativeLayout android:id="@+id/linear" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <com.android.camera.GraphView - android:id="@+id/graph_view" - android:layout_width="200dip" - android:layout_height="200dip" - android:layout_marginTop="60dip" - android:layout_marginLeft="90dip" /> - <com.android.camera.DrawAutoHDR - android:id="@+id/autohdr_view" - android:layout_width="200dip" - android:layout_height="200dip" - android:layout_marginTop="50dip" - android:layout_marginLeft="15dip" /> - </RelativeLayout> <com.android.camera.ui.focus.FocusRingView android:id="@+id/focus_ring" android:layout_width="match_parent" |