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

Commit bda972b2 authored by Luca Zuccarini's avatar Luca Zuccarini
Browse files

[Toast] Switch to using device config to control keyboard sync. 

Bug: 234812580
Test: followed the existing pattern and tested by manually setting and
unsetting the flag through command line - `adb shell device_config put
launcher enable_web_suggest_on_default_browser <true|false>`

Change-Id: Idd479e93b628b78fdf55d826c56f69c5cfdaf46e
parent 1aa91f0f

src/com/android/launcher3/Launcher.java

+8 −0
Original line number Diff line number Diff line
@@ -1579,6 +1579,14 @@ public class Launcher extends StatefulActivity<LauncherState> 
        return mOldConfig.orientation;

    }



    /**

     * Whether keyboard sync is enabled for transitions between Home and All Apps.

     * TODO(b/251387263): move this method inside an All Apps specific config class.

     */

    public boolean isKeyboardSyncEnabled() {

        return false;

    }



    @Override

    protected void onNewIntent(Intent intent) {

        if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {

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

+1 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.launcher3.LauncherState; 
import com.android.launcher3.anim.AnimatorListeners;

import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.anim.PropertySetter;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.statemanager.StateManager.StateHandler;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.util.MultiPropertyFactory;
@@ -229,7 +228,7 @@ public class AllAppsTransitionController 
            StateAnimationConfig config, PendingAnimation builder) {

        if (mLauncher.isInState(ALL_APPS) && !ALL_APPS.equals(toState)) {

            // For atomic animations, we close the keyboard immediately.

            if (!config.userControlled && !FeatureFlags.ENABLE_KEYBOARD_TRANSITION_SYNC.get()) {

            if (!config.userControlled && !mLauncher.isKeyboardSyncEnabled()) {

                mLauncher.getAppsView().getSearchUiManager().getEditText().hideKeyboard();

            }

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

+0 −5
Original line number Diff line number Diff line
@@ -249,11 +249,6 @@ public final class FeatureFlags { 
    public static final BooleanFlag ENABLE_ONE_SEARCH_MOTION = new DeviceFlag(

            "ENABLE_ONE_SEARCH_MOTION", true, "Enables animations in OneSearch.");



    public static final BooleanFlag ENABLE_KEYBOARD_TRANSITION_SYNC = new DeviceFlag(

            "ENABLE_KEYBOARD_TRANSITION_SYNC", IS_STUDIO_BUILD,

            "Enable option to synchronize the keyboard open and close animations when transitioning"

                    + " between home and all apps");



    public static final BooleanFlag ENABLE_SHOW_KEYBOARD_OPTION_IN_ALL_APPS = new DeviceFlag(

            "ENABLE_SHOW_KEYBOARD_OPTION_IN_ALL_APPS", true,

            "Enable option to show keyboard when going to all-apps");