PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add onWidgetsBound() callback to TaskMenuView

Browse Source 
This lets us handle the edge cases where widgets are added or
removed after popuplating the menu, and updating it accordingly.

Change-Id: I5d8fff8714caa718f87aeac3b15a346b80aed7a8
This commit is contained in:
Tony Wickham
2018-01-02 16:56:49 -08:00
parent cd7431d925
commit 0c52b56db9
1 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/TaskMenuView.java
+34 -10
View File
@@ -25,7 +25,6 @@ import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewOutlineProvider;
@@ -61,6 +60,8 @@ public class TaskMenuView extends AbstractFloatingView {
private Launcher mLauncher;
private TextView mTaskIconAndName;
private AnimatorSet mOpenCloseAnimator;
private TaskView mTaskView;
private View mWidgetsOptionView;
public TaskMenuView(Context context, AttributeSet attrs) {
this(context, attrs, 0);
@@ -130,8 +131,9 @@ public class TaskMenuView extends AbstractFloatingView {
return false;
}
mLauncher.getDragLayer().addView(this);
addMenuOptions(taskView.getTask());
orientAroundTaskView(taskView);
mTaskView = taskView;
addMenuOptions(mTaskView.getTask());
orientAroundTaskView(mTaskView);
post(this::animateOpen);
return true;
}
@@ -143,20 +145,27 @@ public class TaskMenuView extends AbstractFloatingView {
mTaskIconAndName.setCompoundDrawables(null, icon, null, null);
mTaskIconAndName.setText(TaskUtils.getTitle(mLauncher, task));
LayoutInflater inflater = mLauncher.getLayoutInflater();
for (TaskSystemShortcut menuOption : MENU_OPTIONS) {
OnClickListener onClickListener = menuOption.getOnClickListener(mLauncher, task);
if (onClickListener != null) {
DeepShortcutView menuOptionView = (DeepShortcutView) inflater.inflate(
R.layout.system_shortcut, this, false);
menuOptionView.getIconView().setBackgroundResource(menuOption.iconResId);
menuOptionView.getBubbleText().setText(menuOption.labelResId);
menuOptionView.setOnClickListener(onClickListener);
addView(menuOptionView);
addMenuOption(menuOption, onClickListener);
}
}
}
private void addMenuOption(TaskSystemShortcut menuOption, OnClickListener onClickListener) {
DeepShortcutView menuOptionView = (DeepShortcutView) mLauncher.getLayoutInflater().inflate(
R.layout.system_shortcut, this, false);
menuOptionView.getIconView().setBackgroundResource(menuOption.iconResId);
menuOptionView.getBubbleText().setText(menuOption.labelResId);
menuOptionView.setOnClickListener(onClickListener);
addView(menuOptionView);
if (menuOption instanceof TaskSystemShortcut.Widgets) {
mWidgetsOptionView = menuOptionView;
}
}
private void orientAroundTaskView(TaskView taskView) {
measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
mLauncher.getDragLayer().getDescendantRectRelativeToSelf(taskView, sTempRect);
@@ -220,4 +229,19 @@ public class TaskMenuView extends AbstractFloatingView {
}
};
}
@Override
protected void onWidgetsBound() {
TaskSystemShortcut widgetsOption = new TaskSystemShortcut.Widgets();
View.OnClickListener onClickListener = widgetsOption.getOnClickListener(
mLauncher, mTaskView.getTask());
if (onClickListener != null && mWidgetsOptionView == null) {
// We didn't have any widgets cached but now there are some, so add the option.
addMenuOption(widgetsOption, onClickListener);
} else if (onClickListener == null && mWidgetsOptionView != null) {
// No widgets exist, but we previously added the option so remove it.
removeView(mWidgetsOptionView);
}
}
}