Merge "Separate QSB from on device search" (d0ae95aa) · Commits · e / os / BlissLauncher3

res/values/config.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,7 @@
		<!-- QSB IDs. DO not change -->
		<item type="id" name="search_container_workspace" />
		<item type="id" name="search_container_all_apps" />
		<item type="id" name="search_container_hotseat" />

		<!-- Recents -->
		<item type="id" name="overview_panel"/>

src/com/android/launcher3/Hotseat.java

+15 −3

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@ import android.widget.FrameLayout;

		import androidx.annotation.Nullable;

		import com.android.launcher3.config.FeatureFlags;

		import java.util.function.Consumer;

		/**
		@@ -38,7 +40,8 @@ public class Hotseat extends CellLayout implements Insettable {
		private boolean mHasVerticalHotseat;
		private Workspace mWorkspace;
		private boolean mSendTouchToWorkspace;
		@Nullable private Consumer<Boolean> mOnVisibilityAggregatedCallback;
		@Nullable
		private Consumer<Boolean> mOnVisibilityAggregatedCallback;

		public Hotseat(Context context) {
		this(context, null);
		@@ -73,8 +76,9 @@ public class Hotseat extends CellLayout implements Insettable {
		if (hasVerticalHotseat) {
		setGridSize(1, idp.numHotseatIcons);
		} else {
		setGridSize(idp.numHotseatIcons, 1);
		setGridSize(idp.numHotseatIcons, FeatureFlags.ENABLE_DEVICE_SEARCH.get() ? 2 : 1);
		}
		showInlineQsb();
		}

		@Override
		@@ -97,7 +101,11 @@ public class Hotseat extends CellLayout implements Insettable {
		lp.height = grid.hotseatBarSizePx + insets.bottom;
		}
		Rect padding = grid.getHotseatLayoutPadding();
		setPadding(padding.left, padding.top, padding.right, padding.bottom);
		int paddingBottom = padding.bottom;
		if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && !grid.isVerticalBarLayout()) {
		paddingBottom -= grid.hotseatBarBottomPaddingPx;
		}
		setPadding(padding.left, padding.top, padding.right, paddingBottom);

		setLayoutParams(lp);
		InsettableFrameLayout.dispatchInsets(this, insets);
		@@ -148,4 +156,8 @@ public class Hotseat extends CellLayout implements Insettable {
		public void setOnVisibilityAggregatedCallback(@Nullable Consumer<Boolean> callback) {
		mOnVisibilityAggregatedCallback = callback;
		}

		protected void showInlineQsb() {
		//Does nothing
		}
		}

src/com/android/launcher3/LauncherState.java

+11 −7

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import static com.android.launcher3.testing.TestProtocol.SPRING_LOADED_STATE_ORD
		import android.content.Context;
		import android.view.animation.Interpolator;

		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.statemanager.BaseState;
		import com.android.launcher3.statemanager.StateManager;
		import com.android.launcher3.states.HintState;
		@@ -185,10 +186,12 @@ public abstract class LauncherState implements BaseState<LauncherState> {
		}

		public int getVisibleElements(Launcher launcher) {
		if (launcher.getDeviceProfile().isVerticalBarLayout()) {
		return HOTSEAT_ICONS \| VERTICAL_SWIPE_INDICATOR;
		int flags = HOTSEAT_ICONS \| VERTICAL_SWIPE_INDICATOR;
		if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()
		&& !launcher.getDeviceProfile().isVerticalBarLayout()) {
		flags \|= HOTSEAT_SEARCH_BOX;
		}
		return HOTSEAT_ICONS \| HOTSEAT_SEARCH_BOX \| VERTICAL_SWIPE_INDICATOR;
		return flags;
		}

		/**
		@@ -229,6 +232,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {

		/**
		* Returns the amount of blur and wallpaper zoom for this state with {@param isMultiWindowMode}.
		*
		* @see #getDepth(Context).
		*/
		public final float getDepth(Context context, boolean isMultiWindowMode) {

src/com/android/launcher3/ShortcutAndWidgetContainer.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -36,7 +36,8 @@ public class ShortcutAndWidgetContainer extends ViewGroup {
		// return an (x, y) value from helper functions. Do NOT use them to maintain other state.
		private final int[] mTmpCellXY = new int[2];

		@ContainerType private final int mContainerType;
		@ContainerType
		private final int mContainerType;
		private final WallpaperManager mWallpaperManager;

		private int mCellWidth;
		@@ -44,7 +45,7 @@ public class ShortcutAndWidgetContainer extends ViewGroup {

		private int mCountX;

		private ActivityContext mActivity;
		private final ActivityContext mActivity;
		private boolean mInvertIfRtl = false;

		public ShortcutAndWidgetContainer(Context context, @ContainerType int containerType) {

src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import com.android.launcher3.allapps.AllAppsStore;
		import com.android.launcher3.allapps.AlphabeticalAppsList;
		import com.android.launcher3.allapps.SearchUiManager;
		import com.android.launcher3.anim.PropertySetter;
		import com.android.launcher3.config.FeatureFlags;

		import java.util.ArrayList;
		import java.util.List;
		@@ -215,7 +216,8 @@ public class AppsSearchContainerLayout extends ExtendedEditText

		@Override
		public float getScrollRangeDelta(Rect insets) {
		if (mLauncher.getDeviceProfile().isVerticalBarLayout()) {
		if (mLauncher.getDeviceProfile().isVerticalBarLayout()
		\|\| FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
		return 0;
		} else {
		return insets.bottom + insets.top;