openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Exposing some private methods to easily customize widgets popup" into ub-launcher3-master

This commit is contained in:
Sunny Goyal 2018-08-02 21:55:52 +00:00 committed by Android (Google) Code Review
parent ce15b325e8 db6cdb07e8
commit 9331521b7d
7 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/launcher3/notification/NotificationFooterLayout.java
View File

@ -157,7 +157,7 @@ public class NotificationFooterLayout extends FrameLayout {
Rect fromBounds = sTempRect;
firstNotification.getGlobalVisibleRect(fromBounds);
float scale = (float) toBounds.height() / fromBounds.height();
Animator moveAndScaleIcon = LauncherAnimUtils.ofPropertyValuesHolder(firstNotification,
Animator moveAndScaleIcon = ObjectAnimator.ofPropertyValuesHolder(firstNotification,
new PropertyListBuilder().scale(scale).translationY(toBounds.top - fromBounds.top
+ (fromBounds.height() * scale - fromBounds.height()) / 2).build());
moveAndScaleIcon.addListener(new AnimatorListenerAdapter() {

2
src/com/android/launcher3/popup/PopupContainerWithArrow.java
View File

@ -84,7 +84,7 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource,
private final List<DeepShortcutView> mShortcuts = new ArrayList<>();
private final PointF mInterceptTouchDown = new PointF();
private final Point mIconLastTouchPos = new Point();
protected final Point mIconLastTouchPos = new Point();
private final int mStartDragThreshold;
private final LauncherAccessibilityDelegate mAccessibilityDelegate;

4
src/com/android/launcher3/shortcuts/DeepShortcutView.java
View File

@ -141,4 +141,8 @@ public class DeepShortcutView extends FrameLayout {
public View getIconView() {
return mIconView;
}
public ShortcutInfoCompat getDetail() {
return mDetail;
}
}

13
src/com/android/launcher3/views/AbstractSlideInView.java
View File

@ -30,7 +30,6 @@ import android.view.animation.Interpolator;
import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherAnimUtils;
import com.android.launcher3.Utilities;
import com.android.launcher3.anim.Interpolators;
import com.android.launcher3.touch.SwipeDetector;
@ -76,7 +75,7 @@ public abstract class AbstractSlideInView extends AbstractFloatingView
mScrollInterpolator = Interpolators.SCROLL_CUBIC;
mSwipeDetector = new SwipeDetector(context, this, SwipeDetector.VERTICAL);
mOpenCloseAnimator = LauncherAnimUtils.ofPropertyValuesHolder(this);
mOpenCloseAnimator = ObjectAnimator.ofPropertyValuesHolder(this);
mOpenCloseAnimator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
@ -103,7 +102,7 @@ public abstract class AbstractSlideInView extends AbstractFloatingView
directionsToDetectScroll, false);
mSwipeDetector.onTouchEvent(ev);
return mSwipeDetector.isDraggingOrSettling()
|| !mLauncher.getDragLayer().isEventOverView(mContent, ev);
|| !getPopupContainer().isEventOverView(mContent, ev);
}
@Override
@ -111,7 +110,7 @@ public abstract class AbstractSlideInView extends AbstractFloatingView
mSwipeDetector.onTouchEvent(ev);
if (ev.getAction() == MotionEvent.ACTION_UP && mSwipeDetector.isIdleState()) {
// If we got ACTION_UP without ever starting swipe, close the panel.
if (!mLauncher.getDragLayer().isEventOverView(mContent, ev)) {
if (!getPopupContainer().isEventOverView(mContent, ev)) {
close(true);
}
}
@ -178,6 +177,10 @@ public abstract class AbstractSlideInView extends AbstractFloatingView
protected void onCloseComplete() {
mIsOpen = false;
mLauncher.getDragLayer().removeView(this);
getPopupContainer().removeView(this);
}
protected BaseDragLayer getPopupContainer() {
return mLauncher.getDragLayer();
}
}

13
src/com/android/launcher3/widget/BaseWidgetSheet.java
View File

@ -71,7 +71,7 @@ abstract class BaseWidgetSheet extends AbstractSlideInView
}
@Override
public final boolean onLongClick(View v) {
public boolean onLongClick(View v) {
if (!ItemLongClickListener.canStartDrag(mLauncher)) return false;
if (v instanceof WidgetCell) {
@ -96,7 +96,7 @@ abstract class BaseWidgetSheet extends AbstractSlideInView
}
int[] loc = new int[2];
mLauncher.getDragLayer().getLocationInDragLayer(image, loc);
getPopupContainer().getLocationInDragLayer(image, loc);
new PendingItemDragHelper(v).startDrag(
image.getBitmapBounds(), image.getBitmap().getWidth(), image.getWidth(),
@ -119,13 +119,13 @@ abstract class BaseWidgetSheet extends AbstractSlideInView
}
protected void clearNavBarColor() {
mLauncher.getSystemUiController().updateUiState(
getSystemUiController().updateUiState(
SystemUiController.UI_STATE_WIDGET_BOTTOM_SHEET, 0);
}
protected void setupNavBarColor() {
boolean isSheetDark = Themes.getAttrBoolean(mLauncher, R.attr.isMainColorDark);
mLauncher.getSystemUiController().updateUiState(
boolean isSheetDark = Themes.getAttrBoolean(getContext(), R.attr.isMainColorDark);
getSystemUiController().updateUiState(
SystemUiController.UI_STATE_WIDGET_BOTTOM_SHEET,
isSheetDark ? SystemUiController.FLAG_DARK_NAV : SystemUiController.FLAG_LIGHT_NAV);
}
@ -145,4 +145,7 @@ abstract class BaseWidgetSheet extends AbstractSlideInView
protected abstract int getElementsRowCount();
protected SystemUiController getSystemUiController() {
return mLauncher.getSystemUiController();
}
}

4
src/com/android/launcher3/widget/WidgetsBottomSheet.java
View File

@ -71,7 +71,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
onWidgetsBound();
mLauncher.getDragLayer().addView(this);
getPopupContainer().addView(this);
mIsOpen = false;
animateOpen();
}
@ -118,7 +118,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
LayoutInflater.from(getContext()).inflate(R.layout.widget_list_divider, parent, true);
}
private WidgetCell addItemCell(ViewGroup parent) {
protected WidgetCell addItemCell(ViewGroup parent) {
WidgetCell widget = (WidgetCell) LayoutInflater.from(getContext()).inflate(
R.layout.widget_cell, parent, false);

10
src/com/android/launcher3/widget/WidgetsFullSheet.java
View File

@ -160,7 +160,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
private void open(boolean animate) {
if (animate) {
if (mLauncher.getDragLayer().getInsets().bottom > 0) {
if (getPopupContainer().getInsets().bottom > 0) {
mContent.setAlpha(0);
setTranslationShift(VERTICAL_START_POSITION);
}
@ -207,10 +207,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet
mNoIntercept = false;
RecyclerViewFastScroller scroller = mRecyclerView.getScrollbar();
if (scroller.getThumbOffsetY() >= 0 &&
mLauncher.getDragLayer().isEventOverView(scroller, ev)) {
getPopupContainer().isEventOverView(scroller, ev)) {
mNoIntercept = true;
} else if (mLauncher.getDragLayer().isEventOverView(mContent, ev)) {
mNoIntercept = !mRecyclerView.shouldContainerScroll(ev, mLauncher.getDragLayer());
} else if (getPopupContainer().isEventOverView(mContent, ev)) {
mNoIntercept = !mRecyclerView.shouldContainerScroll(ev, getPopupContainer());
}
}
return super.onControllerInterceptTouchEvent(ev);
@ -220,7 +220,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
WidgetsFullSheet sheet = (WidgetsFullSheet) launcher.getLayoutInflater()
.inflate(R.layout.widgets_full_sheet, launcher.getDragLayer(), false);
sheet.mIsOpen = true;
launcher.getDragLayer().addView(sheet);
sheet.getPopupContainer().addView(sheet);
sheet.open(animate);
return sheet;
}