diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-05-15 12:59:17 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-05-15 12:59:17 -0700 |
| commit | 46bf9f493c61430cbaed343f09e7e88fdd238098 (patch) | |
| tree | 4edea51bb40fdbc9d6fc145df05be3d0057c1858 /java/res/layout | |
| parent | acb37023b2e23b4be29d3b05f6516923adeb9560 (diff) | |
| parent | 4e3a8afd173b23f8f73fd18d0b23a3cc8f3226b4 (diff) | |
| download | latinime-46bf9f493c61430cbaed343f09e7e88fdd238098.tar.gz latinime-46bf9f493c61430cbaed343f09e7e88fdd238098.tar.xz latinime-46bf9f493c61430cbaed343f09e7e88fdd238098.zip | |
am 4e3a8afd: am 8b56ad78: Merge "Revise welcome screen video and still image"
* commit '4e3a8afd173b23f8f73fd18d0b23a3cc8f3226b4':
Revise welcome screen video and still image
Diffstat (limited to 'java/res/layout')
| -rw-r--r-- | java/res/layout/setup_welcome_video.xml | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/java/res/layout/setup_welcome_video.xml b/java/res/layout/setup_welcome_video.xml index 8c04e637e..c39411e3d 100644 --- a/java/res/layout/setup_welcome_video.xml +++ b/java/res/layout/setup_welcome_video.xml @@ -25,24 +25,27 @@ 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" - android:layout_height="0dp" /> - <VideoView - android:id="@+id/setup_welcome_video" - android:background="@color/setup_background" - android:layout_weight="@integer/setup_welcome_video_weight_in_screen" - android:layout_width="0dp" - android:layout_height="wrap_content" /> - <ImageView - android:id="@+id/setup_welcome_image" - android:visibility="gone" + <LinearLayout + android:id="@+id/setup_welcome_video_frame" android:layout_weight="@integer/setup_welcome_video_weight_in_screen" android:layout_width="0dp" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="1dp" + android:background="@color/setup_welcome_video_margin_color" > + <VideoView + android:id="@+id/setup_welcome_video" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/setup_background" /> + <ImageView + android:id="@+id/setup_welcome_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" /> + </LinearLayout> <View - android:layout_weight="@integer/setup_welcome_video_right_padding_weight_in_screen" + android:layout_weight="@integer/setup_welcome_video_end_padding_weight_in_screen" android:layout_width="0dp" android:layout_height="0dp" /> </LinearLayout> |