aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-05-15 11:19:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-15 11:19:36 -0700
commit24fc5ab65ff0cb53dea2d7beef3f7bbd64fcbbec (patch)
tree4a66a6522a08b0d65920a25609cd8b8581ab4c1b /java/res
parent9db1f6d9c6e2b656e587e2dee2a63c89db9e7e1b (diff)
parentf4a03ddcf85a546a7ed9eb59840fd81e4c014de9 (diff)
downloadlatinime-24fc5ab65ff0cb53dea2d7beef3f7bbd64fcbbec.tar.gz
latinime-24fc5ab65ff0cb53dea2d7beef3f7bbd64fcbbec.tar.xz
latinime-24fc5ab65ff0cb53dea2d7beef3f7bbd64fcbbec.zip
am f4a03ddc: am 1187ef9a: Merge "Catch error while playing welcome video"
* commit 'f4a03ddcf85a546a7ed9eb59840fd81e4c014de9': Catch error while playing welcome video
Diffstat (limited to 'java/res')
-rw-r--r--java/res/layout/setup_welcome_video.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/res/layout/setup_welcome_video.xml b/java/res/layout/setup_welcome_video.xml
index 09cef988b..3cc5f2122 100644
--- a/java/res/layout/setup_welcome_video.xml
+++ b/java/res/layout/setup_welcome_video.xml
@@ -22,7 +22,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:paddingTop="@dimen/setup_welcome_video_vertical_margin"
+ android:paddingBottom="@dimen/setup_welcome_video_vertical_margin">
<View
android:layout_weight="@integer/setup_welcome_video_left_padding_weight_in_screen"
android:layout_width="0dp"
@@ -31,8 +33,6 @@
android:id="@+id/setup_welcome_video"
android:background="@color/setup_background"
android:layout_weight="@integer/setup_welcome_video_weight_in_screen"
- android:layout_marginTop="@dimen/setup_welcome_video_vertical_margin"
- android:layout_marginBottom="@dimen/setup_welcome_video_vertical_margin"
android:layout_width="0dp"
android:layout_height="wrap_content" />
<View