diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-04-30 02:33:52 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-30 02:33:52 -0700 |
| commit | f4a03ddcf85a546a7ed9eb59840fd81e4c014de9 (patch) | |
| tree | ad86e93ad62694061a2b0f76c126b6dc758568b2 /java/res | |
| parent | d618419d16865f9cc54ec893873bab514b321815 (diff) | |
| parent | 1187ef9a9747ff2ed71101156f3f560eaa32772c (diff) | |
| download | latinime-f4a03ddcf85a546a7ed9eb59840fd81e4c014de9.tar.gz latinime-f4a03ddcf85a546a7ed9eb59840fd81e4c014de9.tar.xz latinime-f4a03ddcf85a546a7ed9eb59840fd81e4c014de9.zip | |
am 1187ef9a: Merge "Catch error while playing welcome video"
* commit '1187ef9a9747ff2ed71101156f3f560eaa32772c':
Catch error while playing welcome video
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/layout/setup_welcome_video.xml | 6 |
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 |