Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd575991 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

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

* commit '4bde90bf':
  Update setup wizard video and image of AOSP
parents d956d4bd 4bde90bf

java/res/raw/setup_welcome_image.png

+98.3 KiB (147 KiB)
Loading image diff...

java/res/raw/setup_welcome_video.mp4

−167 KiB (370 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

java/src/com/android/inputmethod/latin/setup/SetupActivity.java

+0 −4
Original line number Diff line number Diff line
@@ -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

java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java

+5 −0
Original line number Diff line number Diff line
@@ -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;

        }