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	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() {
		mShowImeAfterFirstLayout = !showSoftInput();
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -717,6 +717,10 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
		: mSearchContainer.getBottom();
		canvas.drawRect(0, 0, getWidth(), bottom + getTranslationY(),
		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);
		getFloatingHeaderView().setHeaderColor(viewBG);
		invalidateHeader();
		if (scrolledOffset == 0 && mSearchUiManager.getEditText() != null) {
		mSearchUiManager.getEditText().show();
		}
		}
		}

+1 −0

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

+9 −0

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

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