mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-05 02:16:49 +00:00
Merge "[Toast] Use a BaseSearchConfig for launcher3 to read allapps device config." into tm-qpr-dev am: 6a2dd438da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20240555 Change-Id: I485e5c71e8ee89d1e5bac3f6d31dc3dce8145689 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -131,6 +131,7 @@ import com.android.launcher3.allapps.AllAppsRecyclerView;
|
||||
import com.android.launcher3.allapps.AllAppsStore;
|
||||
import com.android.launcher3.allapps.AllAppsTransitionController;
|
||||
import com.android.launcher3.allapps.BaseAllAppsContainerView;
|
||||
import com.android.launcher3.allapps.BaseSearchConfig;
|
||||
import com.android.launcher3.allapps.DiscoveryBounce;
|
||||
import com.android.launcher3.anim.PropertyListBuilder;
|
||||
import com.android.launcher3.compat.AccessibilityManagerCompat;
|
||||
@@ -395,6 +396,7 @@ public class Launcher extends StatefulActivity<LauncherState>
|
||||
private LauncherState mPrevLauncherState;
|
||||
|
||||
private StringCache mStringCache;
|
||||
private BaseSearchConfig mBaseSearchConfig;
|
||||
|
||||
@Override
|
||||
@TargetApi(Build.VERSION_CODES.S)
|
||||
@@ -545,6 +547,9 @@ public class Launcher extends StatefulActivity<LauncherState>
|
||||
getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
|
||||
}
|
||||
setTitle(R.string.home_screen);
|
||||
|
||||
// TODO: move the SearchConfig to SearchState when new LauncherState is created.
|
||||
mBaseSearchConfig = new BaseSearchConfig();
|
||||
}
|
||||
|
||||
protected LauncherOverlayManager getDefaultOverlay() {
|
||||
@@ -1592,12 +1597,8 @@ 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;
|
||||
public BaseSearchConfig getSearchConfig() {
|
||||
return mBaseSearchConfig;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -226,7 +226,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 && !mLauncher.isKeyboardSyncEnabled()) {
|
||||
if (!config.userControlled && !mLauncher.getSearchConfig().isKeyboardSyncEnabled()) {
|
||||
mLauncher.getAppsView().getSearchUiManager().getEditText().hideKeyboard();
|
||||
}
|
||||
|
||||
|
||||
28
src/com/android/launcher3/allapps/BaseSearchConfig.java
Normal file
28
src/com/android/launcher3/allapps/BaseSearchConfig.java
Normal file
@@ -0,0 +1,28 @@
|
||||
/*
|
||||
* Copyright (C) 2022 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.android.launcher3.allapps;
|
||||
|
||||
/** Base config values for search. */
|
||||
public class BaseSearchConfig {
|
||||
public BaseSearchConfig() {}
|
||||
|
||||
/**
|
||||
* Returns whether to enable the synchronized keyboard transition between Home and All Apps.
|
||||
*/
|
||||
public boolean isKeyboardSyncEnabled() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user