Centering setup wizard welcome video

Bug: 8159728
Change-Id: Ia016c41dc39b87740ff57efe0e2fadd61f0da129

java/res/layout/setup_welcome_video.xml

@@ -19,12 +19,26 @@
 -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <VideoView
-        android:id="@+id/setup_welcome_video"
-        android:layout_margin="36dp"
-        android:layout_width="240dp"
-        android:layout_height="150dp"
-        android:layout_centerHorizontal="true" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <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:layout_weight="@integer/setup_welcome_video_weight_in_screen"
+            android:layout_marginTop="24dp"
+            android:layout_marginBottom="24dp"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content" />
+        <View
+            android:layout_weight="@integer/setup_welcome_video_right_padding_weight_in_screen"
+            android:layout_width="0dp"
+            android:layout_height="0dp" />
+    </LinearLayout>
     <com.android.inputmethod.latin.setup.SetupStartIndicatorView
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />

java/res/values/setup-dimens.xml

@@ -20,4 +20,7 @@
     <dimen name="setup_horizontal_padding">16dp</dimen>
     <integer name="setup_title_weight_in_screen">40</integer>
     <integer name="setup_body_weight_in_screen">60</integer>
+    <integer name="setup_welcome_video_weight_in_screen">80</integer>
+    <integer name="setup_welcome_video_left_padding_weight_in_screen">10</integer>
+    <integer name="setup_welcome_video_right_padding_weight_in_screen">10</integer>
 </resources>