Merge "Hide searchbox when header protection is on." into sc-dev (93068d1c) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/ExtendedEditText.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -96,6 +96,9 @@ public class ExtendedEditText extends EditText {
	}		}
	}		}

			// inherited class can override to change the appearance of the edit text.
			public void show() {}

	public void showKeyboard() {		public void showKeyboard() {
	mShowImeAfterFirstLayout = !showSoftInput();		mShowImeAfterFirstLayout = !showSoftInput();
	}		}

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

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -717,6 +717,10 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
	: mSearchContainer.getBottom();		: mSearchContainer.getBottom();
	canvas.drawRect(0, 0, getWidth(), bottom + getTranslationY(),		canvas.drawRect(0, 0, getWidth(), bottom + getTranslationY(),
	mHeaderPaint);		mHeaderPaint);

			if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && getTranslationY() == 0) {
			mSearchUiManager.getEditText().setBackground(null);
			}
	}		}
	}		}

	@@ -805,6 +809,9 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
	getSearchView().setBackgroundColor(viewBG);		getSearchView().setBackgroundColor(viewBG);
	getFloatingHeaderView().setHeaderColor(viewBG);		getFloatingHeaderView().setHeaderColor(viewBG);
	invalidateHeader();		invalidateHeader();
			if (scrolledOffset == 0 && mSearchUiManager.getEditText() != null) {
			mSearchUiManager.getEditText().show();
			}
	}		}
	}		}

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -188,6 +188,7 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
	StatsLogManager mgr = BaseDraggingActivity.fromContext(getContext()).getStatsLogManager();		StatsLogManager mgr = BaseDraggingActivity.fromContext(getContext()).getStatsLogManager();
	switch (state) {		switch (state) {
	case SCROLL_STATE_DRAGGING:		case SCROLL_STATE_DRAGGING:
			requestFocus();
	mgr.logger().sendToInteractionJankMonitor(		mgr.logger().sendToInteractionJankMonitor(
	LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN, this);		LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN, this);
	break;		break;

src/com/android/launcher3/views/OptionsPopupView.java

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -132,6 +132,12 @@ public class OptionsPopupView extends ArrowPopup

	public static OptionsPopupView show(		public static OptionsPopupView show(
	Launcher launcher, RectF targetRect, List<OptionItem> items, boolean shouldAddArrow) {		Launcher launcher, RectF targetRect, List<OptionItem> items, boolean shouldAddArrow) {
			return show(launcher, targetRect, items, shouldAddArrow, 0 /* width */);
			}

			public static OptionsPopupView show(
			Launcher launcher, RectF targetRect, List<OptionItem> items, boolean shouldAddArrow,
			int width) {
	OptionsPopupView popup = (OptionsPopupView) launcher.getLayoutInflater()		OptionsPopupView popup = (OptionsPopupView) launcher.getLayoutInflater()
	.inflate(R.layout.longpress_options_menu, launcher.getDragLayer(), false);		.inflate(R.layout.longpress_options_menu, launcher.getDragLayer(), false);
	popup.mTargetRect = targetRect;		popup.mTargetRect = targetRect;
	@@ -140,6 +146,9 @@ public class OptionsPopupView extends ArrowPopup
	for (OptionItem item : items) {		for (OptionItem item : items) {
	DeepShortcutView view =		DeepShortcutView view =
	(DeepShortcutView) popup.inflateAndAdd(R.layout.system_shortcut, popup);		(DeepShortcutView) popup.inflateAndAdd(R.layout.system_shortcut, popup);
			if (width > 0) {
			view.getLayoutParams().width = width;
			}
	view.getIconView().setBackgroundDrawable(item.icon);		view.getIconView().setBackgroundDrawable(item.icon);
	view.getBubbleText().setText(item.label);		view.getBubbleText().setText(item.label);
	view.setOnClickListener(popup);		view.setOnClickListener(popup);