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

am 4bde90bf: Merge "Update setup wizard video and image of AOSP" 

* commit '4bde90bf77a52dca1f99eebd3cfb890d741ccd83':
  Update setup wizard video and image of AOSP
main
Tadashi G. Takaoka 2014-10-06 09:13:23 +00:00 committed by Android Git Automerger
parent d956d4bd3d 4bde90bf77
commit fd57599156
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
java/res/raw/setup_welcome_image.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 148 KiB

BIN
java/res/raw/setup_welcome_video.mp4
View File

Binary file not shown.

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

@ -17,12 +17,8 @@
package com.android.inputmethod.latin.setup; package com.android.inputmethod.latin.setup;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
public final class SetupActivity extends Activity { public final class SetupActivity extends Activity {
@Override @Override

5
java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java
View File

@ -46,6 +46,8 @@ import java.util.ArrayList;
public final class SetupWizardActivity extends Activity implements View.OnClickListener { public final class SetupWizardActivity extends Activity implements View.OnClickListener {
static final String TAG = SetupWizardActivity.class.getSimpleName(); 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 static final boolean ENABLE_WELCOME_VIDEO = true;
private InputMethodManager mImm; private InputMethodManager mImm;
@ -304,6 +306,9 @@ public final class SetupWizardActivity extends Activity implements View.OnClickL
private int determineSetupStepNumber() { private int determineSetupStepNumber() {
mHandler.cancelPollingImeSettings(); mHandler.cancelPollingImeSettings();
if (FORCE_TO_SHOW_WELCOME_SCREEN) {
return STEP_1;
}
if (!UncachedInputMethodManagerUtils.isThisImeEnabled(this, mImm)) { if (!UncachedInputMethodManagerUtils.isThisImeEnabled(this, mImm)) {
return STEP_1; return STEP_1;
} }