diff options
| author | Danny Baumann <dannybaumann@web.de> | 2016-01-15 09:53:27 +0100 |
|---|---|---|
| committer | Danny Baumann <dannybaumann@web.de> | 2016-01-20 23:31:33 -0800 |
| commit | bb800ac9bf961b9e53ec56a1a5ababf31b9d40a1 (patch) | |
| tree | 32ec710bd47fbdf652797a1fa73bcce718e4e6fc /res | |
| parent | 42f6d5c06c5db74c6971e37dbb78bf41d2783e07 (diff) | |
| download | android_packages_apps_Snap-bb800ac9bf961b9e53ec56a1a5ababf31b9d40a1.tar.gz android_packages_apps_Snap-bb800ac9bf961b9e53ec56a1a5ababf31b9d40a1.tar.bz2 android_packages_apps_Snap-bb800ac9bf961b9e53ec56a1a5ababf31b9d40a1.zip | |
Fix up layout of auto HDR notice and histogram view.
Change-Id: I61f93c68b52d81c5e19919a5b0b894cf51dd35c4
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-port/camera_controls.xml | 14 | ||||
| -rw-r--r-- | res/layout/photo_module.xml | 17 | ||||
| -rw-r--r-- | res/values/cm_strings.xml | 1 |
3 files changed, 15 insertions, 17 deletions
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml index d979147c6..bb73cf3c5 100644 --- a/res/layout-port/camera_controls.xml +++ b/res/layout-port/camera_controls.xml @@ -98,4 +98,18 @@ android:src="@drawable/remaining_sheets" /> </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 a516f0034..7487e73b2 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -40,23 +40,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="15dip" - android:layout_marginLeft="15dip" /> - </RelativeLayout> <com.android.camera.ui.focus.FocusRingView android:id="@+id/focus_ring" android:layout_width="match_parent" diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index e7fcebdb3..1b42f4b30 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -224,4 +224,5 @@ <string name="pref_camera_shutter_speed_entry_15" translatable="false">15</string> <string name="pref_camera_shutter_speed_entry_30" translatable="false">30</string> + <string name="auto_hdr_enabled">Auto HDR enabled</string> </resources> |