Display still image when device can't play welcome video
Note that the still image in this change is a placeholder and must be
replaced by final asset.
Bug: 8159728
Change-Id: I4f5a28e0af711edacbc87c2ee64508f34f67f0da
diff --git a/java/res/layout/setup_welcome_video.xml b/java/res/layout/setup_welcome_video.xml
index 3cc5f21..8c04e63 100644
--- a/java/res/layout/setup_welcome_video.xml
+++ b/java/res/layout/setup_welcome_video.xml
@@ -35,6 +35,12 @@
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" />
<View
android:layout_weight="@integer/setup_welcome_video_right_padding_weight_in_screen"
android:layout_width="0dp"
diff --git a/java/res/raw/setup_welcome_image.png b/java/res/raw/setup_welcome_image.png
new file mode 100644
index 0000000..17e3111
--- /dev/null
+++ b/java/res/raw/setup_welcome_image.png
Binary files differ
diff --git a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
index 044180b..bf24b11 100644
--- a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
+++ b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
@@ -30,6 +30,7 @@
import android.view.View;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
+import android.widget.ImageView;
import android.widget.TextView;
import android.widget.VideoView;
@@ -201,11 +202,14 @@
mWelcomeVideoView.setBackgroundResource(0);
}
});
+ final ImageView welcomeImageView = (ImageView)findViewById(R.id.setup_welcome_image);
mWelcomeVideoView.setOnErrorListener(new MediaPlayer.OnErrorListener() {
@Override
public boolean onError(final MediaPlayer mp, final int what, final int extra) {
Log.e(TAG, "Playing welcome video causes error: what=" + what + " extra=" + extra);
mWelcomeVideoView.setVisibility(View.GONE);
+ welcomeImageView.setImageResource(R.raw.setup_welcome_image);
+ welcomeImageView.setVisibility(View.VISIBLE);
return true;
}
});