aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 08:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "[Toast] Switch to using device config to control keyboard sync." into tm-qpr-dev am: 82469ea23b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20085413

Change-Id: I9e4da94bd38adf226c8bdbc12f44abe18a7a0992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Luca Zuccarini
2022-10-10 10:40:18 +00:00
committed by Automerger Merge Worker
parent d77f086d72 82469ea23b
commit bf7afbcfc8
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/launcher3/Launcher.java
View File

@@ -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) {

3
src/com/android/launcher3/allapps/AllAppsTransitionController.java
View File

@@ -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();
}

5
src/com/android/launcher3/config/FeatureFlags.java
View File

@@ -254,11 +254,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");