diff --git a/java/res/layout-land/setup_steps_screen.xml b/java/res/layout-land/setup_steps_screen.xml
index 0b4a096cc1e50158c4c17abb5404dcd534bb5e54..cf8c424750f73848be24408ab762ee2ca420cd0e 100644
--- a/java/res/layout-land/setup_steps_screen.xml
+++ b/java/res/layout-land/setup_steps_screen.xml
@@ -27,7 +27,9 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="@integer/setup_title_weight_in_screen"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:layout_marginEnd="@dimen/setup_title_end_margin"
+ android:layout_marginRight="@dimen/setup_title_end_margin">
<include layout="@layout/setup_steps_title" />
</LinearLayout>
<LinearLayout
diff --git a/java/res/layout-land/setup_welcome_screen.xml b/java/res/layout-land/setup_welcome_screen.xml
index 8b162e27f55663a645451dc3bb50a16204502186..38aea2c4f4e7590652748c659c6dad67640fad19 100644
--- a/java/res/layout-land/setup_welcome_screen.xml
+++ b/java/res/layout-land/setup_welcome_screen.xml
@@ -27,7 +27,9 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="@integer/setup_title_weight_in_screen"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:layout_marginEnd="@dimen/setup_title_end_margin"
+ android:layout_marginRight="@dimen/setup_title_end_margin">
<include layout="@layout/setup_welcome_title" />
</LinearLayout>
<LinearLayout
diff --git a/java/res/layout/setup_welcome_video.xml b/java/res/layout/setup_welcome_video.xml
index 8c04e637edd18421e07795e300f618b1ed06cf26..c39411e3dad82c087dc74ef3d92c924ac10725dd 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>
diff --git a/java/res/raw/setup_welcome_image.png b/java/res/raw/setup_welcome_image.png
index 17e31111f4b25c4c4f688cc1bbde4d4b933dd63f..db5dc344f41152167c0315205dffd2d34f572242 100644
Binary files a/java/res/raw/setup_welcome_image.png and b/java/res/raw/setup_welcome_image.png differ
diff --git a/java/res/raw/setup_welcome_video.mp4 b/java/res/raw/setup_welcome_video.mp4
index 09357d8de22e3f57ea529d1467a97b9491d1b209..820852531d75162e8850a9486233301448a2d7c8 100644
Binary files a/java/res/raw/setup_welcome_video.mp4 and b/java/res/raw/setup_welcome_video.mp4 differ
diff --git a/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml b/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
index ad61c1a3ae5c4e141bd7ef2a024b2b04da598017..d1df81e014cfa258a1dec3f4a2e2e1b37dc73cfc 100644
--- a/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
+++ b/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
@@ -33,8 +33,8 @@
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</integer>
+ <dimen name="setup_title_end_margin">24dp</dimen>
<dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
- <integer name="setup_welcome_video_weight_in_screen">50</integer>
- <integer name="setup_welcome_video_left_padding_weight_in_screen">25</integer>
- <integer name="setup_welcome_video_right_padding_weight_in_screen">25</integer>
+ <integer name="setup_welcome_video_weight_in_screen">70</integer>
+ <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
</resources>
diff --git a/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml b/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
index 69a8a7ad514cebc863cdb1c73cecd60b54872e06..babc05bf2166ef926febbec9e6ae73c64987d546 100644
--- a/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
+++ b/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
@@ -33,8 +33,8 @@
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</integer>
+ <dimen name="setup_title_end_margin">24dp</dimen>
<dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
- <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>
+ <integer name="setup_welcome_video_weight_in_screen">70</integer>
+ <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
</resources>
diff --git a/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml b/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
index 6a14d591818730c360efbc21b938451db7a81d90..772587491668004ffa863b0d6e427d33b8ef4ef8 100644
--- a/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
+++ b/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
@@ -33,8 +33,8 @@
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</integer>
+ <dimen name="setup_title_end_margin">24dp</dimen>
<dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">60</integer>
- <integer name="setup_welcome_video_left_padding_weight_in_screen">20</integer>
- <integer name="setup_welcome_video_right_padding_weight_in_screen">20</integer>
+ <integer name="setup_welcome_video_end_padding_weight_in_screen">40</integer>
</resources>
diff --git a/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml b/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
index b8dd33df46ebcd220bd8f81b121adf9b10947cb4..42d2284f58ad6d5fe02304563f3d085f3171c73d 100644
--- a/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
+++ b/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
@@ -33,8 +33,8 @@
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</integer>
+ <dimen name="setup_title_end_margin">24dp</dimen>
<dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
- <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>
+ <integer name="setup_welcome_video_weight_in_screen">70</integer>
+ <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
</resources>
diff --git a/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml b/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
index 0004a3c857029aafe1f1ada648a59c79c9422b6b..b5f0e5cea489426b9d41ba62f3a9c4e7091ab080 100644
--- a/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
+++ b/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
@@ -33,8 +33,8 @@
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</integer>
+ <dimen name="setup_title_end_margin">24dp</dimen>
<dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
- <integer name="setup_welcome_video_weight_in_screen">50</integer>
- <integer name="setup_welcome_video_left_padding_weight_in_screen">25</integer>
- <integer name="setup_welcome_video_right_padding_weight_in_screen">25</integer>
+ <integer name="setup_welcome_video_weight_in_screen">70</integer>
+ <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
</resources>
diff --git a/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml b/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
index 87c991c4d0ca7b1ee6bde6fa1e02ee5a952cf4ed..770b4e8255256866d54c8d8d97bc34769b37d80f 100644
--- a/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
+++ b/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
@@ -33,8 +33,8 @@
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</integer>
+ <dimen name="setup_title_end_margin">24dp</dimen>
<dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">60</integer>
- <integer name="setup_welcome_video_left_padding_weight_in_screen">20</integer>
- <integer name="setup_welcome_video_right_padding_weight_in_screen">20</integer>
+ <integer name="setup_welcome_video_end_padding_weight_in_screen">40</integer>
</resources>
diff --git a/java/res/values-land/setup-dimens-small-phone-land.xml b/java/res/values-land/setup-dimens-small-phone-land.xml
index 63f4661d1673a043ccb8644d16dcb564bda24614..e6dbaa71c0d1afc5a9a0ff8c4bf9c100667ee6c5 100644
--- a/java/res/values-land/setup-dimens-small-phone-land.xml
+++ b/java/res/values-land/setup-dimens-small-phone-land.xml
@@ -33,8 +33,8 @@
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</integer>
- <dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
- <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>
+ <dimen name="setup_title_end_margin">12dp</dimen>
+ <dimen name="setup_welcome_video_vertical_margin">12dp</dimen>
+ <integer name="setup_welcome_video_weight_in_screen">60</integer>
+ <integer name="setup_welcome_video_end_padding_weight_in_screen">40</integer>
</resources>
diff --git a/java/res/values-port/setup-dimens-small-phone-port.xml b/java/res/values-port/setup-dimens-small-phone-port.xml
index 34f4d92406f0f4fbe20a73f49df36c51e007561a..a3b18afbc347199f6b22869c5f5f8dadacdb9539 100644
--- a/java/res/values-port/setup-dimens-small-phone-port.xml
+++ b/java/res/values-port/setup-dimens-small-phone-port.xml
@@ -33,8 +33,8 @@
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</integer>
+ <dimen name="setup_title_end_margin">16dp</dimen>
<dimen name="setup_welcome_video_vertical_margin">16dp</dimen>
- <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>
+ <integer name="setup_welcome_video_weight_in_screen">70</integer>
+ <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
</resources>
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 8a8049f1f9a354136dcbe4c03686f0f4cf99e706..daa167c8a9857b82f376aa1193687c725c193511 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -58,4 +58,5 @@
<color name="setup_text_dark">#FF707070</color>
<color name="setup_text_action">@android:color/holo_blue_light</color>
<color name="setup_step_background">@android:color/background_light</color>
+ <color name="setup_welcome_video_margin_color">#FFCCCCCC</color>
</resources>
diff --git a/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java
index 3406ecf342cb517306d56d3cc4996993575520f7..0d25bc33800bf890cb926d9b6f93736007845c84 100644
--- a/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java
+++ b/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java
@@ -27,6 +27,7 @@ import android.os.Message;
import android.provider.Settings;
import android.util.Log;
import android.view.View;
+import android.view.ViewGroup;
import android.view.inputmethod.InputMethodInfo;
import android.widget.ImageView;
import android.widget.TextView;
@@ -199,6 +200,11 @@ public final class SetupWizardActivity extends Activity implements View.OnClickL
welcomeVideoView.setVisibility(View.GONE);
welcomeImageView.setImageResource(R.raw.setup_welcome_image);
welcomeImageView.setVisibility(View.VISIBLE);
+ // Remove unnecessary light gray background around still image.
+ final ViewGroup videoFrame = (ViewGroup)findViewById(
+ R.id.setup_welcome_video_frame);
+ videoFrame.setBackgroundColor(getResources().getColor(R.color.setup_background));
+ videoFrame.requestLayout();
return true;
}
});