summaryrefslogtreecommitdiffstats
path: root/res/layout/scene_mode_instructional.xml
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-12-22 22:55:38 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-22 22:55:38 -0800
commit53e1bd77af1c1c0e203d536c0e52ce9e03316a65 (patch)
tree3d099009d18b6ca3b3e567e725a2f8023168d89b /res/layout/scene_mode_instructional.xml
parente305c4768a9c7c030fa5bb935b0776d80a1e1ebd (diff)
parent12ac236df386266adc05ac2e77cfe39a7d7e1214 (diff)
downloadandroid_packages_apps_Snap-53e1bd77af1c1c0e203d536c0e52ce9e03316a65.tar.gz
android_packages_apps_Snap-53e1bd77af1c1c0e203d536c0e52ce9e03316a65.tar.bz2
android_packages_apps_Snap-53e1bd77af1c1c0e203d536c0e52ce9e03316a65.zip
Merge "SnapdragonCamera: Dialog display incompletely in landscape mode" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res/layout/scene_mode_instructional.xml')
-rw-r--r--res/layout/scene_mode_instructional.xml5
1 files changed, 1 insertions, 4 deletions
diff --git a/res/layout/scene_mode_instructional.xml b/res/layout/scene_mode_instructional.xml
index 588dc3549..2181e3147 100644
--- a/res/layout/scene_mode_instructional.xml
+++ b/res/layout/scene_mode_instructional.xml
@@ -45,15 +45,13 @@
<ImageView
android:id="@+id/scene_mode_icon"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/chroma_flash"/>
+ android:layout_height="wrap_content" />
<TextView
android:id="@+id/scene_mode_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_toRightOf="@id/scene_mode_icon"
- android:text="@string/pref_camera_scenemode_entry_chromaflash"
android:textColor="@android:color/black"
android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -66,7 +64,6 @@
android:layout_marginTop="15dp"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
- android:text="@string/pref_camera2_scene_mode_chroma_flash_instructional_content"
android:textColor="@android:color/black"
android:layout_below="@id/title" />
<CheckBox