diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-10-06 09:13:23 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-06 09:13:23 +0000 |
| commit | fd5759915679b8e25cfa61ff1c7bf306f5bf280b (patch) | |
| tree | ddabd105487817ddbdc860c304211d7af545adff | |
| parent | d956d4bd3d9888dc23088a008f3ac6f35c5528de (diff) | |
| parent | 4bde90bf77a52dca1f99eebd3cfb890d741ccd83 (diff) | |
| download | latinime-fd5759915679b8e25cfa61ff1c7bf306f5bf280b.tar.gz latinime-fd5759915679b8e25cfa61ff1c7bf306f5bf280b.tar.xz latinime-fd5759915679b8e25cfa61ff1c7bf306f5bf280b.zip | |
am 4bde90bf: Merge "Update setup wizard video and image of AOSP"
* commit '4bde90bf77a52dca1f99eebd3cfb890d741ccd83':
Update setup wizard video and image of AOSP
| -rw-r--r-- | java/res/raw/setup_welcome_image.png | bin | 50389 -> 151016 bytes | |||
| -rw-r--r-- | java/res/raw/setup_welcome_video.mp4 | bin | 549513 -> 378604 bytes | |||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/setup/SetupActivity.java | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java | 5 |
4 files changed, 5 insertions, 4 deletions
diff --git a/java/res/raw/setup_welcome_image.png b/java/res/raw/setup_welcome_image.png Binary files differindex 98e731331..613636907 100644 --- a/java/res/raw/setup_welcome_image.png +++ b/java/res/raw/setup_welcome_image.png diff --git a/java/res/raw/setup_welcome_video.mp4 b/java/res/raw/setup_welcome_video.mp4 Binary files differindex 224bf250c..09be565e4 100644 --- a/java/res/raw/setup_welcome_video.mp4 +++ b/java/res/raw/setup_welcome_video.mp4 diff --git a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java index b770ea512..7607429f8 100644 --- a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java +++ b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java @@ -17,12 +17,8 @@ package com.android.inputmethod.latin.setup; import android.app.Activity; -import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.provider.Settings; -import android.view.inputmethod.InputMethodInfo; -import android.view.inputmethod.InputMethodManager; public final class SetupActivity extends Activity { @Override diff --git a/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java index e455e53d3..54562f39d 100644 --- a/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java +++ b/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java @@ -46,6 +46,8 @@ import java.util.ArrayList; public final class SetupWizardActivity extends Activity implements View.OnClickListener { static final String TAG = SetupWizardActivity.class.getSimpleName(); + // For debugging purpose. + private static final boolean FORCE_TO_SHOW_WELCOME_SCREEN = false; private static final boolean ENABLE_WELCOME_VIDEO = true; private InputMethodManager mImm; @@ -304,6 +306,9 @@ public final class SetupWizardActivity extends Activity implements View.OnClickL private int determineSetupStepNumber() { mHandler.cancelPollingImeSettings(); + if (FORCE_TO_SHOW_WELCOME_SCREEN) { + return STEP_1; + } if (!UncachedInputMethodManagerUtils.isThisImeEnabled(this, mImm)) { return STEP_1; } |
