aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-28 15:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Hide searchbox when header protection is on." into sc-dev

Browse Source
This commit is contained in:
Hyunyoung Song
2021-06-23 18:15:27 +00:00
committed by Android (Google) Code Review
parent 9d7ff51901 7d3b25734a
commit 93068d1c39
4 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/launcher3/ExtendedEditText.java
View File

@@ -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
src/com/android/launcher3/allapps/AllAppsContainerView.java
View File

@@ -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
src/com/android/launcher3/allapps/AllAppsRecyclerView.java
View File

@@ -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
src/com/android/launcher3/views/OptionsPopupView.java
View File

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