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

Commit f19c5797 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Disable default IME in all apps if DISABLE_INITIAL_IME_IN_ALLAPPS is on 

Bug: 173447266
Test: manual
Change-Id: Ib5c03b20cc7f09fdc2d066dd20fb7ccbb1e154f5
parent aa934170

src/com/android/launcher3/allapps/AllAppsTransitionController.java

+7 −3
Original line number Diff line number Diff line
@@ -142,7 +142,8 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>, 
        float shiftCurrent = progress * mShiftRange;



        mAppsView.setTranslationY(shiftCurrent);

        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {

        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()

                && !FeatureFlags.DISABLE_INITIAL_IME_IN_ALLAPPS.get()) {

            mInsetController.setProgress(progress);

        }

    }
@@ -233,7 +234,9 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>, 
    public void setupViews(AllAppsContainerView appsView, ScrimView scrimView) {

        mAppsView = appsView;

        mScrimView = scrimView;

        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()) {

        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()

                && !FeatureFlags.DISABLE_INITIAL_IME_IN_ALLAPPS.get()

                && BuildCompat.isAtLeastR()) {

            mInsetController = new AllAppsInsetTransitionController(mShiftRange, mAppsView);

            mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,

                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
@@ -261,7 +264,8 @@ public class AllAppsTransitionController implements StateHandler<LauncherState>, 
        if (Float.compare(mProgress, 1f) == 0) {

            mAppsView.reset(false /* animate */);

        }

        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()) {

        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()

                && !FeatureFlags.DISABLE_INITIAL_IME_IN_ALLAPPS.get() && BuildCompat.isAtLeastR()) {

            mInsetController.onAnimationEnd(mProgress);

            if (Float.compare(mProgress, 0f) == 0) {

                mLauncher.getLiveSearchManager().start();

src/com/android/launcher3/config/FeatureFlags.java

+3 −0
Original line number Diff line number Diff line
@@ -98,6 +98,9 @@ public final class FeatureFlags { 
    public static final BooleanFlag ENABLE_DEVICE_SEARCH = getDebugFlag(

            "ENABLE_DEVICE_SEARCH", false, "Allows on device search in all apps");



    public static final BooleanFlag DISABLE_INITIAL_IME_IN_ALLAPPS = getDebugFlag(

            "DISABLE_INITIAL_IME_IN_ALLAPPS", false, "Disable default IME state in all apps");



    public static final BooleanFlag FOLDER_NAME_SUGGEST = new DeviceFlag(

            "FOLDER_NAME_SUGGEST", true,

            "Suggests folder names instead of blank text.");

src/com/android/launcher3/touch/AbstractStateChangeTouchController.java

+3 −1
Original line number Diff line number Diff line
@@ -261,7 +261,9 @@ public abstract class AbstractStateChangeTouchController 
        mCanBlockFling = mFromState == NORMAL;

        mFlingBlockCheck.unblockFling();

        // Must be called after all the animation controllers have been paused

        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR()

        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()

                && !FeatureFlags.DISABLE_INITIAL_IME_IN_ALLAPPS.get()

                && BuildCompat.isAtLeastR()

                && (mToState == ALL_APPS || mToState == NORMAL)) {

            mLauncher.getAllAppsController().getInsetController().onDragStart(

                    mFromState == NORMAL ? 1f : 0f);