summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-12-20 02:57:07 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-20 02:57:07 -0800
commit1fd9901abce1ff4eb09b5aaa3be22e1a0d846ff7 (patch)
treec90b190a28055e64f655d0712f7e1a214c3472f7 /res/layout
parent4fb7ae0303770e8eef168d04c3f293ecdb9bf457 (diff)
parent90443f141dbd300a3a28f6aeeea5e1bc0fc556a9 (diff)
downloadandroid_packages_apps_Snap-1fd9901abce1ff4eb09b5aaa3be22e1a0d846ff7.tar.gz
android_packages_apps_Snap-1fd9901abce1ff4eb09b5aaa3be22e1a0d846ff7.tar.bz2
android_packages_apps_Snap-1fd9901abce1ff4eb09b5aaa3be22e1a0d846ff7.zip
Merge "SnapdragonCamera: The "x" of the scene mark is too large" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/scene_mode_label.xml12
1 files changed, 9 insertions, 3 deletions
diff --git a/res/layout/scene_mode_label.xml b/res/layout/scene_mode_label.xml
index aa5ef211c..e0d8d43b8 100644
--- a/res/layout/scene_mode_label.xml
+++ b/res/layout/scene_mode_label.xml
@@ -33,7 +33,8 @@
android:layout_height="wrap_content"
android:layout_marginRight="20dp"
android:background="#90000000"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:gravity="center_vertical">
<TextView
android:id="@+id/scene_mode_label"
android:singleLine="true"
@@ -43,8 +44,13 @@
style="@style/OnViewfinderSceneLabel" />
<ImageView
android:id="@+id/scene_mode_label_close"
- android:src="@drawable/x"
- style="@style/OnViewfinderSceneLabel"/>
+ android:layout_width="15dp"
+ android:layout_height="15dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginTop="5dp"
+ android:layout_marginBottom="5dp"
+ android:src="@drawable/x" />
</LinearLayout>
</com.android.camera.ui.RotateLayout>
</LinearLayout> \ No newline at end of file