Revise welcome screen video and still image
Bug: 8159728
Change-Id: Ief8d7197879d24ccef529e975c23d6f11c7aa458
diff --git a/java/res/layout-land/setup_steps_screen.xml b/java/res/layout-land/setup_steps_screen.xml
index 0b4a096..cf8c424 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 8b162e2..38aea2c 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 8c04e63..c39411e 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"
+ <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" />
- <ImageView
- android:id="@+id/setup_welcome_image"
- android:visibility="gone"
- 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 17e3111..db5dc34 100644
--- a/java/res/raw/setup_welcome_image.png
+++ b/java/res/raw/setup_welcome_image.png
Binary files differ
diff --git a/java/res/raw/setup_welcome_video.mp4 b/java/res/raw/setup_welcome_video.mp4
index 09357d8..8208525 100644
--- a/java/res/raw/setup_welcome_video.mp4
+++ b/java/res/raw/setup_welcome_video.mp4
Binary files 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 ad61c1a..d1df81e 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 69a8a7a..babc05b 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 6a14d59..7725874 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 b8dd33d..42d2284 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 0004a3c..b5f0e5c 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 87c991c..770b4e8 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 63f4661..e6dbaa7 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 34f4d92..a3b18af 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 8a8049f..daa167c 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 3406ecf..0d25bc3 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.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 @@
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;
}
});
