nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 1187ef9a: Merge "Catch error while playing welcome video" 

* commit '1187ef9a9747ff2ed71101156f3f560eaa32772c':
  Catch error while playing welcome video
main
Tadashi G. Takaoka 2013-04-30 02:33:52 -07:00 committed by Android Git Automerger
parent d618419d16 1187ef9a97
commit f4a03ddcf8
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/res/layout/setup_welcome_video.xml
View File

@ -22,7 +22,9 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal"
android:paddingTop="@dimen/setup_welcome_video_vertical_margin"
android:paddingBottom="@dimen/setup_welcome_video_vertical_margin">
<View <View
android:layout_weight="@integer/setup_welcome_video_left_padding_weight_in_screen" android:layout_weight="@integer/setup_welcome_video_left_padding_weight_in_screen"
android:layout_width="0dp" android:layout_width="0dp"
@ -31,8 +33,6 @@
android:id="@+id/setup_welcome_video" android:id="@+id/setup_welcome_video"
android:background="@color/setup_background" android:background="@color/setup_background"
android:layout_weight="@integer/setup_welcome_video_weight_in_screen" android:layout_weight="@integer/setup_welcome_video_weight_in_screen"
android:layout_marginTop="@dimen/setup_welcome_video_vertical_margin"
android:layout_marginBottom="@dimen/setup_welcome_video_vertical_margin"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<View <View

11
java/src/com/android/inputmethod/latin/setup/SetupActivity.java
View File

@ -26,6 +26,7 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Message; import android.os.Message;
import android.provider.Settings; import android.provider.Settings;
import android.util.Log;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
@ -44,6 +45,8 @@ import java.util.ArrayList;
// TODO: Use Fragment to implement welcome screen and setup steps. // TODO: Use Fragment to implement welcome screen and setup steps.
public final class SetupActivity extends Activity implements View.OnClickListener { public final class SetupActivity extends Activity implements View.OnClickListener {
private static final String TAG = SetupActivity.class.getSimpleName();
private View mWelcomeScreen; private View mWelcomeScreen;
private View mSetupScreen; private View mSetupScreen;
private Uri mWelcomeVideoUri; private Uri mWelcomeVideoUri;
@ -198,6 +201,14 @@ public final class SetupActivity extends Activity implements View.OnClickListene
mWelcomeVideoView.setBackgroundResource(0); mWelcomeVideoView.setBackgroundResource(0);
} }
}); });
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);
return true;
}
});
mActionStart = findViewById(R.id.setup_start_label); mActionStart = findViewById(R.id.setup_start_label);
mActionStart.setOnClickListener(this); mActionStart.setOnClickListener(this);